zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: keep the temp sector on some more occasions that don't delete them.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2716 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-01 20:09:22 +00:00
parent df105128cb
commit 520f84b569
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
polymer/eduke32/build/src/build.c
View file

@ -103,6 +103,7 @@ char somethingintab = 255;
static int16_t onextwall[MAXWALLS]; // onextwall[i]>=0 implies wall[i].nextwall < 0 static int16_t onextwall[MAXWALLS]; // onextwall[i]>=0 implies wall[i].nextwall < 0
static void mkonwvalid(void) { chsecptr_onextwall = onextwall; } static void mkonwvalid(void) { chsecptr_onextwall = onextwall; }
static void mkonwinvalid(void) { chsecptr_onextwall = NULL; tempsectornum=-1; } static void mkonwinvalid(void) { chsecptr_onextwall = NULL; tempsectornum=-1; }
static void mkonwinvalid_keeptempsect(void) { chsecptr_onextwall = NULL; }
static int32_t onwisvalid(void) { return chsecptr_onextwall != NULL; } static int32_t onwisvalid(void) { return chsecptr_onextwall != NULL; }
int32_t mlook = 0, mskip=0; int32_t mlook = 0, mskip=0;
@ -1835,7 +1836,7 @@ void ovh_whiteoutgrab(int32_t restoreredwalls)
if (highlightsectorcnt > 0) if (highlightsectorcnt > 0)
mkonwvalid(); mkonwvalid();
else else
mkonwinvalid(); mkonwinvalid_keeptempsect();
} }
static void duplicate_selected_sectors(void) static void duplicate_selected_sectors(void)
@ -2560,8 +2561,6 @@ static void sort_walls_geometrically(int16_t *wallist, int32_t nwalls)
void SetFirstWall(int32_t sectnum, int32_t wallnum) void SetFirstWall(int32_t sectnum, int32_t wallnum)
{ {
const int32_t otempsectornum = tempsectornum;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int32_t i, j, k, startwall, endwall; int32_t i, j, k, startwall, endwall;
int16_t cf, bunchnum, tempsect, tempwall; int16_t cf, bunchnum, tempsect, tempwall;
@ -2604,8 +2603,7 @@ void SetFirstWall(int32_t sectnum, int32_t wallnum)
setfirstwall(sectnum, wallnum); setfirstwall(sectnum, wallnum);
mkonwinvalid(); mkonwinvalid_keeptempsect();
tempsectornum = otempsectornum; // protect from mkonwinvalid()
asksave = 1; asksave = 1;
} }
@ -6897,7 +6895,7 @@ end_batch_insert_points:
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
yax_updategrays(pos.z); yax_updategrays(pos.z);
#endif #endif
mkonwinvalid(); mkonwinvalid_keeptempsect();
asksave = 1; asksave = 1;
} }
} }
@ -7128,7 +7126,7 @@ point_not_inserted:
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
yax_updategrays(pos.z); yax_updategrays(pos.z);
#endif #endif
mkonwinvalid(); mkonwinvalid_keeptempsect();
} }
} }
@ -7487,7 +7485,7 @@ CANCEL:
checksectorpointer(j, highlightsector[i]); checksectorpointer(j, highlightsector[i]);
} }
} }
mkonwinvalid(); mkonwinvalid_keeptempsect();
fixspritesectors(); fixspritesectors();
@ -8202,8 +8200,11 @@ int32_t fixspritesectors(void)
for (i=numsectors-1; i>=0; i--) for (i=numsectors-1; i>=0; i--)
if (sector[i].wallnum <= 0 || sector[i].wallptr >= numwalls) if (sector[i].wallnum <= 0 || sector[i].wallptr >= numwalls)
{ {
// XXX: This is not the best course of action for
// such great corruption.
deletesector(i); deletesector(i);
initprintf("Deleted sector %d which had corrupt .wallnum or .wallptr\n", i); mkonwinvalid();
initprintf("NOTE: Deleted sector %d which had corrupt .wallnum or .wallptr\n", i);
} }
if (m32_script_expertmode) if (m32_script_expertmode)