summaryrefslogtreecommitdiff
path: root/src/hexen/p_maputl.c
diff options
context:
space:
mode:
authorSimon Howard2011-09-25 23:46:08 +0000
committerSimon Howard2011-09-25 23:46:08 +0000
commitfcb27f12ee85d068e6b07fccc102ddf70c153c1f (patch)
treed2a5a3f36cfda24ed9262ae67943bba8d8fecbe1 /src/hexen/p_maputl.c
parent0ea5739881d540d5e5d8007917ee7e17d68a57be (diff)
downloadchocolate-doom-fcb27f12ee85d068e6b07fccc102ddf70c153c1f.tar.gz
chocolate-doom-fcb27f12ee85d068e6b07fccc102ddf70c153c1f.tar.bz2
chocolate-doom-fcb27f12ee85d068e6b07fccc102ddf70c153c1f.zip
Fix special1/special2 values in Hexen code so that they can properly
hold pointer values. Subversion-branch: /branches/v2-branch Subversion-revision: 2407
Diffstat (limited to 'src/hexen/p_maputl.c')
-rw-r--r--src/hexen/p_maputl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hexen/p_maputl.c b/src/hexen/p_maputl.c
index 9e0ece1f..f7790540 100644
--- a/src/hexen/p_maputl.c
+++ b/src/hexen/p_maputl.c
@@ -964,7 +964,7 @@ static mobj_t *RoughBlockCheck(mobj_t * mo, int index)
continue;
}
if ((link->type == MT_MINOTAUR) &&
- (((mobj_t *) link->special1) == mo))
+ (link->special1.m == mo))
{
link = link->bnext;
continue;
@@ -983,7 +983,7 @@ static mobj_t *RoughBlockCheck(mobj_t * mo, int index)
}
else if (mo->type == MT_MINOTAUR) // looking around minotaur
{
- master = (mobj_t *) mo->special1;
+ master = mo->special1.m;
if ((link->flags & MF_COUNTKILL) ||
(link->player && (link != master)))
{
@@ -998,7 +998,7 @@ static mobj_t *RoughBlockCheck(mobj_t * mo, int index)
continue;
}
if ((link->type == MT_MINOTAUR) &&
- (link->special1 == mo->special1))
+ (link->special1.m == mo->special1.m))
{
link = link->bnext;
continue;