OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'fb9231a38d' into scripting

Browse source 
Conflicts:
	src/info.cpp
	src/thingdef/thingdef_expression.cpp
	wadsrc/static/actors/constants.txt

(Scripting branch update part 2)
This commit is contained in:
Christoph Oelckers 2015-04-28 09:57:01 +02:00
commit d6e3fc0567
76 changed files with 562 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/p_setup.cpp
View file

@ -1362,7 +1362,7 @@ void P_LoadSegs (MapData * map)
}
}
}
catch (badseg bad)
catch (const badseg &bad) // the preferred way is to catch by (const) reference.
{
switch (bad.badtype)
{
@ -1467,7 +1467,6 @@ void P_LoadSubsectors (MapData * map)
void P_LoadSectors (MapData *map, FMissingTextureTracker &missingtex)
{
char fname[9];
int i;
char *msp;
mapsector_t *ms;
@ -1486,7 +1485,6 @@ void P_LoadSectors (MapData *map, FMissingTextureTracker &missingtex)
defSeqType = -1;
fogMap = normMap = NULL;
fname[8] = 0;
msp = new char[lumplen];
map->Read(ML_SECTORS, msp);
@ -3041,15 +3039,12 @@ void P_LoadBlockMap (MapData * map)
blockmap = blockmaplump+4;
}
//
// P_GroupLines
// Builds sector line lists and subsector sector numbers.
// Finds block bounding boxes for sectors.
// [RH] Handles extra lights
//
struct linf { short tag; WORD count; };
line_t** linebuffer;
static void P_GroupLines (bool buildmap)
@ -3059,7 +3054,6 @@ static void P_GroupLines (bool buildmap)
int i;
int j;
int total;
int totallights;
line_t* li;
sector_t* sector;
FBoundingBox bbox;
@ -3092,7 +3086,6 @@ static void P_GroupLines (bool buildmap)
// count number of lines in each sector
times[1].Clock();
total = 0;
totallights = 0;
for (i = 0, li = lines; i < numlines; i++, li++)
{
if (li->frontsector == NULL)