zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: SPAC_AnyCross didn't work.

Browse source 
- Fixed: Pushable doors must also check for SPAC_MPush.
- Fixed: P_LoadThings2 did not adjust the byte order for the thingid field.


SVN r965 (trunk)
This commit is contained in:
Christoph Oelckers 2008-05-12 08:31:29 +00:00
parent 6c21616c85
commit b2176a4a33
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -1,3 +1,8 @@
May 12, 2008 (Changes by Graf Zahl)
- Fixed: SPAC_AnyCross didn't work.
- Fixed: Pushable doors must also check for SPAC_MPush.
- Fixed: P_LoadThings2 did not adjust the byte order for the thingid field.
May 11, 2008 (Changes by Graf Zahl)
- Changed: HIRESTEX 'define' textures now replace existing textures
of type MiscPatch with the same name.

2
src/p_doors.cpp
View file

@ -409,7 +409,7 @@ bool EV_DoDoor (DDoor::EVlDoor type, line_t *line, AActor *thing,
door->m_Direction = 1; // go back up
door->DoorSound (true); // [RH] Make noise
}
else if (!(line->activation & SPAC_Push))
else if (!(line->activation & (SPAC_Push|SPAC_MPush)))
// [RH] activate push doors don't go back down when you
// run into them (otherwise opening them would be
// a real pain).

2
src/p_setup.cpp
View file

@ -1441,7 +1441,7 @@ void P_LoadThings2 (MapData * map, int position)
for(int i = 0; i< numthings; i++)
{
mti[i].thingid = mth[i].thingid;
mti[i].thingid = LittleShort(mth[i].thingid);
mti[i].x = LittleShort(mth[i].x)<<FRACBITS;
mti[i].y = LittleShort(mth[i].y)<<FRACBITS;
mti[i].z = LittleShort(mth[i].z)<<FRACBITS;

6
src/p_spec.cpp
View file

@ -275,10 +275,10 @@ bool P_TestActivateLine (line_t *line, AActor *mo, int side, int activationType)
lineActivation |= SPAC_PCross;
}
// BOOM's generalized line types that allow monster use can actually be
// activated by anything!
if (activationType == SPAC_AnyCross)
// activated by anything except projectiles.
if (lineActivation & SPAC_AnyCross)
{
if (mo->flags2 & MF2_NOTELEPORT) return false;
lineActivation |= SPAC_Cross|SPAC_MCross;
}
if (activationType == SPAC_Use)
{