More 64bit fixes master
authorDan Olson <theoddone33@icculus.org>
Mon, 21 Mar 2011 10:49:58 +0000 (03:49 -0700)
committerDan Olson <theoddone33@icculus.org>
Mon, 21 Mar 2011 10:49:58 +0000 (03:49 -0700)
base/p_enemy.c
base/p_pspr.c
include/doomdef.h

index f20d594..f1cb951 100644 (file)
@@ -1201,7 +1201,7 @@ void A_MummyAttack2(mobj_t *actor)
        //mo = P_SpawnMissile(actor, actor->target, MT_EGGFX);
        if(mo != NULL)
        {
-               mo->special1 = (int)actor->target;
+               mo->special1 = (intptr_t)actor->target;
        }
 }
 
@@ -1803,7 +1803,7 @@ void A_HeadAttack(mobj_t *actor)
                if(mo != NULL)
                {
                        mo->z -= 32*FRACUNIT;
-                       mo->special1 = (int)target;
+                       mo->special1 = (intptr_t)target;
                        mo->special2 = 50; // Timer for active sound
                        mo->health = 20*TICSPERSEC; // Duration
                        S_StartSound(actor, sfx_hedat3);                        
@@ -2235,7 +2235,7 @@ void A_MakePod(mobj_t *actor)
        P_ThrustMobj(mo, P_Random()<<24, (fixed_t)(4.5*FRACUNIT));
        S_StartSound(mo, sfx_newpod);
        actor->special1++; // Increment generated pod count
-       mo->special2 = (int)actor; // Link the generator to the pod
+       mo->special2 = (intptr_t)actor; // Link the generator to the pod
        return;
 }
 
index 11f2622..e8a8871 100644 (file)
@@ -1218,7 +1218,7 @@ void A_FireMacePL2(player_t *player, pspdef_t *psp)
                mo->momz = 2*FRACUNIT+((player->lookdir)<<(FRACBITS-5));
                if(linetarget)
                {
-                       mo->special1 = (int)linetarget;
+                       mo->special1 = (intptr_t)linetarget;
                }
        }
        S_StartSound(player->mo, sfx_lobsht);
@@ -1267,7 +1267,7 @@ void A_DeathBallImpact(mobj_t *ball)
                                P_AimLineAttack(ball, angle, 10*64*FRACUNIT);
                                if(linetarget && ball->target != linetarget)
                                {
-                                       ball->special1 = (int)linetarget;
+                                       ball->special1 = (intptr_t)linetarget;
                                        angle = R_PointToAngle2(ball->x, ball->y,
                                                linetarget->x, linetarget->y);
                                        newAngle = true;
@@ -1425,7 +1425,7 @@ void A_FireSkullRodPL2(player_t *player, pspdef_t *psp)
        }
        if(linetarget)
        {
-               MissileMobj->special1 = (int)linetarget;
+               MissileMobj->special1 = (intptr_t)linetarget;
        }
        S_StartSound(MissileMobj, sfx_hrnpow);
 }
index 3c47f44..5225375 100644 (file)
@@ -247,8 +247,8 @@ typedef struct mobj_s
        int                             damage;                 // For missiles
        int                             flags;
        int                             flags2;                 // Heretic flags
-       int                             special1;               // Special info
-       int                             special2;               // Special info
+       intptr_t                        special1;               // Special info
+       intptr_t                        special2;               // Special info
        int                             health;
        int                             movedir;                // 0-7
        int                             movecount;              // when 0, select a new dir