summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_user.c4
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));