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

Conditionally compile out the dynamic-to-static tile remapping feature.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2297 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-28 14:38:23 +00:00
parent 99f1fcb6c2
commit 283e8d053f
10 changed files with 837 additions and 809 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
polymer/eduke32/source/actors.c
View file

@ -832,7 +832,7 @@ ACTOR_STATIC void G_MoveZombieActors(void)
// j = 1; // j = 1;
if (j) switch (DynamicTileMap[s->picnum]) if (j) switch (DYNAMICTILEMAP(s->picnum))
{ {
case RUBBERCAN__STATIC: case RUBBERCAN__STATIC:
case EXPLODINGBARREL__STATIC: case EXPLODINGBARREL__STATIC:
@ -956,7 +956,7 @@ int32_t A_IncurDamage(int32_t sn)
actor[sn].extra*(sintable[actor[sn].ang&2047])<<1; actor[sn].extra*(sintable[actor[sn].ang&2047])<<1;
} }
switch (DynamicTileMap[actor[sn].picnum]) switch (DYNAMICTILEMAP(actor[sn].picnum))
{ {
case RADIUSEXPLOSION__STATIC: case RADIUSEXPLOSION__STATIC:
case RPG__STATIC: case RPG__STATIC:
@ -1225,7 +1225,7 @@ ACTOR_STATIC void G_MoveFX(void)
nexti = nextspritestat[i]; nexti = nextspritestat[i];
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case RESPAWN__STATIC: case RESPAWN__STATIC:
if (sprite[i].extra == 66) if (sprite[i].extra == 66)
@ -2069,7 +2069,7 @@ DETONATE:
} }
else if (sprite[j].statnum == STAT_STANDABLE) else if (sprite[j].statnum == STAT_STANDABLE)
{ {
switch (DynamicTileMap[sprite[j].picnum]) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case SEENINE__STATIC: case SEENINE__STATIC:
case OOZFILTER__STATIC: case OOZFILTER__STATIC:
@ -2094,7 +2094,7 @@ DETONATE:
switchpicnum = BOLT1; switchpicnum = BOLT1;
} }
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case VIEWSCREEN__STATIC: case VIEWSCREEN__STATIC:
case VIEWSCREEN2__STATIC: case VIEWSCREEN2__STATIC:
@ -2830,7 +2830,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
{ {
// here // here
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case RADIUSEXPLOSION__STATIC: case RADIUSEXPLOSION__STATIC:
case KNEE__STATIC: case KNEE__STATIC:
@ -2905,10 +2905,10 @@ ACTOR_STATIC void G_MoveWeapons(void)
A_GetZLimits(i); A_GetZLimits(i);
qq = CLIPMASK1; qq = CLIPMASK1;
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case RPG__STATIC: case RPG__STATIC:
if (DynamicTileMap[s->picnum] == RPG__STATIC && actor[i].picnum != BOSS2 && if (DYNAMICTILEMAP(s->picnum) == RPG__STATIC && actor[i].picnum != BOSS2 &&
s->xrepeat >= 10 && sector[s->sectnum].lotag != 2) s->xrepeat >= 10 && sector[s->sectnum].lotag != 2)
{ {
j = A_Spawn(i,SMALLSMOKE); j = A_Spawn(i,SMALLSMOKE);
@ -3391,7 +3391,7 @@ ACTOR_STATIC void G_MoveTransports(void)
if (warpspriteto && A_CheckSpriteFlags(j,SPRITE_DECAL)) goto JBOLT; if (warpspriteto && A_CheckSpriteFlags(j,SPRITE_DECAL)) goto JBOLT;
if (warpspriteto) switch (DynamicTileMap[sprite[j].picnum]) if (warpspriteto) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case TRANSPORTERSTAR__STATIC: case TRANSPORTERSTAR__STATIC:
case TRANSPORTERBEAM__STATIC: case TRANSPORTERBEAM__STATIC:
@ -3559,7 +3559,7 @@ ACTOR_STATIC void G_MoveActors(void)
{ {
switchpicnum = GREENSLIME; switchpicnum = GREENSLIME;
} }
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case DUCK__STATIC: case DUCK__STATIC:
case TARGET__STATIC: case TARGET__STATIC:
@ -4303,7 +4303,7 @@ ACTOR_STATIC void G_MoveActors(void)
j = headspritesect[sect]; j = headspritesect[sect];
while (j>=0) while (j>=0)
{ {
switch (DynamicTileMap[sprite[j].picnum]) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case LIZTROOP__STATIC: case LIZTROOP__STATIC:
case LIZMAN__STATIC: case LIZMAN__STATIC:
@ -4580,7 +4580,7 @@ DETONATEB:
x = s->extra; x = s->extra;
m = 0; m = 0;
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case HEAVYHBOMB__STATIC: case HEAVYHBOMB__STATIC:
m = g_pipebombBlastRadius; m = g_pipebombBlastRadius;
@ -4686,7 +4686,7 @@ DETONATEB:
j = headspritesect[sect]; j = headspritesect[sect];
while (j >= 0) while (j >= 0)
{ {
switch (DynamicTileMap[sprite[j].picnum]) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case SECTOREFFECTOR__STATIC: case SECTOREFFECTOR__STATIC:
if (sprite[j].lotag == 1) if (sprite[j].lotag == 1)
@ -4922,7 +4922,7 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5
} }
if ((s->picnum == MONEY+1) || (s->picnum == MAIL+1) || (s->picnum == PAPER+1)) if ((s->picnum == MONEY+1) || (s->picnum == MAIL+1) || (s->picnum == PAPER+1))
actor[i].floorz = s->z = getflorzofslope(s->sectnum,s->x,s->y); actor[i].floorz = s->z = getflorzofslope(s->sectnum,s->x,s->y);
else switch (DynamicTileMap[switchpicnum]) else switch (DYNAMICTILEMAP(switchpicnum))
{ {
case APLAYER__STATIC: case APLAYER__STATIC:
s->cstat = 32768; s->cstat = 32768;
@ -7170,7 +7170,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
switch (sprite[j].statnum) switch (sprite[j].statnum)
{ {
case STAT_MISC: case STAT_MISC:
switch (DynamicTileMap[sprite[j].picnum]) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case BLOODPOOL__STATIC: case BLOODPOOL__STATIC:
case PUKE__STATIC: case PUKE__STATIC:
@ -7953,7 +7953,7 @@ BOLT:
void A_PlayAlertSound(int32_t i) void A_PlayAlertSound(int32_t i)
{ {
if (sprite[i].extra > 0) if (sprite[i].extra > 0)
switch (DynamicTileMap[PN]) switch (DYNAMICTILEMAP(PN))
{ {
case LIZTROOPONTOILET__STATIC: case LIZTROOPONTOILET__STATIC:
case LIZTROOPJUSTSIT__STATIC: case LIZTROOPJUSTSIT__STATIC:
@ -8025,7 +8025,7 @@ int32_t A_CheckEnemyTile(int32_t pn)
(pn >= GREENSLIME && pn <= GREENSLIME+7)) (pn >= GREENSLIME && pn <= GREENSLIME+7))
return 1; return 1;
switch (DynamicTileMap[pn]) switch (DYNAMICTILEMAP(pn))
{ {
case SHARK__STATIC: case SHARK__STATIC:
case RECON__STATIC: case RECON__STATIC:
@ -8080,7 +8080,7 @@ int32_t A_CheckSwitchTile(int32_t i)
//loop to catch both states of switches //loop to catch both states of switches
for (j=1; j>=0; j--) for (j=1; j>=0; j--)
{ {
switch (DynamicTileMap[PN-j]) switch (DYNAMICTILEMAP(PN-j))
{ {
case HANDPRINTSWITCH__STATIC: case HANDPRINTSWITCH__STATIC:
//case HANDPRINTSWITCH+1: //case HANDPRINTSWITCH+1:
@ -8184,7 +8184,7 @@ void G_MoveWorld(void)
if (sprite[i].picnum <= 0) // oob safety if (sprite[i].picnum <= 0) // oob safety
break; break;
switch (DynamicTileMap[sprite[i].picnum-1+ii]) switch (DYNAMICTILEMAP(sprite[i].picnum-1+ii))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
case DIPSWITCH2__STATIC: case DIPSWITCH2__STATIC:
@ -8246,7 +8246,7 @@ void G_MoveWorld(void)
} }
} }
switch (DynamicTileMap[sprite[i].picnum]) switch (DYNAMICTILEMAP(sprite[i].picnum))
{ {
case ATOMICHEALTH__STATIC: case ATOMICHEALTH__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesizy[s->picnum])<<1), LIGHTRAD2 * 3, 128+(128<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesizy[s->picnum])<<1), LIGHTRAD2 * 3, 128+(128<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME);

16
polymer/eduke32/source/game.c
View file

@ -657,7 +657,7 @@ static void G_ShowCacheLocks(void)
int32_t A_CheckInventorySprite(spritetype *s) int32_t A_CheckInventorySprite(spritetype *s)
{ {
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case FIRSTAID__STATIC: case FIRSTAID__STATIC:
case STEROIDS__STATIC: case STEROIDS__STATIC:
@ -3970,7 +3970,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
} }
} }
} }
else switch (DynamicTileMap[sp->picnum]) else switch (DYNAMICTILEMAP(sp->picnum))
{ {
default: default:
if (actorscrptr[sp->picnum]) if (actorscrptr[sp->picnum])
@ -4840,7 +4840,7 @@ int32_t A_Spawn(int32_t j, int32_t pn)
if (sp->pal == 0) if (sp->pal == 0)
{ {
switch (DynamicTileMap[sp->picnum]) switch (DYNAMICTILEMAP(sp->picnum))
{ {
case LIZTROOPONTOILET__STATIC: case LIZTROOPONTOILET__STATIC:
case LIZTROOPSHOOT__STATIC: case LIZTROOPSHOOT__STATIC:
@ -5826,7 +5826,7 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
i = t->owner; i = t->owner;
s = &sprite[i]; s = &sprite[i];
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case SECTOREFFECTOR__STATIC: case SECTOREFFECTOR__STATIC:
if (s->lotag == 40 || s->lotag == 41) if (s->lotag == 40 || s->lotag == 41)
@ -5860,7 +5860,7 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
} }
if (t->picnum < GREENSLIME || t->picnum > GREENSLIME+7) if (t->picnum < GREENSLIME || t->picnum > GREENSLIME+7)
switch (DynamicTileMap[t->picnum]) switch (DYNAMICTILEMAP(t->picnum))
{ {
case BLOODPOOL__STATIC: case BLOODPOOL__STATIC:
case PUKE__STATIC: case PUKE__STATIC:
@ -5952,7 +5952,7 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
i = t->owner; i = t->owner;
s = (i < 0 ? &tsprite[j] : &sprite[i]); s = (i < 0 ? &tsprite[j] : &sprite[i]);
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case NATURALLIGHTNING__STATIC: case NATURALLIGHTNING__STATIC:
t->shade = -127; t->shade = -127;
@ -6054,7 +6054,7 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
else if ((s->picnum==MONEY+1)||(s->picnum==MAIL+1)||(s->picnum==PAPER+1)) else if ((s->picnum==MONEY+1)||(s->picnum==MAIL+1)||(s->picnum==PAPER+1))
switchpic--; switchpic--;
switch (DynamicTileMap[switchpic]) switch (DYNAMICTILEMAP(switchpic))
{ {
case DUKELYINGDEAD__STATIC: case DUKELYINGDEAD__STATIC:
t->z += (24<<8); t->z += (24<<8);
@ -6584,7 +6584,7 @@ skip:
} }
} }
switch (DynamicTileMap[s->picnum]) switch (DYNAMICTILEMAP(s->picnum))
{ {
case LASERLINE__STATIC: case LASERLINE__STATIC:
if (sector[t->sectnum].lotag == 2) t->pal = 8; if (sector[t->sectnum].lotag == 2) t->pal = 8;

8
polymer/eduke32/source/gameexec.c
View file

@ -1230,7 +1230,7 @@ skip_check:
} }
else if (sector[vm.g_sp->sectnum].lotag == 1) else if (sector[vm.g_sp->sectnum].lotag == 1)
{ {
switch (DynamicTileMap[vm.g_sp->picnum]) switch (DYNAMICTILEMAP(vm.g_sp->picnum))
{ {
default: default:
// fix for flying/jumping monsters getting stuck in water // fix for flying/jumping monsters getting stuck in water
@ -4778,7 +4778,7 @@ nullquote:
case CON_RESPAWNHITAG: case CON_RESPAWNHITAG:
insptr++; insptr++;
switch (DynamicTileMap[vm.g_sp->picnum]) switch (DYNAMICTILEMAP(vm.g_sp->picnum))
{ {
case FEM1__STATIC: case FEM1__STATIC:
case FEM2__STATIC: case FEM2__STATIC:
@ -4995,7 +4995,7 @@ void A_Execute(int32_t iActor,int32_t iPlayer,int32_t lDist)
} }
*/ */
if (vm.g_sp->statnum == STAT_STANDABLE) if (vm.g_sp->statnum == STAT_STANDABLE)
switch (DynamicTileMap[vm.g_sp->picnum]) switch (DYNAMICTILEMAP(vm.g_sp->picnum))
{ {
case RUBBERCAN__STATIC: case RUBBERCAN__STATIC:
case EXPLODINGBARREL__STATIC: case EXPLODINGBARREL__STATIC:
@ -5272,7 +5272,7 @@ void G_RestoreMapState(mapstate_t *save)
if (ud.lockout) if (ud.lockout)
{ {
for (x=g_numAnimWalls-1; x>=0; x--) for (x=g_numAnimWalls-1; x>=0; x--)
switch (DynamicTileMap[wall[animwall[x].wallnum].picnum]) switch (DYNAMICTILEMAP(wall[animwall[x].wallnum].picnum))
{ {
case FEMPIC1__STATIC: case FEMPIC1__STATIC:
wall[animwall[x].wallnum].picnum = BLANKSCREEN; wall[animwall[x].wallnum].picnum = BLANKSCREEN;

2
polymer/eduke32/source/menus.c
View file

@ -1445,7 +1445,7 @@ void M_DisplayMenus(void)
ud.lockout = 1; ud.lockout = 1;
for (x=0; x<g_numAnimWalls; x++) for (x=0; x<g_numAnimWalls; x++)
switch (DynamicTileMap[wall[animwall[x].wallnum].picnum]) switch (DYNAMICTILEMAP(wall[animwall[x].wallnum].picnum))
{ {
case FEMPIC1__STATIC: case FEMPIC1__STATIC:
wall[animwall[x].wallnum].picnum = BLANKSCREEN; wall[animwall[x].wallnum].picnum = BLANKSCREEN;

6
polymer/eduke32/source/namesdyn.c
View file

@ -28,6 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "namesdyn.h" #include "namesdyn.h"
#include "global.h" #include "global.h"
int16_t DynamicTileMap[MAXTILES];
#ifdef DYNTILEREMAP_ENABLE
struct dynitem struct dynitem
{ {
char *str; char *str;
@ -1517,8 +1520,6 @@ int32_t RESERVEDSLOT10 = RESERVEDSLOT10__STATIC;
int32_t RESERVEDSLOT11 = RESERVEDSLOT11__STATIC; int32_t RESERVEDSLOT11 = RESERVEDSLOT11__STATIC;
int32_t RESERVEDSLOT12 = RESERVEDSLOT12__STATIC; int32_t RESERVEDSLOT12 = RESERVEDSLOT12__STATIC;
int16_t DynamicTileMap[MAXTILES];
void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue) void G_ProcessDynamicTileMapping(const char *szLabel, int32_t lValue)
{ {
int32_t i; int32_t i;
@ -1584,3 +1585,4 @@ void G_InitDynamicTiles(void)
WeaponPickupSprites[10] = HEAVYHBOMB; WeaponPickupSprites[10] = HEAVYHBOMB;
WeaponPickupSprites[11] = SHRINKERSPRITE; WeaponPickupSprites[11] = SHRINKERSPRITE;
} }
#endif

1502
polymer/eduke32/source/namesdyn.h
View file

File diff suppressed because it is too large Load diff

18
polymer/eduke32/source/player.c
View file

@ -213,7 +213,7 @@ static int32_t A_FindTargetSprite(spritetype *s,int32_t aang,int32_t atwith)
{ {
if (A_CheckSpriteTileFlags(atwith,SPRITE_PROJECTILE) && (ProjectileData[atwith].workslike & PROJECTILE_RPG)) if (A_CheckSpriteTileFlags(atwith,SPRITE_PROJECTILE) && (ProjectileData[atwith].workslike & PROJECTILE_RPG))
return -1; return -1;
else switch (DynamicTileMap[atwith]) else switch (DYNAMICTILEMAP(atwith))
{ {
case TONGUE__STATIC: case TONGUE__STATIC:
case FREEZEBLAST__STATIC: case FREEZEBLAST__STATIC:
@ -347,7 +347,7 @@ int32_t A_Shoot(int32_t i,int32_t atwith)
#ifdef POLYMER #ifdef POLYMER
if (atwith >= 0) if (atwith >= 0)
switch (DynamicTileMap[atwith]) switch (DYNAMICTILEMAP(atwith))
{ {
case FIRELASER__STATIC: case FIRELASER__STATIC:
case SHOTGUN__STATIC: case SHOTGUN__STATIC:
@ -1047,7 +1047,7 @@ DOSKIPBULLETHOLE:
} }
else if (atwith >= 0) else if (atwith >= 0)
{ {
switch (DynamicTileMap[atwith]) switch (DYNAMICTILEMAP(atwith))
{ {
case BLOODSPLAT1__STATIC: case BLOODSPLAT1__STATIC:
case BLOODSPLAT2__STATIC: case BLOODSPLAT2__STATIC:
@ -3667,7 +3667,7 @@ void P_CheckTouchDamage(DukePlayer_t *p,int32_t j)
if ((switchpicnum>W_FORCEFIELD)&&(switchpicnum<=W_FORCEFIELD+2)) if ((switchpicnum>W_FORCEFIELD)&&(switchpicnum<=W_FORCEFIELD+2))
switchpicnum=W_FORCEFIELD; switchpicnum=W_FORCEFIELD;
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case W_FORCEFIELD__STATIC: case W_FORCEFIELD__STATIC:
// case W_FORCEFIELD+1: // case W_FORCEFIELD+1:
@ -3716,7 +3716,7 @@ int32_t P_CheckFloorDamage(DukePlayer_t *p, int32_t j)
int32_t ret = 0; int32_t ret = 0;
spritetype *s = &sprite[p->i]; spritetype *s = &sprite[p->i];
switch (DynamicTileMap[j]) switch (DYNAMICTILEMAP(j))
{ {
case HURTRAIL__STATIC: case HURTRAIL__STATIC:
if (rnd(32)) if (rnd(32))
@ -5310,7 +5310,7 @@ void P_ProcessInput(int32_t snum)
j = sprite[lz&(MAXSPRITES-1)].picnum; j = sprite[lz&(MAXSPRITES-1)].picnum;
else j = sector[p->cursectnum].floorpicnum; else j = sector[p->cursectnum].floorpicnum;
switch (DynamicTileMap[j]) switch (DYNAMICTILEMAP(j))
{ {
case PANNEL1__STATIC: case PANNEL1__STATIC:
case PANNEL2__STATIC: case PANNEL2__STATIC:
@ -5580,7 +5580,7 @@ HORIZONLY:
A_Spawn(p->actorsqu,BLOODPOOL); A_Spawn(p->actorsqu,BLOODPOOL);
A_PlaySound(SQUISHED,p->actorsqu); A_PlaySound(SQUISHED,p->actorsqu);
switch (DynamicTileMap[sprite[p->actorsqu].picnum]) switch (DYNAMICTILEMAP(sprite[p->actorsqu].picnum))
{ {
case FEM1__STATIC: case FEM1__STATIC:
case FEM2__STATIC: case FEM2__STATIC:
@ -5624,7 +5624,7 @@ HORIZONLY:
//UPDATE THIS FILE OVER THE OLD GETSPRITESCORE/COMPUTERGETINPUT FUNCTIONS //UPDATE THIS FILE OVER THE OLD GETSPRITESCORE/COMPUTERGETINPUT FUNCTIONS
int32_t getspritescore(int32_t snum, int32_t dapicnum) int32_t getspritescore(int32_t snum, int32_t dapicnum)
{ {
switch (DynamicTileMap[dapicnum]) switch (DYNAMICTILEMAP(dapicnum))
{ {
case FIRSTGUNSPRITE__STATIC: case FIRSTGUNSPRITE__STATIC:
return(20); return(20);
@ -5806,7 +5806,7 @@ void computergetinput(int32_t snum, input_t *syn)
for (j=headspritestat[STAT_PROJECTILE]; j>=0; j=nextspritestat[j]) for (j=headspritestat[STAT_PROJECTILE]; j>=0; j=nextspritestat[j])
{ {
switch (DynamicTileMap[sprite[j].picnum]) switch (DYNAMICTILEMAP(sprite[j].picnum))
{ {
case TONGUE__STATIC: case TONGUE__STATIC:
k = 4; k = 4;

14
polymer/eduke32/source/premap.c
View file

@ -98,7 +98,7 @@ static void G_CacheSpriteNum(int32_t i)
for (j = PN; j <= SpriteCacheList[PN][1]; j++) for (j = PN; j <= SpriteCacheList[PN][1]; j++)
tloadtile(j,1); tloadtile(j,1);
switch (DynamicTileMap[PN]) switch (DYNAMICTILEMAP(PN))
{ {
case HYDRENT__STATIC: case HYDRENT__STATIC:
tloadtile(BROKEFIREHYDRENT,1); tloadtile(BROKEFIREHYDRENT,1);
@ -1014,7 +1014,7 @@ static inline void G_SetupBackdrop(int16_t sky)
if (parallaxyscale != 65536) if (parallaxyscale != 65536)
parallaxyscale = 32768; parallaxyscale = 32768;
switch (DynamicTileMap[sky]) switch (DYNAMICTILEMAP(sky))
{ {
case CLOUDYOCEAN__STATIC: case CLOUDYOCEAN__STATIC:
parallaxyscale = 65536L; parallaxyscale = 65536L;
@ -1174,7 +1174,7 @@ static inline void prelevel(char g)
g_player[0].ps->exitx = SX; g_player[0].ps->exitx = SX;
g_player[0].ps->exity = SY; g_player[0].ps->exity = SY;
} }
else switch (DynamicTileMap[PN]) else switch (DYNAMICTILEMAP(PN))
{ {
case GPSPEED__STATIC: case GPSPEED__STATIC:
sector[SECT].extra = SLT; sector[SECT].extra = SLT;
@ -1241,7 +1241,7 @@ static inline void prelevel(char g)
continue; continue;
for (ii=0; ii<2; ii++) for (ii=0; ii<2; ii++)
switch (DynamicTileMap[PN-1+ii]) switch (DYNAMICTILEMAP(PN-1+ii))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
case DIPSWITCH2__STATIC: case DIPSWITCH2__STATIC:
@ -1339,7 +1339,7 @@ static inline void prelevel(char g)
if (switchpicnum >= 0) if (switchpicnum >= 0)
{ {
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case FANSHADOW__STATIC: case FANSHADOW__STATIC:
case FANSPRITE__STATIC: case FANSPRITE__STATIC:
@ -1372,7 +1372,7 @@ static inline void prelevel(char g)
wal->extra = -1; wal->extra = -1;
switch (DynamicTileMap[wal->picnum]) switch (DYNAMICTILEMAP(wal->picnum))
{ {
case WATERTILE2__STATIC: case WATERTILE2__STATIC:
for (j=0; j<3; j++) for (j=0; j<3; j++)
@ -2065,7 +2065,7 @@ int32_t G_EnterLevel(int32_t g)
P_DoQuote(QUOTE_F1HELP,g_player[myconnectindex].ps); P_DoQuote(QUOTE_F1HELP,g_player[myconnectindex].ps);
TRAVERSE_CONNECT(i) TRAVERSE_CONNECT(i)
switch (DynamicTileMap[sector[sprite[g_player[i].ps->i].sectnum].floorpicnum]) switch (DYNAMICTILEMAP(sector[sprite[g_player[i].ps->i].sectnum].floorpicnum))
{ {
case HURTRAIL__STATIC: case HURTRAIL__STATIC:
case FLOORSLIME__STATIC: case FLOORSLIME__STATIC:

4
polymer/eduke32/source/savegame.c
View file

@ -802,7 +802,7 @@ int32_t G_LoadPlayer(int32_t spot)
else else
{ {
for (x=0; x<g_numAnimWalls; x++) for (x=0; x<g_numAnimWalls; x++)
switch (DynamicTileMap[wall[animwall[x].wallnum].picnum]) switch (DYNAMICTILEMAP(wall[animwall[x].wallnum].picnum))
{ {
case FEMPIC1__STATIC: case FEMPIC1__STATIC:
wall[animwall[x].wallnum].picnum = BLANKSCREEN; wall[animwall[x].wallnum].picnum = BLANKSCREEN;
@ -2635,7 +2635,7 @@ static void postloadplayer(int32_t savegamep)
if (ud.lockout) if (ud.lockout)
{ {
for (i=0; i<g_numAnimWalls; i++) for (i=0; i<g_numAnimWalls; i++)
switch (DynamicTileMap[wall[animwall[i].wallnum].picnum]) switch (DYNAMICTILEMAP(wall[animwall[i].wallnum].picnum))
{ {
case FEMPIC1__STATIC: case FEMPIC1__STATIC:
wall[animwall[i].wallnum].picnum = BLANKSCREEN; wall[animwall[i].wallnum].picnum = BLANKSCREEN;

36
polymer/eduke32/source/sector.c
View file

@ -123,7 +123,7 @@ int32_t G_CheckActivatorMotion(int32_t lotag)
int32_t CheckDoorTile(int32_t dapic) int32_t CheckDoorTile(int32_t dapic)
{ {
switch (DynamicTileMap[dapic]) switch (DYNAMICTILEMAP(dapic))
{ {
case DOORTILE1__STATIC: case DOORTILE1__STATIC:
case DOORTILE2__STATIC: case DOORTILE2__STATIC:
@ -403,7 +403,7 @@ void G_AnimateWalls(void)
i = animwall[p].wallnum; i = animwall[p].wallnum;
j = wall[i].picnum; j = wall[i].picnum;
switch (DynamicTileMap[j]) switch (DYNAMICTILEMAP(j))
{ {
case SCREENBREAK1__STATIC: case SCREENBREAK1__STATIC:
case SCREENBREAK2__STATIC: case SCREENBREAK2__STATIC:
@ -1196,7 +1196,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
switchpicnum = MULTISWITCH; switchpicnum = MULTISWITCH;
} }
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
// case DIPSWITCH+1: // case DIPSWITCH+1:
@ -1291,7 +1291,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
sprite[i].picnum = MULTISWITCH; sprite[i].picnum = MULTISWITCH;
} }
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
case TECHSWITCH__STATIC: case TECHSWITCH__STATIC:
@ -1321,7 +1321,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
if (switchpicnum <= 0) // oob safety if (switchpicnum <= 0) // oob safety
break; break;
switch (DynamicTileMap[switchpicnum-1]) switch (DYNAMICTILEMAP(switchpicnum-1))
{ {
case TECHSWITCH__STATIC: case TECHSWITCH__STATIC:
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
@ -1365,7 +1365,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
} }
switch (DynamicTileMap[wall[x].picnum]) switch (DYNAMICTILEMAP(wall[x].picnum))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
case TECHSWITCH__STATIC: case TECHSWITCH__STATIC:
@ -1395,7 +1395,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
if (wall[x].picnum <= 0) // oob safety if (wall[x].picnum <= 0) // oob safety
break; break;
switch (DynamicTileMap[wall[x].picnum-1]) switch (DYNAMICTILEMAP(wall[x].picnum-1))
{ {
case TECHSWITCH__STATIC: case TECHSWITCH__STATIC:
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
@ -1474,7 +1474,7 @@ int32_t P_ActivateSwitch(int32_t snum,int32_t w,int32_t switchtype)
switchpicnum = MULTISWITCH; switchpicnum = MULTISWITCH;
} }
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
default: default:
if (CheckDoorTile(picnum) == 0) break; if (CheckDoorTile(picnum) == 0) break;
@ -1645,7 +1645,7 @@ void A_DamageWall(int32_t spr,int32_t dawallnum,const vec3_t *pos,int32_t atwith
if (wal->overpicnum == MIRROR && wal->pal != 4) if (wal->overpicnum == MIRROR && wal->pal != 4)
{ {
switch (DynamicTileMap[atwith]) switch (DYNAMICTILEMAP(atwith))
{ {
case HEAVYHBOMB__STATIC: case HEAVYHBOMB__STATIC:
case RADIUSEXPLOSION__STATIC: case RADIUSEXPLOSION__STATIC:
@ -1672,7 +1672,7 @@ void A_DamageWall(int32_t spr,int32_t dawallnum,const vec3_t *pos,int32_t atwith
int32_t switchpicnum = wal->overpicnum; int32_t switchpicnum = wal->overpicnum;
if ((switchpicnum > W_FORCEFIELD)&&(switchpicnum <= W_FORCEFIELD+2)) if ((switchpicnum > W_FORCEFIELD)&&(switchpicnum <= W_FORCEFIELD+2))
switchpicnum = W_FORCEFIELD; switchpicnum = W_FORCEFIELD;
switch (DynamicTileMap[switchpicnum]) switch (DYNAMICTILEMAP(switchpicnum))
{ {
case W_FORCEFIELD__STATIC: case W_FORCEFIELD__STATIC:
//case W_FORCEFIELD+1: //case W_FORCEFIELD+1:
@ -1740,7 +1740,7 @@ void A_DamageWall(int32_t spr,int32_t dawallnum,const vec3_t *pos,int32_t atwith
} }
} }
switch (DynamicTileMap[wal->picnum]) switch (DYNAMICTILEMAP(wal->picnum))
{ {
case COLAMACHINE__STATIC: case COLAMACHINE__STATIC:
case VENDMACHINE__STATIC: case VENDMACHINE__STATIC:
@ -1890,7 +1890,7 @@ int32_t Sect_DamageCeiling(int32_t sn)
{ {
int32_t i, j; int32_t i, j;
switch (DynamicTileMap[sector[sn].ceilingpicnum]) switch (DYNAMICTILEMAP(sector[sn].ceilingpicnum))
{ {
case WALLLIGHT1__STATIC: case WALLLIGHT1__STATIC:
case WALLLIGHT2__STATIC: case WALLLIGHT2__STATIC:
@ -1979,7 +1979,7 @@ void A_DamageObject(int32_t i,int32_t sn)
switchpicnum = WATERFOUNTAIN; switchpicnum = WATERFOUNTAIN;
} }
*/ */
switch (DynamicTileMap[PN]) switch (DYNAMICTILEMAP(PN))
{ {
case OCEANSPRITE1__STATIC: case OCEANSPRITE1__STATIC:
case OCEANSPRITE2__STATIC: case OCEANSPRITE2__STATIC:
@ -2026,7 +2026,7 @@ void A_DamageObject(int32_t i,int32_t sn)
T1 = 1; T1 = 1;
A_Spawn(i,BURNING); A_Spawn(i,BURNING);
} }
switch (DynamicTileMap[sprite[sn].picnum]) switch (DYNAMICTILEMAP(sprite[sn].picnum))
{ {
case RADIUSEXPLOSION__STATIC: case RADIUSEXPLOSION__STATIC:
case RPG__STATIC: case RPG__STATIC:
@ -2052,7 +2052,7 @@ void A_DamageObject(int32_t i,int32_t sn)
sprite[j].pal = 8; sprite[j].pal = 8;
} }
// case CACTUSBROKE: // case CACTUSBROKE:
switch (DynamicTileMap[sprite[sn].picnum]) switch (DYNAMICTILEMAP(sprite[sn].picnum))
{ {
case RADIUSEXPLOSION__STATIC: case RADIUSEXPLOSION__STATIC:
case RPG__STATIC: case RPG__STATIC:
@ -2250,7 +2250,7 @@ void A_DamageObject(int32_t i,int32_t sn)
case PIPE4__STATIC: case PIPE4__STATIC:
case PIPE5__STATIC: case PIPE5__STATIC:
case PIPE6__STATIC: case PIPE6__STATIC:
switch (DynamicTileMap[PN]) switch (DYNAMICTILEMAP(PN))
{ {
case PIPE1__STATIC: case PIPE1__STATIC:
PN=PIPE1B; PN=PIPE1B;
@ -3171,7 +3171,7 @@ void P_CheckSectors(int32_t snum)
neartag(p->pos.x,p->pos.y,p->pos.z+(16<<8),sprite[p->i].sectnum,p->oang,&neartagsector,&neartagwall,&neartagsprite,&neartaghitdist,1280L,3); neartag(p->pos.x,p->pos.y,p->pos.z+(16<<8),sprite[p->i].sectnum,p->oang,&neartagsector,&neartagwall,&neartagsprite,&neartaghitdist,1280L,3);
if (neartagsprite >= 0) if (neartagsprite >= 0)
{ {
switch (DynamicTileMap[sprite[neartagsprite].picnum]) switch (DYNAMICTILEMAP(sprite[neartagsprite].picnum))
{ {
case FEM1__STATIC: case FEM1__STATIC:
case FEM2__STATIC: case FEM2__STATIC:
@ -3215,7 +3215,7 @@ void P_CheckSectors(int32_t snum)
{ {
if (P_ActivateSwitch(snum,neartagsprite,1)) return; if (P_ActivateSwitch(snum,neartagsprite,1)) return;
switch (DynamicTileMap[sprite[neartagsprite].picnum]) switch (DYNAMICTILEMAP(sprite[neartagsprite].picnum))
{ {
case TOILET__STATIC: case TOILET__STATIC:
case STALL__STATIC: case STALL__STATIC: