diff options
| author | James Haley | 2014-09-18 01:22:41 -0500 |
|---|---|---|
| committer | James Haley | 2014-09-18 01:22:41 -0500 |
| commit | 12732a1501d7690ba011270b4473dc8556ddf5e8 (patch) | |
| tree | 330b3b6bb1a6d38703539549ac3e08dc4eafd75f /src | |
| parent | d95cbcfa2bd3479dfdbfad536d888ac828727a68 (diff) | |
| download | chocolate-doom-12732a1501d7690ba011270b4473dc8556ddf5e8.tar.gz chocolate-doom-12732a1501d7690ba011270b4473dc8556ddf5e8.tar.bz2 chocolate-doom-12732a1501d7690ba011270b4473dc8556ddf5e8.zip | |
Upstream bug fix to teleport beacon allegiance
Was not propagating properly from player to beacon to rebels due to
mistranslated assembly code; access to wrong structure.
Diffstat (limited to 'src')
| -rw-r--r-- | src/strife/p_user.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/strife/p_user.c b/src/strife/p_user.c index e544dce8..78b8df03 100644 --- a/src/strife/p_user.c +++ b/src/strife/p_user.c @@ -776,7 +776,9 @@ boolean P_TossDegninOre(player_t* player) // // P_SpawnTeleportBeacon +// // villsa [STRIFE] new function +// haleyjd 20140918: bug fixed to propagate allegiance properly. // boolean P_SpawnTeleportBeacon(player_t* player) { @@ -816,7 +818,7 @@ boolean P_SpawnTeleportBeacon(player_t* player) if(P_CheckPosition(beacon, x, y)) { beacon->target = mo; - beacon->miscdata = mo->miscdata; + beacon->miscdata = (byte)(player->allegiance); beacon->angle = (angle << ANGLETOFINESHIFT); beacon->momx = FixedMul(finecosine[angle], (5*FRACUNIT)); beacon->momy = FixedMul(finesine[angle], (5*FRACUNIT)); |