Fix two harmless warnings and reindent one switch block.

Also, make G_LoadAddon() local to game.c.

git-svn-id: https://svn.eduke32.com/eduke32@3711 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-25 21:10:25 +00:00
parent a628cbdd13
commit 3e9b1be6fb
2 changed files with 75 additions and 76 deletions

View file

@ -10146,7 +10146,7 @@ void G_MaybeAllocPlayer(int32_t pnum)
#endif #endif
} }
void G_LoadAddon(void) static void G_LoadAddon(void)
{ {
struct grpfile * grp; struct grpfile * grp;
int32_t crc = 0; // compiler-happy int32_t crc = 0; // compiler-happy
@ -10170,7 +10170,6 @@ void G_LoadAddon(void)
if (grp && FindGroup(DUKE15_CRC)) if (grp && FindGroup(DUKE15_CRC))
{ {
int32_t i;
struct grpfile *grp; struct grpfile *grp;
clearGrpNamePtr(); clearGrpNamePtr();

View file

@ -71,6 +71,8 @@ static void LoadList(const char * filename)
scriptfile_addsymbolvalue("DUKECB_CRC", DUKECB_CRC); scriptfile_addsymbolvalue("DUKECB_CRC", DUKECB_CRC);
scriptfile_addsymbolvalue("DUKENW_CRC", DUKENW_CRC); scriptfile_addsymbolvalue("DUKENW_CRC", DUKENW_CRC);
while (!scriptfile_eof(script))
{
enum enum
{ {
T_GRPINFO, T_GRPINFO,
@ -88,8 +90,6 @@ static void LoadList(const char * filename)
{ "grpinfo", T_GRPINFO }, { "grpinfo", T_GRPINFO },
}; };
while (!scriptfile_eof(script))
{
int32_t token = getatoken(script,profiletokens,sizeof(profiletokens)/sizeof(tokenlist)); int32_t token = getatoken(script,profiletokens,sizeof(profiletokens)/sizeof(tokenlist));
switch (token) switch (token)
{ {
@ -155,9 +155,9 @@ static void LoadList(const char * filename)
if (gdef) if (gdef)
fg->defname = dup_filename(gdef); fg->defname = dup_filename(gdef);
} }
break;
} }
break;
default: default:
break; break;
} }