diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 11608e234..ec8fa5170 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,7 @@ June 24, 2006 (Changes by Graf Zahl) +- Fixed: PIT_CheckThing checked AActor::tid instead of TidToHate to determine + whether a monster of the same species can be hurt. +- Added new ice chunk sprites submitted by Enjay. - Deleted the programmer death script from strifehelp.acs because it is no longer used. - Fixed: strfhelp.acs and the PUMPUPS cheat need to give 10 UpgradeStaminas diff --git a/src/p_map.cpp b/src/p_map.cpp index adb79ddca..36ce3a3cd 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -964,7 +964,7 @@ BOOL PIT_CheckThing (AActor *thing) if (!thing->IsHostile (tmthing->target)) { // The same if the shooter hates the target - if (thing->tid == 0 || tmthing->target->tid != thing->tid) + if (thing->tid == 0 || tmthing->target->TIDtoHate != thing->tid) { return false; } @@ -992,7 +992,7 @@ BOOL PIT_CheckThing (AActor *thing) if (!thing->IsHostile (tmthing->target)) { // Allow hurting monsters the shooter hates. - if (thing->tid == 0 || tmthing->target->tid != thing->tid) + if (thing->tid == 0 || tmthing->target->TIDtoHate != thing->tid) { return false; } diff --git a/wadsrc/iceca0.png b/wadsrc/iceca0.png index 0f1b5ef00..afa57a416 100644 Binary files a/wadsrc/iceca0.png and b/wadsrc/iceca0.png differ diff --git a/wadsrc/icecb0.png b/wadsrc/icecb0.png index d41b01820..b2f12eb95 100644 Binary files a/wadsrc/icecb0.png and b/wadsrc/icecb0.png differ diff --git a/wadsrc/icecc0.png b/wadsrc/icecc0.png index 060a9766f..369829372 100644 Binary files a/wadsrc/icecc0.png and b/wadsrc/icecc0.png differ diff --git a/wadsrc/icecd0.png b/wadsrc/icecd0.png index 0873c8527..36da94d81 100644 Binary files a/wadsrc/icecd0.png and b/wadsrc/icecd0.png differ