teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- protect stat bit 2 when pasting to ceilings or floors

Browse source 
- when pasting to walls or maskwalls, the following user bits are kept now:
  4 (top/bottom alignment [O])
  1+64 (blocking, hitscan)
  8+256 (x/y-flip)
- print '(one-sided)' when pressing Shift + ([B] or [H]) on a wall

git-svn-id: https://svn.eduke32.com/eduke32@2033 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-09-18 11:55:31 +00:00
parent 03429e8f2e
commit 2a6a2d590a
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5542,7 +5542,9 @@ static void Keys3d(void)
NEXTWALL(searchwall).cstat &= ~64;
NEXTWALL(searchwall).cstat |= (wall[searchwall].cstat&64);
}
message("Wall %d hitscan sensitivity bit %s", searchwall, ONOFF(wall[searchwall].cstat&64));
message("Wall %d hitscan sensitivity bit %s%s", searchwall,
ONOFF(wall[searchwall].cstat&64), eitherSHIFT?" (one-sided)":"");
asksave = 1;
}
}
@ -6406,7 +6408,8 @@ static void Keys3d(void)
NEXTWALL(searchwall).cstat |= (wall[searchwall].cstat&1);
}
message("Wall %d blocking bit %s", searchwall, ONOFF(wall[searchwall].cstat&1));
message("Wall %d blocking bit %s%s", searchwall, ONOFF(wall[searchwall].cstat&1),
eitherSHIFT ? " (one-sided)":"");
asksave = 1;
}
}
@ -7048,8 +7051,9 @@ static void Keys3d(void)
wall[i].xpanning = tempxpanning;
wall[i].ypanning = tempypanning;
wall[i].cstat &= ~(4+8+256);
wall[i].cstat |= (tempcstat & (4+8+256));
wall[i].cstat &= ~(4 + 1+64 + 8+256);
wall[i].cstat |= (tempcstat & (4 + 1+64 + 8+256));
fixxrepeat(i, templenrepquot);
}
@ -7148,10 +7152,8 @@ static void Keys3d(void)
wall[searchwall].yrepeat = tempyrepeat;
wall[searchwall].xpanning = tempxpanning;
wall[searchwall].ypanning = tempypanning;
wall[searchwall].cstat &= ~(4+8+256);
wall[searchwall].cstat |= (tempcstat & (4+8+256));
SET_PROTECT_BITS(wall[searchwall].cstat, tempcstat, YAX_NEXTWALLBITS);
SET_PROTECT_BITS(wall[searchwall].cstat, tempcstat, YAX_NEXTWALLBITS|(4 + 1+64 + 8+256));
wall[searchwall].hitag = temphitag;
#ifdef YAX_ENABLE
@ -7183,8 +7185,6 @@ static void Keys3d(void)
wall[searchwall].shade = tempshade;
wall[searchwall].pal = temppal;
asksave = 1;
}
else if (AIMING_AT_CEILING_OR_FLOOR)
{
@ -7202,14 +7202,13 @@ paste_ceiling_or_floor:
#endif
AIMED_CEILINGFLOOR(xpanning) = tempxrepeat;
AIMED_CEILINGFLOOR(ypanning) = tempyrepeat;
SET_PROTECT_BITS(AIMED_CEILINGFLOOR(stat), tempcstat, YAX_BIT);
SET_PROTECT_BITS(AIMED_CEILINGFLOOR(stat), tempcstat, YAX_BIT|2);
sector[searchsector].visibility = tempvis;
sector[searchsector].lotag = templotag;
sector[searchsector].hitag = temphitag;
sector[searchsector].extra = tempextra;
}
asksave = 1;
}
else if (AIMING_AT_SPRITE)
{