From 7266c1e929ee17ca781a5db7875131a6f15da69d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
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+g1_qXNM_)$<hK>E)e-c?47#Oqyd_r9RGyIQ=$hWfa
zpEO~)o{safCA+6hS?%T$T~^ZV=aal?!||qu>3KQLT^;ko)jU9^FqQ=Q1v5B2yOGAg
zz+mj@;uunKD>)${iGlGLr^2M)DjjR?7B)04T&DY@kNL1hPxR_(vWY8VtIU7%9lj&G
e{JRJP!`BD=&pgd5ycrl67(8A5T-G@yGywoiw?T9O

delta 201
zcmdnbc$0C0L_G&H0|Uc%m3b`;3=C!gJ|V6Q|NrM^H+6L_YG|15>Ksv4*6Z(^JY~w7
ziBtYBTehse>4TA;b7XjKcXxMg!6R!+zYQBUOrAV>+rh0@85kHCOM?7@862M7NMm4N
z;7BiWOk!YQU;*KRK>qy<3=FoOE{-7;w`@;&3N<JQupD%Hck>|Y-~Z{Z%1itzHO{bw
zRqM?Ale_2~|CgNY1<Z$*zFIYB+hX&HA&QS|w_g6hpf12DuThZvgMop8!PC{xWt~$(
F697UQPjmnP

diff --git a/wadsrc/icecb0.png b/wadsrc/icecb0.png
index d41b018207e889ef2b7c09f02e09da8b5aeb970e..b2f12eb956e77d8d2444745d781a6cf9147fff5c 100644
GIT binary patch
delta 170
zcmX@gxQlUuL_G^L0|SG`)~a9z1_qXNM_)$<hK>E)e-c?47#P$8d_r9RGyIp5(4RMF
zv!73LQbKuG$NXtiR_p0Fmz8u|S@`GWG)G0`H#JN*WmwzCz`(#*666=m;PC858Uq7^
zp{I*uNX4z>goK3jgoK1SJDEMA=2(OsIB;QdRS6Sw^Yw+n%F}pwu4V_7F^9gf+FZrN
ZaNU;YvrL42DFXuogQu&X%Q~loCIGIYI&}a5

delta 181
zcmdnRc$9I1L_G&H0|Ucb*XcnF3=CQUJ|V6Q|Nl2MOpgrD&CPDIw)8X7b1p0Eoib%j
za$-ep!K1FOMgG3Ya#DH|r~Gd)ZOCC@U|=i>@(X5gcy=R=fq{V|y~r_%fq?;JDszme
z8xI2mgQ=&BV@Sm<*%OXJ3<?}f2OKV6`t`ru*zy41Vq?AC{aSC8dD;G_`zmbNk`nJB
jrp~(W#Kk)Tub8Ea815e7eSV&Sfq}u()z4*}Q$iB}v;aPE

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;bOX7#LX69eo`c7&i8E|4C$JU|^67@CkAK&+xyiWB#-$
ztCua=-PACB-ki;OIn7B4<$gZNRu=wj-ws<cFfcHd1o;IsI6S+N#=yWJ?&;zfQgJIe
p;lY}Oga<xh$q6&$UKlbm@Ut;pVHc^BU|?Wi@O1TaS?83{1OO!eEu#Pc

delta 149
zcmbQvxRh~%L_G&H0|P^b?9=ZI3=DDsJ|V6Q|NmQC`Xwh;<YqVd`z9}2wrt{*|6N^+
zatj_!nX)Ee&7Cj?1_s8GAirP+hi5m^7#J8h(u*9E7#J8pCNXZ3R##wPU{LgQaSW-r
zC3^fMF9QR|VFRwGx9Sr!<fbLb&oL@;4z@kQ$oPxFidle<e>wvL1B0ilpUXO@geCyN
CqA$Gw

diff --git a/wadsrc/icecd0.png b/wadsrc/icecd0.png
index 0873c8527a303b5b4501272fc6ac59c6ae8ae65a..36da94d81bbd7482f726d45b99141483b106b383 100644
GIT binary patch
delta 95
zcmb;}njjIy!py+HkRMg8$-uzClJ4m1$iT3%pZiZDD+2=qe}GSjYhF(CvL(Bd63U|@
z^7V9_gV=v9V_;z5^K@|xskoI~P?TVh!oa|^iDAoxY9C<+1_lOCS3j3^P6<r_<V_o3

delta 104
zcmXS_o*<FT!OXzGuxiyb4F(1V{s5m4S0g>=$nf0c#ENChmgQzQ9ZC-6Wnf_7NH20s
zVqjok1mP36OB@&&7=%4t978H@F>)|`|Ifg{#K6GF%)+3^z@6!t`-Oplfx*+&&t;uc
GLK6VB5*o(<