zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the fixspritesectors call and the start sector updating into ExtPreSaveMap().

Browse source 
This makes the latter also correct when testing a map from the editor.

git-svn-id: https://svn.eduke32.com/eduke32@2001 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-09-04 19:43:48 +00:00
parent decb2a0db1
commit 962910ce32
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/editor.h
View file

@ -149,6 +149,8 @@ extern void AlignWallPoint2(int32_t w0);
extern int32_t AutoAlignWalls(int32_t w0, uint32_t flags, int32_t nrecurs); extern int32_t AutoAlignWalls(int32_t w0, uint32_t flags, int32_t nrecurs);
extern void SetFirstWall(int32_t sectnum, int32_t wallnum); extern void SetFirstWall(int32_t sectnum, int32_t wallnum);
extern void fixspritesectors(void);
extern void clearkeys(void);
extern int32_t ExtInit(void); extern int32_t ExtInit(void);
extern int32_t ExtPreInit(int32_t argc,const char **argv); extern int32_t ExtPreInit(int32_t argc,const char **argv);

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

@ -6915,10 +6915,6 @@ const char *SaveBoard(const char *fn, uint32_t flags)
f++; f++;
} }
fixspritesectors(); //Do this before saving!
updatesectorz(startposx,startposy,startposz,&startsectnum);
if (startsectnum < 0)
updatesector(startposx,startposy,&startsectnum);
ExtPreSaveMap(); ExtPreSaveMap();
ret = saveboard(f,&startposx,&startposy,&startposz,&startang,&startsectnum); ret = saveboard(f,&startposx,&startposy,&startposz,&startang,&startsectnum);
if ((flags&1)==0) if ((flags&1)==0)
@ -9568,7 +9564,6 @@ void test_map(int32_t mode)
} }
Bstrcat(fullparam, param); Bstrcat(fullparam, param);
fixspritesectors(); //Do this before saving!
ExtPreSaveMap(); ExtPreSaveMap();
if (mode) if (mode)
saveboard(PLAYTEST_MAPNAME,&startposx,&startposy,&startposz,&startang,&startsectnum); saveboard(PLAYTEST_MAPNAME,&startposx,&startposy,&startposz,&startang,&startsectnum);

5
polymer/eduke32/source/astub.c
View file

@ -8344,6 +8344,11 @@ static void InitCustomColors(void)
void ExtPreSaveMap(void) void ExtPreSaveMap(void)
{ {
fixspritesectors(); //Do this before saving!
updatesectorz(startposx,startposy,startposz,&startsectnum);
if (startsectnum < 0)
updatesector(startposx,startposy,&startsectnum);
if (fixmapbeforesaving) if (fixmapbeforesaving)
{ {
int32_t i, startwall, j, endwall; int32_t i, startwall, j, endwall;

2
polymer/eduke32/source/mapster32.h
View file

@ -106,7 +106,6 @@ static int32_t acurpalette=0;
//void ContextHelp(int16_t spritenum); //void ContextHelp(int16_t spritenum);
//void ResetKeys(); //void ResetKeys();
extern void fixspritesectors(void);
//#define KEY_PRESSED(sc) KB_KeyPressed((sc)) //#define KEY_PRESSED(sc) KB_KeyPressed((sc))
// This table defines the various zoom levels, the numbers being the pixel width // This table defines the various zoom levels, the numbers being the pixel width
@ -165,7 +164,6 @@ static int32_t numalphabets = 0;
extern int16_t localartfreq[MAXTILES]; extern int16_t localartfreq[MAXTILES];
extern int16_t localartlookup[MAXTILES], localartlookupnum; extern int16_t localartlookup[MAXTILES], localartlookupnum;
extern int32_t lockclock; extern int32_t lockclock;
extern void clearkeys(void);
static int32_t gs_spriteTagValue[3][7]; static int32_t gs_spriteTagValue[3][7];
static char gs_spriteTagInterested[3][7]; static char gs_spriteTagInterested[3][7];