summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-08-13 21:35:31 +0000
committertron <tron@openttd.org>2005-08-13 21:35:31 +0000
commitbdd5d4ebb1c7934c01eab616f52bf8cb8076107b (patch)
tree5469dc7675e066dd1cee2aef845ad180a8e6ca94
parent38f344b3516e43b007e3cd821c46beadaba78df5 (diff)
downloadopenttd-bdd5d4ebb1c7934c01eab616f52bf8cb8076107b.tar.xz
(svn r2864) Code simplification and diff reduction
-rw-r--r--os2.c22
-rw-r--r--unix.c24
-rw-r--r--win32.c22
3 files changed, 34 insertions, 34 deletions
diff --git a/os2.c b/os2.c
index a76f3dc10..d4411bbb8 100644
--- a/os2.c
+++ b/os2.c
@@ -139,7 +139,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
if (stat(filename, &sb) || S_ISDIR(sb.st_mode)) continue;
t = strrchr(dirent->d_name, '.');
- if (t != NULL && strcasecmp(t, ".sav") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".sav") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_FILE;
fios->mtime = sb.st_mtime;
@@ -148,11 +150,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
*t = '\0'; // strip extension
ttd_strlcpy(fios->title, dirent->d_name, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
- if (t != NULL && (
- strcasecmp(t, ".ss1") == 0 ||
- strcasecmp(t, ".sv1") == 0 ||
- strcasecmp(t, ".sv2") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".ss1") == 0 ||
+ strcasecmp(t, ".sv1") == 0 ||
+ strcasecmp(t, ".sv2") == 0) { // TTDLX(Patch)
fios = FiosAlloc();
fios->type = FIOS_TYPE_OLDFILE;
fios->mtime = sb.st_mtime;
@@ -265,7 +265,9 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
if (stat(filename, &sb) || S_ISDIR(sb.st_mode)) continue;
t = strrchr(dirent->d_name, '.');
- if (t != NULL && strcasecmp(t, ".scn") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".scn") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_SCENARIO;
fios->mtime = sb.st_mtime;
@@ -275,10 +277,8 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
ttd_strlcpy(fios->title, dirent->d_name, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO ||
mode == SLD_NEW_GAME) {
- if (t != NULL && (
- strcasecmp(t, ".sv0") == 0 ||
- strcasecmp(t, ".ss0") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".sv0") == 0 ||
+ strcasecmp(t, ".ss0") == 0) { // TTDLX(Patch)
fios = FiosAlloc();
fios->type = FIOS_TYPE_OLD_SCENARIO;
fios->mtime = sb.st_mtime;
diff --git a/unix.c b/unix.c
index c397638a1..ee478fbcc 100644
--- a/unix.c
+++ b/unix.c
@@ -148,7 +148,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
if (stat(filename, &sb) || S_ISDIR(sb.st_mode)) continue;
t = strrchr(dirent->d_name, '.');
- if (t != NULL && strcasecmp(t, ".sav") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".sav") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_FILE;
fios->mtime = sb.st_mtime;
@@ -157,11 +159,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
*t = '\0'; // strip extension
ttd_strlcpy(fios->title, dirent->d_name, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
- if (t != NULL && (
- strcasecmp(t, ".ss1") == 0 ||
- strcasecmp(t, ".sv1") == 0 ||
- strcasecmp(t, ".sv2") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".ss1") == 0 ||
+ strcasecmp(t, ".sv1") == 0 ||
+ strcasecmp(t, ".sv2") == 0) { // TTDLX(Patch)
fios = FiosAlloc();
fios->type = FIOS_TYPE_OLDFILE;
fios->mtime = sb.st_mtime;
@@ -247,7 +247,9 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
if (stat(filename, &sb) || S_ISDIR(sb.st_mode)) continue;
t = strrchr(dirent->d_name, '.');
- if (t != NULL && strcasecmp(t, ".scn") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".scn") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_SCENARIO;
fios->mtime = sb.st_mtime;
@@ -257,10 +259,8 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
ttd_strlcpy(fios->title, dirent->d_name, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO ||
mode == SLD_NEW_GAME) {
- if (t != NULL && (
- strcasecmp(t, ".sv0") == 0 ||
- strcasecmp(t, ".ss0") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".sv0") == 0 ||
+ strcasecmp(t, ".ss0") == 0) { // TTDLX(Patch)
fios = FiosAlloc();
fios->type = FIOS_TYPE_OLD_SCENARIO;
fios->mtime = sb.st_mtime;
@@ -330,7 +330,7 @@ char *FiosBrowseTo(const FiosItem *item)
StringID FiosGetDescText(const char **path, uint32 *tot)
{
uint32 free = 0;
- *path = _fios_path[0] != '\0' ? _fios_path : "/";
+ *path = _fios_path;
#ifdef HAS_STATVFS
{
diff --git a/win32.c b/win32.c
index 54a44e46e..9effbabf8 100644
--- a/win32.c
+++ b/win32.c
@@ -672,7 +672,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue;
t = strrchr(fd.cFileName, '.');
- if (t != NULL && strcasecmp(t, ".sav") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".sav") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_FILE;
fios->mtime = *(uint64*)&fd.ftLastWriteTime;
@@ -681,11 +683,9 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
*t = '\0'; // strip extension
ttd_strlcpy(fios->title, fd.cFileName, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
- if (t != NULL && (
- strcasecmp(t, ".ss1") == 0 ||
- strcasecmp(t, ".sv1") == 0 ||
- strcasecmp(t, ".sv2") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".ss1") == 0 ||
+ strcasecmp(t, ".sv1") == 0 ||
+ strcasecmp(t, ".sv2") == 0) { // TTDLX(Patch)
char buf[MAX_PATH];
fios = FiosAlloc();
@@ -785,7 +785,9 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue;
t = strrchr(fd.cFileName, '.');
- if (t != NULL && strcasecmp(t, ".scn") == 0) { // OpenTTD
+ if (t == NULL) continue;
+
+ if (strcasecmp(t, ".scn") == 0) { // OpenTTD
fios = FiosAlloc();
fios->type = FIOS_TYPE_SCENARIO;
fios->mtime = *(uint64*)&fd.ftLastWriteTime;
@@ -795,10 +797,8 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
ttd_strlcpy(fios->title, fd.cFileName, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO ||
mode == SLD_NEW_GAME) {
- if (t != NULL && (
- strcasecmp(t, ".sv0") == 0 ||
- strcasecmp(t, ".ss0") == 0
- )) { // TTDLX(Patch)
+ if (strcasecmp(t, ".sv0") == 0 ||
+ strcasecmp(t, ".ss0") == 0) { // TTDLX(Patch)
char buf[MAX_PATH];
fios = FiosAlloc();