summaryrefslogtreecommitdiff
path: root/win32.c
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
commitec0ebea3d711e359b4e38c057dc042059792be84 (patch)
tree5469dc7675e066dd1cee2aef845ad180a8e6ca94 /win32.c
parent0d6f3dbc4df9fd6d19cb8e4758d3147d1591d7be (diff)
downloadopenttd-ec0ebea3d711e359b4e38c057dc042059792be84.tar.xz
(svn r2864) Code simplification and diff reduction
Diffstat (limited to 'win32.c')
-rw-r--r--win32.c22
1 files changed, 11 insertions, 11 deletions
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();