diff options
| author | Michal Zima <xhire@mujmalysvet.cz> | 2010-02-08 22:42:13 +0100 |
|---|---|---|
| committer | Michal Zima <xhire@mujmalysvet.cz> | 2010-02-08 22:42:13 +0100 |
| commit | 546e143e3a2347991c6b0dc887f61d993873f4ef (patch) | |
| tree | b40ed329df4d948ffebc83fd12b8b95d3b425b09 | |
| parent | dcedec3fa1025e29a6eff80841ba4b286a1af942 (diff) | |
Just typo & style fixes
| -rw-r--r-- | src/base/archive.c | 12 | ||||
| -rw-r--r-- | src/base/main.c | 2 | ||||
| -rw-r--r-- | src/base/main.h | 2 | ||||
| -rw-r--r-- | src/screen/setting.c | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/base/archive.c b/src/base/archive.c index 04426a8..525cd7e 100644 --- a/src/base/archive.c +++ b/src/base/archive.c @@ -39,7 +39,7 @@ char *archive_extract_file(char *archive, char *filename) #else tmp = getenv("TEMP"); #endif - sprintf(name, "%s%stuxanci.%d-%s", tmp, PATH_SEPARATOR ,getpid(), filename); + sprintf(name, "%s%stuxanci.%d-%s", tmp, PATH_SEPARATOR, getpid(), filename); /*printf("ARCHIVE %s %s %s\n", archive, filename, name);*/ @@ -99,15 +99,14 @@ char *archive_extract_file(char *archive, char *filename) #else tmp = getenv("TEMP"); #endif - sprintf(name, "%s%stuxanci.%d-%s", tmp, PATH_SEPARATOR ,getpid(), filename); + sprintf(name, "%s%stuxanci.%d-%s", tmp, PATH_SEPARATOR, getpid(), filename); - if( ! PHYSFS_init(get_program_name()) ) - { + if (!(PHYSFS_init(get_program_name()))) { error("Unable to init physfs"); return NULL; } - if (! PHYSFS_addToSearchPath(archive, 1)) { + if (!(PHYSFS_addToSearchPath(archive, 1))) { error("Unable to open archive [%s]", archive); PHYSFS_deinit(); return NULL; @@ -128,8 +127,7 @@ char *archive_extract_file(char *archive, char *filename) return NULL; } - while ((count = PHYSFS_read(file_archive, buffer, 1, ARCHIVE_BUFFER_SIZE)) > 0) - { + while ((count = PHYSFS_read(file_archive, buffer, 1, ARCHIVE_BUFFER_SIZE)) > 0) { fwrite(buffer, count, 1, file); } diff --git a/src/base/main.c b/src/base/main.c index 0e5a5da..b2ab1f6 100644 --- a/src/base/main.c +++ b/src/base/main.c @@ -71,7 +71,7 @@ bool_t isParamFlag(char *s) return FALSE; } -char* get_program_name() +char *get_program_name() { return my_argv[0]; } diff --git a/src/base/main.h b/src/base/main.h index 5f714f1..4ae7540 100644 --- a/src/base/main.h +++ b/src/base/main.h @@ -32,7 +32,7 @@ extern char *getParam(char *s); extern char *getParamElse(char *s1, char *s2); extern bool_t isParamFlag(char *s); -extern char* get_program_name(); +extern char *get_program_name(); extern char *getString(int n); extern char *get_string_static(int n); extern int *newInt(int x); diff --git a/src/screen/setting.c b/src/screen/setting.c index f349354..2e1b615 100644 --- a/src/screen/setting.c +++ b/src/screen/setting.c @@ -326,8 +326,8 @@ void setting_init() WIDGET_TEXTFIELD_FILTER_ALPHANUM, 110 + label_count_round->w, WINDOW_SIZE_Y - 120); - label_weapons = label_new(_("weapons:"), 100, 160, WIDGET_LABEL_LEFT); - label_bonuses = label_new(_("bonuses:"), 430, 160, WIDGET_LABEL_LEFT); + label_weapons = label_new(_("Weapons:"), 100, 160, WIDGET_LABEL_LEFT); + label_bonuses = label_new(_("Bonuses:"), 430, 160, WIDGET_LABEL_LEFT); for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) { int x = 0; |