From ae96d9a162cde3d469e7a144b88280ac1a9eeb79 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 28 Mar 2013 09:05:18 +0000 Subject: [PATCH] Correct the capitalization of NAPALM. git-svn-id: https://svn.eduke32.com/eduke32@3618 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/common.c | 8 ++++---- polymer/eduke32/source/game.c | 6 +++--- polymer/eduke32/source/grpscan.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/polymer/eduke32/source/common.c b/polymer/eduke32/source/common.c index c879502f2..faab202a1 100644 --- a/polymer/eduke32/source/common.c +++ b/polymer/eduke32/source/common.c @@ -78,14 +78,14 @@ const char *G_DefaultDefFile(void) else if (NAPALM) { 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 return defaultdeffilename[GAME_NAPALM]; } else if (NAM) { 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 return defaultdeffilename[GAME_NAM]; } @@ -103,7 +103,7 @@ const char *G_DefaultConFile(void) if (!testkopen(defaultgameconfilename[GAME_NAPALM],0)) { if (testkopen(defaultgameconfilename[GAME_NAM],0)) - return defaultgameconfilename[GAME_NAM]; // NAM/Napalm Sharing + return defaultgameconfilename[GAME_NAM]; // NAM/NAPALM Sharing } else return defaultgameconfilename[GAME_NAPALM]; @@ -113,7 +113,7 @@ const char *G_DefaultConFile(void) if (!testkopen(defaultgameconfilename[GAME_NAM],0)) { if (testkopen(defaultgameconfilename[GAME_NAPALM],0)) - return defaultgameconfilename[GAME_NAPALM]; // NAM/Napalm Sharing + return defaultgameconfilename[GAME_NAPALM]; // NAM/NAPALM Sharing } else return defaultgameconfilename[GAME_NAM]; diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 2ee6dac08..8ecf445d8 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -218,14 +218,14 @@ const char *G_DefaultRtsFile(void) else if (NAPALM) { 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 return defaultrtsfilename[GAME_NAPALM]; } else if (NAM) { 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 return defaultrtsfilename[GAME_NAM]; } @@ -8219,7 +8219,7 @@ static void G_ShowParameterHelp(void) "-mx [file.con]\tInclude an additional CON script module\n" "-m\t\tDisable monsters\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" "-r\t\tRecord demo\n" "-s#\t\tSet skill level (1-4)\n" diff --git a/polymer/eduke32/source/grpscan.c b/polymer/eduke32/source/grpscan.c index 40e6fd36e..007e7f630 100644 --- a/polymer/eduke32/source/grpscan.c +++ b/polymer/eduke32/source/grpscan.c @@ -40,7 +40,7 @@ struct grpfile grpfiles[NUMGRPFILES] = { "Duke Nukem 3D Shareware", (int32_t)0x983AD923, 11035779, GAMEFLAG_DUKE, NULL }, { "Duke Nukem 3D Mac Shareware", (int32_t)0xC5F71561, 10444391, GAMEFLAG_DUKE, 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 }, }; struct grpfile *foundgrps = NULL;