zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct the capitalization of NAPALM.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3618 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-03-28 09:05:18 +00:00
parent 2bfb7736cb
commit ae96d9a162
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/common.c
View file

@ -78,14 +78,14 @@ const char *G_DefaultDefFile(void)
else if (NAPALM) else if (NAPALM)
{ {
if (!testkopen(defaultdeffilename[GAME_NAPALM],0) && testkopen(defaultdeffilename[GAME_NAM],0)) if (!testkopen(defaultdeffilename[GAME_NAPALM],0) && testkopen(defaultdeffilename[GAME_NAM],0))
return defaultdeffilename[GAME_NAM]; // NAM/Napalm Sharing return defaultdeffilename[GAME_NAM]; // NAM/NAPALM Sharing
else else
return defaultdeffilename[GAME_NAPALM]; return defaultdeffilename[GAME_NAPALM];
} }
else if (NAM) else if (NAM)
{ {
if (!testkopen(defaultdeffilename[GAME_NAM],0) && testkopen(defaultdeffilename[GAME_NAPALM],0)) if (!testkopen(defaultdeffilename[GAME_NAM],0) && testkopen(defaultdeffilename[GAME_NAPALM],0))
return defaultdeffilename[GAME_NAPALM]; // NAM/Napalm Sharing return defaultdeffilename[GAME_NAPALM]; // NAM/NAPALM Sharing
else else
return defaultdeffilename[GAME_NAM]; return defaultdeffilename[GAME_NAM];
} }
@ -103,7 +103,7 @@ const char *G_DefaultConFile(void)
if (!testkopen(defaultgameconfilename[GAME_NAPALM],0)) if (!testkopen(defaultgameconfilename[GAME_NAPALM],0))
{ {
if (testkopen(defaultgameconfilename[GAME_NAM],0)) if (testkopen(defaultgameconfilename[GAME_NAM],0))
return defaultgameconfilename[GAME_NAM]; // NAM/Napalm Sharing return defaultgameconfilename[GAME_NAM]; // NAM/NAPALM Sharing
} }
else else
return defaultgameconfilename[GAME_NAPALM]; return defaultgameconfilename[GAME_NAPALM];
@ -113,7 +113,7 @@ const char *G_DefaultConFile(void)
if (!testkopen(defaultgameconfilename[GAME_NAM],0)) if (!testkopen(defaultgameconfilename[GAME_NAM],0))
{ {
if (testkopen(defaultgameconfilename[GAME_NAPALM],0)) if (testkopen(defaultgameconfilename[GAME_NAPALM],0))
return defaultgameconfilename[GAME_NAPALM]; // NAM/Napalm Sharing return defaultgameconfilename[GAME_NAPALM]; // NAM/NAPALM Sharing
} }
else else
return defaultgameconfilename[GAME_NAM]; return defaultgameconfilename[GAME_NAM];

6
polymer/eduke32/source/game.c
View file

@ -218,14 +218,14 @@ const char *G_DefaultRtsFile(void)
else if (NAPALM) else if (NAPALM)
{ {
if (!testkopen(defaultrtsfilename[GAME_NAPALM],0) && testkopen(defaultrtsfilename[GAME_NAM],0)) if (!testkopen(defaultrtsfilename[GAME_NAPALM],0) && testkopen(defaultrtsfilename[GAME_NAM],0))
return defaultrtsfilename[GAME_NAM]; // NAM/Napalm Sharing return defaultrtsfilename[GAME_NAM]; // NAM/NAPALM Sharing
else else
return defaultrtsfilename[GAME_NAPALM]; return defaultrtsfilename[GAME_NAPALM];
} }
else if (NAM) else if (NAM)
{ {
if (!testkopen(defaultrtsfilename[GAME_NAM],0) && testkopen(defaultrtsfilename[GAME_NAPALM],0)) if (!testkopen(defaultrtsfilename[GAME_NAM],0) && testkopen(defaultrtsfilename[GAME_NAPALM],0))
return defaultrtsfilename[GAME_NAPALM]; // NAM/Napalm Sharing return defaultrtsfilename[GAME_NAPALM]; // NAM/NAPALM Sharing
else else
return defaultrtsfilename[GAME_NAM]; return defaultrtsfilename[GAME_NAM];
} }
@ -8219,7 +8219,7 @@ static void G_ShowParameterHelp(void)
"-mx [file.con]\tInclude an additional CON script module\n" "-mx [file.con]\tInclude an additional CON script module\n"
"-m\t\tDisable monsters\n" "-m\t\tDisable monsters\n"
"-nam\t\tRun in NAM compatibility mode\n" "-nam\t\tRun in NAM compatibility mode\n"
"-napalm\t\tRun in Napalm compatibility mode\n" "-napalm\t\tRun in NAPALM compatibility mode\n"
"-rts [file.rts]\tLoad a custom Remote Ridicule sound bank\n" "-rts [file.rts]\tLoad a custom Remote Ridicule sound bank\n"
"-r\t\tRecord demo\n" "-r\t\tRecord demo\n"
"-s#\t\tSet skill level (1-4)\n" "-s#\t\tSet skill level (1-4)\n"

2
polymer/eduke32/source/grpscan.c
View file

@ -40,7 +40,7 @@ struct grpfile grpfiles[NUMGRPFILES] =
{ "Duke Nukem 3D Shareware", (int32_t)0x983AD923, 11035779, GAMEFLAG_DUKE, NULL }, { "Duke Nukem 3D Shareware", (int32_t)0x983AD923, 11035779, GAMEFLAG_DUKE, NULL },
{ "Duke Nukem 3D Mac Shareware", (int32_t)0xC5F71561, 10444391, GAMEFLAG_DUKE, NULL }, { "Duke Nukem 3D Mac Shareware", (int32_t)0xC5F71561, 10444391, GAMEFLAG_DUKE, NULL },
{ "NAM", (int32_t)0x75C1F07B, 43448927, GAMEFLAG_NAM, NULL }, { "NAM", (int32_t)0x75C1F07B, 43448927, GAMEFLAG_NAM, NULL },
{ "Napalm", (int32_t)0x3DE1589A, 44365728, GAMEFLAG_NAM|GAMEFLAG_NAPALM, NULL }, { "NAPALM", (int32_t)0x3DE1589A, 44365728, GAMEFLAG_NAM|GAMEFLAG_NAPALM, NULL },
{ "WWII GI", (int32_t)0x907B82BF, 77939508, GAMEFLAG_WW2GI|GAMEFLAG_NAM, NULL }, { "WWII GI", (int32_t)0x907B82BF, 77939508, GAMEFLAG_WW2GI|GAMEFLAG_NAM, NULL },
}; };
struct grpfile *foundgrps = NULL; struct grpfile *foundgrps = NULL;