diff options
author | Simon Howard | 2010-05-03 18:23:15 +0000 |
---|---|---|
committer | Simon Howard | 2010-05-03 18:23:15 +0000 |
commit | 7a3249ce14ac528a5cdf9ca2d0a62535cf2bb1cd (patch) | |
tree | 49859219af3586a393d86c2c4c9c1c4ef915315e /src/hexen/mn_menu.c | |
parent | c37f757b57cbfd88d66aed1576412e311a503384 (diff) | |
download | chocolate-doom-7a3249ce14ac528a5cdf9ca2d0a62535cf2bb1cd.tar.gz chocolate-doom-7a3249ce14ac528a5cdf9ca2d0a62535cf2bb1cd.tar.bz2 chocolate-doom-7a3249ce14ac528a5cdf9ca2d0a62535cf2bb1cd.zip |
Fix compiler warnings.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1934
Diffstat (limited to 'src/hexen/mn_menu.c')
-rw-r--r-- | src/hexen/mn_menu.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c index 09a8f1ea..9f37df66 100644 --- a/src/hexen/mn_menu.c +++ b/src/hexen/mn_menu.c @@ -679,6 +679,32 @@ static void DrawSaveMenu(void) DrawFileSlots(&SaveMenu); } +static boolean ReadDescriptionForSlot(int slot, char *description) +{ + FILE *fp; + boolean found; + char name[100]; + char versionText[HXS_VERSION_TEXT_LENGTH]; + + sprintf(name, "%shex%d.hxs", SavePath, slot); + + fp = fopen(name, "rb"); + + if (fp == NULL) + { + return false; + } + + found = fread(description, HXS_DESCRIPTION_LENGTH, 1, fp) == 1 + && fread(versionText, HXS_VERSION_TEXT_LENGTH, 1, fp) == 1; + + found = found && strcmp(versionText, HXS_VERSION_TEXT) == 0; + + fclose(fp); + + return found; +} + //=========================================================================== // // MN_LoadSlotText @@ -689,29 +715,12 @@ static void DrawSaveMenu(void) void MN_LoadSlotText(void) { - int slot; - FILE *fp; - char name[100]; - char versionText[HXS_VERSION_TEXT_LENGTH]; char description[HXS_DESCRIPTION_LENGTH]; - boolean found; + int slot; for (slot = 0; slot < 6; slot++) { - found = false; - sprintf(name, "%shex%d.hxs", SavePath, slot); - fp = fopen(name, "rb"); - if (fp) - { - fread(description, HXS_DESCRIPTION_LENGTH, 1, fp); - fread(versionText, HXS_VERSION_TEXT_LENGTH, 1, fp); - fclose(fp); - if (!strcmp(versionText, HXS_VERSION_TEXT)) - { - found = true; - } - } - if (found) + if (ReadDescriptionForSlot(slot, description)) { memcpy(SlotText[slot], description, SLOTTEXTLEN); SlotStatus[slot] = 1; |