From 99d379944b2c6c665b80905f6583058f0b0d9926 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Tue, 14 Jan 2014 08:18:25 -0200 Subject: [PATCH] Modified DoomClassic/code/iphone/doom_wads.cpp * Removed comma at the end of Master Levels array * Removed unreachable breaks in iphoneFindPWADFile * Cosmetics for style consistency Modified DOOM CLASSIC IOS v.2.1 README.txt Modified README.txt Fixed URL for source code archive (will v3.0 URL ever work?) --- DOOM CLASSIC IOS v.2.1 README.txt | 2 +- DoomClassic/code/iphone/doom_wads.cpp | 30 +++++++++++++-------------- README.txt | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/DOOM CLASSIC IOS v.2.1 README.txt b/DOOM CLASSIC IOS v.2.1 README.txt index 95897930..4fdd6083 100755 --- a/DOOM CLASSIC IOS v.2.1 README.txt +++ b/DOOM CLASSIC IOS v.2.1 README.txt @@ -10,7 +10,7 @@ GENERAL NOTES ============= DOOM Classic iOS v2.1 is a free release, and can be downloaded from -http://http://www.idsoftware.com/idstuff/doom/doomclassic_ios_v21_src.zip +http://download.zenimax.com/idsoftware/src/doomclassic_ios_v21_src.zip This source release does not contain any game data, the game data remains subject to the original EULA and applicable law. diff --git a/DoomClassic/code/iphone/doom_wads.cpp b/DoomClassic/code/iphone/doom_wads.cpp index 3ad22077..24569483 100755 --- a/DoomClassic/code/iphone/doom_wads.cpp +++ b/DoomClassic/code/iphone/doom_wads.cpp @@ -58,11 +58,10 @@ static const char * MasterLevels_WADS[] = { "VESPERAS.WAD", "BLACKTWR.WAD" , "TEETH.WAD", - "TEETH.WAD", + "TEETH.WAD" }; void iphoneFindIWADFile( iphoneMissionPack_t mission, char * returnFileName ) { - switch ( mission ) { case MISSION_HELL_ON_EARTH: sprintf( returnFileName, "doom2.wad" ); @@ -71,21 +70,21 @@ void iphoneFindIWADFile( iphoneMissionPack_t mission, char * returnFileName ) { case MISSION_PLUTONIA: sprintf( returnFileName, "plutonia.wad" ); return; - + case MISSION_TNT_EVILUTION: sprintf( returnFileName, "tnt.wad" ); return; - + case MISSION_NO_REST_FOR_THE_LIVING: sprintf( returnFileName, "doom2.wad" ); return; - + case MISSION_MASTER_LEVELS: - sprintf( returnFileName, "doom2.wad" ); - return; - + sprintf( returnFileName, "doom2.wad" ); + return; + default: - sprintf( returnFileName, "doom2.wad" );; + sprintf( returnFileName, "doom2.wad" ); } } @@ -97,18 +96,17 @@ void iphoneFindIWADFile( iphoneMissionPack_t mission, char * returnFileName ) { ================== */ void iphoneFindPWADFile( iphoneMissionPack_t mission, char * returnFileName ) { - switch ( mission ) { case MISSION_NO_REST_FOR_THE_LIVING: { sprintf( returnFileName, "nerve.wad" ); - return; - break; + return; } + case MISSION_MASTER_LEVELS: { - sprintf( returnFileName, "%s", MasterLevels_WADS[ iphoneMasterLevel ] ); - return; - break; - } + sprintf( returnFileName, "%s", MasterLevels_WADS[ iphoneMasterLevel ] ); + return; + } + default: break; } diff --git a/README.txt b/README.txt index e651e2d4..a4c853fb 100755 --- a/README.txt +++ b/README.txt @@ -10,7 +10,7 @@ GENERAL NOTES ============= DOOM Classic iOS v3.0 is a free release, and can be downloaded from -http://http://www.idsoftware.com/idstuff/doom/doomclassic_ios_v30_src.zip +http://download.zenimax.com/idsoftware/src/doomclassic_ios_v30_src.zip This source release does not contain any game data, the game data remains subject to the original EULA and applicable law.