diff options
| author | Simon Howard | 2011-09-25 23:46:08 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-25 23:46:08 +0000 |
| commit | fcb27f12ee85d068e6b07fccc102ddf70c153c1f (patch) | |
| tree | d2a5a3f36cfda24ed9262ae67943bba8d8fecbe1 /src/hexen/sv_save.c | |
| parent | 0ea5739881d540d5e5d8007917ee7e17d68a57be (diff) | |
| download | chocolate-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/sv_save.c')
| -rw-r--r-- | src/hexen/sv_save.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/hexen/sv_save.c b/src/hexen/sv_save.c index 63b0190b..bafa89d7 100644 --- a/src/hexen/sv_save.c +++ b/src/hexen/sv_save.c @@ -1040,11 +1040,11 @@ static void MangleMobj(mobj_t * mobj) case MT_MSTAFF_FX2: if (corpse) { - mobj->special1 = MOBJ_NULL; + mobj->special1.m = MOBJ_NULL; } else { - mobj->special1 = GetMobjNum((mobj_t *) mobj->special1); + mobj->special1.m = GetMobjNum(mobj->special1.m); } break; @@ -1053,11 +1053,11 @@ static void MangleMobj(mobj_t * mobj) case MT_LIGHTNING_ZAP: if (corpse) { - mobj->special2 = MOBJ_NULL; + mobj->special2.m = MOBJ_NULL; } else { - mobj->special2 = GetMobjNum((mobj_t *) mobj->special2); + mobj->special2.m = GetMobjNum(mobj->special2.m); } break; @@ -1066,19 +1066,19 @@ static void MangleMobj(mobj_t * mobj) case MT_LIGHTNING_CEILING: if (corpse) { - mobj->special1 = MOBJ_NULL; - mobj->special2 = MOBJ_NULL; + mobj->special1.m = MOBJ_NULL; + mobj->special2.m = MOBJ_NULL; } else { - mobj->special1 = GetMobjNum((mobj_t *) mobj->special1); - mobj->special2 = GetMobjNum((mobj_t *) mobj->special2); + mobj->special1.m = GetMobjNum(mobj->special1.m); + mobj->special2.m = GetMobjNum(mobj->special2.m); } break; // Miscellaneous case MT_KORAX: - mobj->special1 = 0; // Searching index + mobj->special1.i = 0; // Searching index break; default: @@ -1134,20 +1134,20 @@ static void RestoreMobj(mobj_t * mobj) case MT_THRUSTFLOOR_DOWN: case MT_MINOTAUR: case MT_SORCFX1: - SetMobjPtr(&mobj->special1); + SetMobjPtr(&mobj->special1.i); break; // Just special2 case MT_LIGHTNING_FLOOR: case MT_LIGHTNING_ZAP: - SetMobjPtr(&mobj->special2); + SetMobjPtr(&mobj->special2.i); break; // Both special1 and special2 case MT_HOLY_TAIL: case MT_LIGHTNING_CEILING: - SetMobjPtr(&mobj->special1); - SetMobjPtr(&mobj->special2); + SetMobjPtr(&mobj->special1.i); + SetMobjPtr(&mobj->special2.i); break; default: |