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

premap.c: stylistic cleanup in map loading code.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4214 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-12-24 09:44:25 +00:00
parent 8dcee7c8dc
commit 030f72d551
1 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
polymer/eduke32/source/premap.c
View file

@ -1779,6 +1779,11 @@ void G_SetupFilenameBasedMusic(char *levnamebuf, const char *boardfilename, int3
realloc_and_copy_musicfn(level_number, levnamebuf, 0); realloc_and_copy_musicfn(level_number, levnamebuf, 0);
} }
static int G_HaveUserMap(void)
{
return (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0);
}
int32_t G_EnterLevel(int32_t g) int32_t G_EnterLevel(int32_t g)
{ {
int32_t i, mii; int32_t i, mii;
@ -1810,7 +1815,7 @@ int32_t G_EnterLevel(int32_t g)
setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP); setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP);
} }
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0) if (G_HaveUserMap())
{ {
int32_t volume, level; int32_t volume, level;
@ -1833,7 +1838,7 @@ int32_t G_EnterLevel(int32_t g)
if (MapInfo[mii].name == NULL || MapInfo[mii].filename == NULL) if (MapInfo[mii].name == NULL || MapInfo[mii].filename == NULL)
{ {
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0) if (G_HaveUserMap())
{ {
if (MapInfo[mii].filename == NULL) if (MapInfo[mii].filename == NULL)
MapInfo[mii].filename = (char *)Bcalloc(BMAX_PATH, sizeof(uint8_t)); MapInfo[mii].filename = (char *)Bcalloc(BMAX_PATH, sizeof(uint8_t));
@ -1855,7 +1860,7 @@ int32_t G_EnterLevel(int32_t g)
ud.screen_size = i; ud.screen_size = i;
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0) if (G_HaveUserMap())
{ {
Bstrcpy(levname, boardfilename); Bstrcpy(levname, boardfilename);
Bsprintf(apptitle,"%s - %s - " APPNAME,levname,g_gameNamePtr); Bsprintf(apptitle,"%s - %s - " APPNAME,levname,g_gameNamePtr);
@ -1865,46 +1870,25 @@ int32_t G_EnterLevel(int32_t g)
Bstrcpy(tempbuf,apptitle); Bstrcpy(tempbuf,apptitle);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
if (!VOLUMEONE) /***** Load the map *****/
{ {
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0) DukePlayer_t *ps = g_player[0].ps;
if (!VOLUMEONE && G_HaveUserMap())
{ {
if (loadboard(boardfilename, 0, &g_player[0].ps->pos, &g_player[0].ps->ang, if (loadboard(boardfilename, 0, &ps->pos, &ps->ang, &ps->cursectnum) < 0)
&g_player[0].ps->cursectnum) < 0)
{ {
OSD_Printf(OSD_ERROR "Map \"%s\" not found or invalid map version!\n",boardfilename); OSD_Printf(OSD_ERROR "Map \"%s\" not found or invalid map version!\n",boardfilename);
//G_GameExit(tempbuf);
return 1; return 1;
} }
G_LoadMapHack(levname, boardfilename); G_LoadMapHack(levname, boardfilename);
G_SetupFilenameBasedMusic(levname, boardfilename, ud.m_level_number); G_SetupFilenameBasedMusic(levname, boardfilename, ud.m_level_number);
} }
else if (loadboard(MapInfo[mii].filename, 0, &g_player[0].ps->pos, &g_player[0].ps->ang, else if (loadboard(MapInfo[mii].filename, VOLUMEONE, &ps->pos, &ps->ang, &ps->cursectnum) < 0)
&g_player[0].ps->cursectnum) < 0)
{ {
OSD_Printf(OSD_ERROR "Map \"%s\" not found or invalid map version!\n", OSD_Printf(OSD_ERROR "Map \"%s\" not found or invalid map version!\n",
MapInfo[mii].filename); MapInfo[mii].filename);
//G_GameExit(tempbuf);
return 1;
}
else
{
G_LoadMapHack(levname, MapInfo[mii].filename);
}
}
else
{
if (loadboard(MapInfo[mii].filename, 1, &g_player[0].ps->pos, &g_player[0].ps->ang,
&g_player[0].ps->cursectnum) < 0)
{
OSD_Printf(OSD_ERROR "Map \"%s\" not found or invalid map version!\n",
MapInfo[mii].filename);
//G_GameExit(tempbuf);
return 1; return 1;
} }
else else