zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

-

Browse source 
SVN r2629 (trunk)
This commit is contained in:
Randy Heit 2010-08-29 03:52:02 +00:00
parent f9691a24ff
commit d4b03e2b77
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/p_setup.cpp
View file

@ -1094,6 +1094,14 @@ static bool P_CheckV4Nodes(MapData *map)
// //
//=========================================================================== //===========================================================================
struct badseg
{
badseg(int t, int s, int d) : badtype(t), badsegnum(s), baddata(d) {}
int badtype;
int badsegnum;
int baddata;
};
template<class segtype> template<class segtype>
void P_LoadSegs (MapData * map) void P_LoadSegs (MapData * map)
{ {
@ -1159,7 +1167,7 @@ void P_LoadSegs (MapData * map)
if (vnum1 >= numvertexes || vnum2 >= numvertexes) if (vnum1 >= numvertexes || vnum2 >= numvertexes)
{ {
throw i * 4; throw badseg(0, i, MAX(vnum1, vnum2));
} }
li->v1 = &vertexes[vnum1]; li->v1 = &vertexes[vnum1];
@ -1226,14 +1234,14 @@ void P_LoadSegs (MapData * map)
linedef = LittleShort(ml->linedef); linedef = LittleShort(ml->linedef);
if ((unsigned)linedef >= (unsigned)numlines) if ((unsigned)linedef >= (unsigned)numlines)
{ {
throw i * 4 + 1; throw badseg(1, i, linedef);
} }
ldef = &lines[linedef]; ldef = &lines[linedef];
li->linedef = ldef; li->linedef = ldef;
side = LittleShort(ml->side); side = LittleShort(ml->side);
if ((unsigned)(ldef->sidedef[side] - sides) >= (unsigned)numsides) if ((unsigned)(ldef->sidedef[side] - sides) >= (unsigned)numsides)
{ {
throw i * 4 + 2; throw badseg(2, i, int(ldef->sidedef[side] - sides));
} }
li->sidedef = ldef->sidedef[side]; li->sidedef = ldef->sidedef[side];
li->frontsector = ldef->sidedef[side]->sector; li->frontsector = ldef->sidedef[side]->sector;
@ -1250,20 +1258,20 @@ void P_LoadSegs (MapData * map)
} }
} }
} }
catch (int foo) catch (badseg bad)
{ {
switch (foo & 3) switch (bad.badtype)
{ {
case 0: case 0:
Printf ("Seg %d references a nonexistant vertex.\n", foo >> 2); Printf ("Seg %d references a nonexistant vertex %d (max %d).\n", bad.badsegnum, bad.baddata, numvertexes);
break; break;
case 1: case 1:
Printf ("Seg %d references a nonexistant linedef.\n", foo >> 2); Printf ("Seg %d references a nonexistant linedef %d (max %d).\n", bad.badsegnum, bad.baddata, numlines);
break; break;
case 2: case 2:
Printf ("The linedef for seg %d references a nonexistant sidedef.\n", foo >> 2); Printf ("The linedef for seg %d references a nonexistant sidedef %d (max %d).\n", bad.badsegnum, bad.baddata, numsides);
break; break;
} }
Printf ("The BSP will be rebuilt.\n"); Printf ("The BSP will be rebuilt.\n");