From 7266c1e929ee17ca781a5db7875131a6f15da69d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 24 Jun 2006 23:58:01 +0000 Subject: [PATCH] - 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. SVN r223 (trunk) --- docs/rh-log.txt | 3 +++ src/p_map.cpp | 4 ++-- wadsrc/iceca0.png | Bin 217 -> 191 bytes wadsrc/icecb0.png | Bin 197 -> 186 bytes wadsrc/icecc0.png | Bin 165 -> 151 bytes wadsrc/icecd0.png | Bin 123 -> 114 bytes 6 files changed, 5 insertions(+), 2 deletions(-) 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 0f1b5ef009d23bd9bb7399d0eaebe33575088bed..afa57a4169f277f51ba55ce71ee02b8b7bdb6390 100644 GIT binary patch delta 175 zcmcb~xSw%?L_G^L0|SH6mEu+)#ggvm>&U>cv7h@-A}f%u72p%%`k&!{R7Ad&h5w`p z%k^}emo3>nZOUplm*}#RZa<&oO&g9kHB8UTY3}NnAFk#BGKH}u$S;_|;n|HeAjjC# z#WAGfR&qi@5(DEgPK8OoRXWz(Eo^99xJ>s)AM;_2p6J!nWD{4!R+<0iJA6lW`F9Zp ZhOZC!pLv>Bcmwq_c)I$ztaD0e0su_6L398B delta 201 zcmdnbc$0C0L_G&H0|Uc%m3b{d$}GSq#FgRy|J>}RuC7H54bxqnBg)Ep{e6?COj$E= z%Kv4{men_XFw%354A1TE?#?ZEWNqoUVZ(;WlP7OGxb-T~1jdpezhDN3XE)M-9FFuN z$0Q)l0>TA>{QH5lt*47)NX0GNQ=UQ%3IZ$#o!;F%$oltxx~uXMze-MdXL|wjp{1`@&Dpltd}4^=BipT)KQO2ZFv@EbB>w=K#Ng@b=d#Wzp$Py&8c%cp diff --git a/wadsrc/icecb0.png b/wadsrc/icecb0.png index d41b018207e889ef2b7c09f02e09da8b5aeb970e..b2f12eb956e77d8d2444745d781a6cf9147fff5c 100644 GIT binary patch delta 170 zcmX@gxQlUuL_G^L0|SG`)~aA2#ggvm>&U>cv7h@-A}f%u9^ez=`k&#yl!X4gIh*}_ zl9Lk3yE^7io3dI@$GNPe+seW}FQ+*wBEP9&x+%ljKA;xHk|4ie28U-i(tsR8PZ!6K zid)GE2?^;yJZC4fN7NjPumcA!Os*90x@_d$w SurCGbX7F_Nb6Mw<&;$UkqB?Z| delta 181 zcmdnRc$9I1L_G&H0|Ucb*Xcn(N-Mx8#FgRy|AvO?k>REB|(0{3=Yq3qyae`=|zr7KpJE!bBw4P50EzX zba4!+xFvhSQHVi-gXw_7bdBfQVg15IG?boFyt=akR{0JH!;Z~y=R diff --git a/wadsrc/icecc0.png b/wadsrc/icecc0.png index 060a9766f8d5422240f838de8971eaf52118eab6..36982937215aaf2f1f88379c31aee05f0ad4c2ea 100644 GIT binary patch delta 134 zcmZ3=IGu5VL_G^L0|Ud_w;bPq6id3JuOkD)#(wTUiL5}rT!2rA>wkv-T^;kMOGS4n&dX^|N+|d9Nw%`^XZv>85~z}~B*-tA!Qt7BG$2RZ)5S5Q;#P9PgEa{W j4}8Ls6K2T0Fl1!lXJfj;E>b4}RKnot>gTe~DWM4fB>yd= delta 149 zcmbQvxRh~%L_G&H0|P^b?9=Z+N-n@B#FgRye``y>?VKTaDpR{+wAo-U3d6}Lo>pX3E9 uIBdZ6^j3XhhTOCy`8h^K&cU`v7#V*tSTPIm@lOY;X7F_Nb6Mw<&;$U%qA$Gw diff --git a/wadsrc/icecd0.png b/wadsrc/icecd0.png index 0873c8527a303b5b4501272fc6ac59c6ae8ae65a..36da94d81bbd7482f726d45b99141483b106b383 100644 GIT binary patch delta 95 zcmb;}njjIy!py+HkRMg838Yxk9eo`c7&i8E|4C#8^7#XNLR|B5nwKrvos>`>6_Kx} u;~d2PYZ*|A&(p;*q~ca`K~aK13IhYvCWb8&s(plkG7O%selF{r5}E+yO&eeU delta 104 zcmXS_o*