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

Show fake TROR texture when show-invisibility [I] is on in Mapster32/Polymer.

Browse source 
Also move a 'int16_t editstatus' declaration from polymost.c to engine_priv.h.

git-svn-id: https://svn.eduke32.com/eduke32@2066 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-10-02 22:38:09 +00:00
parent eba8de3007
commit a0b928583b
3 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -664,20 +664,38 @@ static void yax_tweakpicnums(int32_t bunchnum, int32_t cf, int32_t restore)
for (SECTORS_OF_BUNCH(bunchnum, cf, i)) for (SECTORS_OF_BUNCH(bunchnum, cf, i))
{ {
dastat = (SECTORFLD(i,stat, cf)&(128+256)); dastat = (SECTORFLD(i,stat, cf)&(128+256));
if (dastat==0)
if (dastat==0 || (restore==1 && opicnum[cf][i]&0x8000))
{ {
if (!restore) if (!restore)
{ {
opicnum[cf][i] = SECTORFLD(i,picnum, cf); opicnum[cf][i] = SECTORFLD(i,picnum, cf);
if (editstatus && showinvisibility) if (editstatus && showinvisibility)
SECTORFLD(i,picnum, cf) = MAXTILES-1; SECTORFLD(i,picnum, cf) = MAXTILES-1;
else if ((dastat&(128+256))==0) else //if ((dastat&(128+256))==0)
SECTORFLD(i,picnum, cf) = 13; //FOF; SECTORFLD(i,picnum, cf) = 13; //FOF;
} }
else else
{ {
SECTORFLD(i,picnum, cf) = opicnum[cf][i]; SECTORFLD(i,picnum, cf) = opicnum[cf][i];
} }
#ifdef POLYMER
// will be called only in editor
if (rendmode==4)
{
if (!restore)
{
SECTORFLD(i,stat, cf) |= 128;
opicnum[cf][i] |= 0x8000;
}
else
{
SECTORFLD(i,stat, cf) &= ~128;
SECTORFLD(i,picnum, cf) &= 0x7fff;
opicnum[cf][i] = 0;
}
}
#endif
} }
} }
} }
@ -7964,6 +7982,16 @@ void drawrooms(int32_t daposx, int32_t daposy, int32_t daposz,
# ifdef POLYMER # ifdef POLYMER
if (rendmode == 4) if (rendmode == 4)
{ {
// BEGIN TWEAK ceiling/floor fake 'TROR' pics
if (editstatus && showinvisibility)
{
for (i=0; i<numyaxbunches; i++)
{
yax_tweakpicnums(i, YAX_CEILING, 0);
yax_tweakpicnums(i, YAX_FLOOR, 0);
}
}
polymer_glinit(); polymer_glinit();
polymer_drawrooms(daposx, daposy, daposz, daang, dahoriz, dacursectnum); polymer_drawrooms(daposx, daposy, daposz, daang, dahoriz, dacursectnum);
bglDisable(GL_CULL_FACE); bglDisable(GL_CULL_FACE);
@ -8439,6 +8467,16 @@ killsprite:
#ifdef POLYMER #ifdef POLYMER
if (rendmode == 4) { if (rendmode == 4) {
polymer_drawmasks(); polymer_drawmasks();
// END TWEAK ceiling/floor fake 'TROR' pics
if (editstatus && showinvisibility)
{
for (i=0; i<numyaxbunches; i++)
{
yax_tweakpicnums(i, YAX_CEILING, 1);
yax_tweakpicnums(i, YAX_FLOOR, 1);
}
}
} }
#endif #endif

2
polymer/eduke32/build/src/engine_priv.h
View file

@ -42,6 +42,8 @@ extern int16_t globalpicnum;
extern int32_t globalx1, globaly2; extern int32_t globalx1, globaly2;
extern int32_t globalorientation; extern int32_t globalorientation;
extern int16_t editstatus;
extern int16_t searchit; extern int16_t searchit;
extern int32_t searchx, searchy; extern int32_t searchx, searchy;
extern int16_t searchsector, searchwall, searchstat; extern int16_t searchsector, searchwall, searchstat;

2
polymer/eduke32/build/src/polymost.c
View file

@ -210,8 +210,6 @@ static char ptempbuf[MAXWALLSB<<1];
int32_t r_parallaxskyclamping = 1; int32_t r_parallaxskyclamping = 1;
int32_t r_parallaxskypanning = 0; int32_t r_parallaxskypanning = 0;
extern int16_t editstatus;
#define MIN_CACHETIME_PRINT 10 #define MIN_CACHETIME_PRINT 10