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

Don't autoexec <mapname>.cfg files for clipshape maps.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4212 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-12-24 09:44:23 +00:00
parent cc09a0ac92
commit 4739d3c00e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/src/engine.c
View file

@ -1402,7 +1402,7 @@ int32_t clipmapinfo_load(void)
fisec[fi] = ournumsectors; fisec[fi] = ournumsectors;
fispr[fi] = ournumsprites; fispr[fi] = ournumsprites;
i = loadboard(g_clipMapFiles[fi], 0, &tmppos, &ang, &cs); i = loadboard(g_clipMapFiles[fi], 8, &tmppos, &ang, &cs);
if (i<0) if (i<0)
continue; continue;
// Numsprites will now be set! // Numsprites will now be set!
@ -9854,7 +9854,9 @@ LUNATIC_CB int32_t (*loadboard_maptext)(int32_t fil, vec3_t *dapos, int16_t *daa
// flags: 1, 2: former parameter "fromwhere" // flags: 1, 2: former parameter "fromwhere"
// 4: don't call polymer_loadboard // 4: don't call polymer_loadboard
// returns: -1: file not found // 8: don't autoexec <mapname>.cfg
// returns: on success, number of removed sprites
// -1: file not found
// -2: invalid version // -2: invalid version
// -3: invalid number of sectors, walls or sprites // -3: invalid number of sectors, walls or sprites
// <= -4: map-text error // <= -4: map-text error
@ -10032,6 +10034,7 @@ skip_reading_mapbin:
yax_updategrays(dapos->z); yax_updategrays(dapos->z);
#endif #endif
if ((myflags&8)==0)
{ {
char fn[BMAX_PATH]; char fn[BMAX_PATH];