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

Mapster32/Lunatic: clear bunchnum and TROR nextwalls when c&p-ing sectors.

Browse source 
That is, if a bunch is discarded when copying a sector to the clipboard.
(This happens if not all sectors that are part of the bunch are copied.)

git-svn-id: https://svn.eduke32.com/eduke32@4011 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-08-12 15:18:13 +00:00
parent 47e9e0be3c
commit d87da2c836
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1612,18 +1612,24 @@ static int32_t backup_highlighted_map(mapinfofull_t *mapinfo)
if (mapinfo->numyaxbunches > 0) if (mapinfo->numyaxbunches > 0)
mapinfo->bunchnum[2*i + j] = nbn; mapinfo->bunchnum[2*i + j] = nbn;
# if !defined NEW_MAP_FORMAT
if (obn >= 0 && nbn < 0) if (obn >= 0 && nbn < 0)
{ {
// if a bunch was discarded // A bunch was discarded.
sectortype *const sec = &mapinfo->sector[i]; sectortype *const sec = &mapinfo->sector[i];
# if !defined NEW_MAP_FORMAT
uint16_t *const cs = j==YAX_CEILING ? &sec->ceilingstat : &sec->floorstat; uint16_t *const cs = j==YAX_CEILING ? &sec->ceilingstat : &sec->floorstat;
uint8_t *const xp = j==YAX_CEILING ? &sec->ceilingxpanning : &sec->floorxpanning; uint8_t *const xp = j==YAX_CEILING ? &sec->ceilingxpanning : &sec->floorxpanning;
*cs &= ~YAX_BIT; *cs &= ~YAX_BIT;
*xp = 0; *xp = 0;
# else
if (j == YAX_CEILING)
sec->ceilingbunch = -1;
else
sec->floorbunch = -1;
# endif
} }
#endif
} }
} }
#endif #endif
@ -1744,12 +1750,20 @@ static int32_t restore_highlighted_map(mapinfofull_t *mapinfo, int32_t forreal)
for (j=0; j<2; j++) for (j=0; j<2; j++)
{ {
if (mapinfo->numyaxbunches > 0) if (mapinfo->numyaxbunches > 0)
{
yax_setnextwall(i, j, mapinfo->ynextwall[2*(i-numwalls) + j]>=0 ? yax_setnextwall(i, j, mapinfo->ynextwall[2*(i-numwalls) + j]>=0 ?
numwalls+mapinfo->ynextwall[2*(i-numwalls) + j] : -1); numwalls+mapinfo->ynextwall[2*(i-numwalls) + j] : -1);
# if !defined NEW_MAP_FORMAT }
else else
{
# if !defined NEW_MAP_FORMAT
// XXX: When copying a TROR portion into a non-TROR map (e.g. a
// new one), tags denoting ynextwalls are left in place.
wall[i].cstat &= ~YAX_NEXTWALLBIT(j); // CLEAR_YNEXTWALLS wall[i].cstat &= ~YAX_NEXTWALLBIT(j); // CLEAR_YNEXTWALLS
# else
yax_setnextwall(i, j, -1);
# endif # endif
}
} }
#endif #endif
} }
@ -8044,6 +8058,8 @@ const char *SaveBoard(const char *fn, uint32_t flags)
g_loadedMapVersion != -1 && g_loadedMapVersion < mapversion) g_loadedMapVersion != -1 && g_loadedMapVersion < mapversion)
{ {
char question[128]; char question[128];
// XXX: This message is potentially confusing if the user is "Saving
// As" to a new file name.
Bsnprintf(question, sizeof(question), "Are you sure to overwrite a version " Bsnprintf(question, sizeof(question), "Are you sure to overwrite a version "
"V%d map with a V%d map-text one?", g_loadedMapVersion, mapversion); "V%d map with a V%d map-text one?", g_loadedMapVersion, mapversion);