stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-23 20:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Kill compile warnings.

Browse source
This commit is contained in:
Nev3r 2019-12-13 11:56:24 +01:00
parent 0c3147eb4c
commit 0dccc26cfa
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_setup.c
View file

@ -2779,7 +2779,7 @@ static void LoadMapLUT (const virtres_t* virt)
P_CreateBlockMap(); P_CreateBlockMap();
} }
static void LoadMapData (const virtres_t* virt) static boolean LoadMapData (const virtres_t* virt)
{ {
virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL; virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL;
virtlump_t* textmap = vres_Find(virt, "TEXTMAP"); virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
@ -2795,7 +2795,10 @@ static void LoadMapData (const virtres_t* virt)
// Count how many entries for each type we got in textmap. // Count how many entries for each type we got in textmap.
if (!TextmapCount(textmap->data, textmap->size)) if (!TextmapCount(textmap->data, textmap->size))
return; {
CONS_Alert(CONS_WARNING, "Textmap data empty!\n");
return false;
}
} }
else else
{ {
@ -2869,7 +2872,11 @@ static void LoadMapData (const virtres_t* virt)
P_SetupLevelFlatAnims(); P_SetupLevelFlatAnims();
if (!LoadMapBSP(virt)) if (!LoadMapBSP(virt))
{
CONS_Alert(CONS_WARNING, "Failed to load map BSP!\n");
return false; return false;
}
LoadMapLUT(virt); LoadMapLUT(virt);
if (textmap) if (textmap)
@ -2879,6 +2886,8 @@ static void LoadMapData (const virtres_t* virt)
P_LoadLineDefs2(); P_LoadLineDefs2();
P_GroupLines(); P_GroupLines();
return true;
} }
#if 0 #if 0
@ -3639,7 +3648,11 @@ boolean P_SetupLevel(boolean skipprecip)
{ {
virtres_t* virt = vres_GetMap(lastloadedmaplumpnum); virtres_t* virt = vres_GetMap(lastloadedmaplumpnum);
LoadMapData(virt); if (!LoadMapData(virt))
{
CONS_Alert(CONS_ERROR, "Invalid map data.\n");
return false;
}
P_MakeMapMD5(virt, &mapmd5); P_MakeMapMD5(virt, &mapmd5);