diff --git a/docs/rh-log.txt b/docs/rh-log.txt index bdb9a01f4..ff7a138e8 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -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. diff --git a/src/p_doors.cpp b/src/p_doors.cpp index 7bfdd2f9a..2a5df44c9 100644 --- a/src/p_doors.cpp +++ b/src/p_doors.cpp @@ -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). diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 4c72d48f8..813c8ecd1 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -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)<flags2 & MF2_NOTELEPORT) return false; + lineActivation |= SPAC_Cross|SPAC_MCross; } if (activationType == SPAC_Use) {