diff --git a/src/dehacked.c b/src/dehacked.c
index 24a99d5d01bc90e8fac740acfef062b396cefdcf..8c4d884528601356a7b78b2e916afc9c0303598a 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -2355,6 +2355,7 @@ static actionpointer_t actionpointers[] =
{{A_ThrownRing}, "A_THROWNRING"},
{{A_SetSolidSteam}, "A_SETSOLIDSTEAM"},
{{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"},
+ {{A_SignSpin}, "S_SIGNSPIN"},
{{A_SignPlayer}, "A_SIGNPLAYER"},
{{A_OverlayThink}, "A_OVERLAYTHINK"},
{{A_JetChase}, "A_JETCHASE"},
@@ -5499,59 +5500,18 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_BUBBLES4",
// Level End Sign
- "S_SIGN1",
- "S_SIGN2",
- "S_SIGN3",
- "S_SIGN4",
- "S_SIGN5",
- "S_SIGN6",
- "S_SIGN7",
- "S_SIGN8",
- "S_SIGN9",
- "S_SIGN10",
- "S_SIGN11",
- "S_SIGN12",
- "S_SIGN13",
- "S_SIGN14",
- "S_SIGN15",
- "S_SIGN16",
- "S_SIGN17",
- "S_SIGN18",
- "S_SIGN19",
- "S_SIGN20",
- "S_SIGN21",
- "S_SIGN22",
- "S_SIGN23",
- "S_SIGN24",
- "S_SIGN25",
- "S_SIGN26",
- "S_SIGN27",
- "S_SIGN28",
- "S_SIGN29",
- "S_SIGN30",
- "S_SIGN31",
- "S_SIGN32",
- "S_SIGN33",
- "S_SIGN34",
- "S_SIGN35",
- "S_SIGN36",
- "S_SIGN37",
- "S_SIGN38",
- "S_SIGN39",
- "S_SIGN40",
- "S_SIGN41",
- "S_SIGN42",
- "S_SIGN43",
- "S_SIGN44",
- "S_SIGN45",
- "S_SIGN46",
- "S_SIGN47",
- "S_SIGN48",
- "S_SIGN49",
- "S_SIGN50",
- "S_SIGN51",
- "S_SIGN52", // Eggman
- "S_SIGN53",
+ "S_SIGN",
+ "S_SIGNSPIN1",
+ "S_SIGNSPIN2",
+ "S_SIGNSPIN3",
+ "S_SIGNSPIN4",
+ "S_SIGNSPIN5",
+ "S_SIGNSPIN6",
+ "S_SIGNPLAYER",
+ "S_SIGNSLOW",
+ "S_SIGNSTOP",
+ "S_SIGNBOARD",
+ "S_EGGMANSIGN",
// Spike Ball
"S_SPIKEBALL1",
diff --git a/src/info.c b/src/info.c
index 64160b84956d167abbd59cdce7a812b1c1813ee7..3179efffa5699208ac185fe836af2208cb0fe784 100644
--- a/src/info.c
+++ b/src/info.c
@@ -808,7 +808,7 @@ state_t states[NUMSTATES] =
{SPR_PLAY, SPR2_LIFE, 20, {NULL}, 0, 4, S_NULL}, // S_PLAY_ICON3
// Level end sign (uses player sprite)
- {SPR_PLAY, SPR2_SIGN, 1, {NULL}, 0, 24, S_PLAY_SIGN}, // S_PLAY_SIGN
+ {SPR_PLAY, SPR2_SIGN|FF_PAPERSPRITE, -1, {NULL}, 0, 29, S_PLAY_SIGN}, // S_PLAY_SIGN
// NiGHTS Player, transforming
{SPR_PLAY, SPR2_TRNS|FF_ANIMATE, 7, {NULL}, 0, 4, S_PLAY_NIGHTS_TRANS2}, // S_PLAY_NIGHTS_TRANS1
@@ -1925,59 +1925,18 @@ state_t states[NUMSTATES] =
{SPR_BBLS, 3, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1}, // S_BUBBLES4
// Level End Sign
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN2}, // S_SIGN1
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN3}, // S_SIGN2
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN4}, // S_SIGN3
- {SPR_SIGN, 5, 1, {NULL}, 0, 0, S_SIGN5}, // S_SIGN4
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN6}, // S_SIGN5
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN7}, // S_SIGN6
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN8}, // S_SIGN7
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN9}, // S_SIGN8
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN10}, // S_SIGN9
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN11}, // S_SIGN10
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN12}, // S_SIGN11
- {SPR_SIGN, 4, 1, {NULL}, 0, 0, S_SIGN13}, // S_SIGN12
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN14}, // S_SIGN13
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN15}, // S_SIGN14
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN16}, // S_SIGN15
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN17}, // S_SIGN16
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN18}, // S_SIGN17
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN19}, // S_SIGN18
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN20}, // S_SIGN19
- {SPR_SIGN, 6, 1, {NULL}, 0, 0, S_SIGN21}, // S_SIGN20
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN22}, // S_SIGN21
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN23}, // S_SIGN22
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN24}, // S_SIGN23
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN25}, // S_SIGN24
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN26}, // S_SIGN25
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN27}, // S_SIGN26
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN28}, // S_SIGN27
- {SPR_SIGN, 5, 1, {NULL}, 0, 0, S_SIGN29}, // S_SIGN28
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN30}, // S_SIGN29
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN31}, // S_SIGN30
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN32}, // S_SIGN31
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN33}, // S_SIGN32
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN34}, // S_SIGN33
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN35}, // S_SIGN34
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN36}, // S_SIGN35
- {SPR_SIGN, 4, 1, {NULL}, 0, 0, S_SIGN37}, // S_SIGN36
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN38}, // S_SIGN37
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN39}, // S_SIGN38
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN40}, // S_SIGN39
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN41}, // S_SIGN40
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN42}, // S_SIGN41
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN43}, // S_SIGN42
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN44}, // S_SIGN43
- {SPR_SIGN, 6, 1, {NULL}, 0, 0, S_SIGN45}, // S_SIGN44
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN46}, // S_SIGN45
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN47}, // S_SIGN46
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN48}, // S_SIGN47
- {SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN49}, // S_SIGN48
- {SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN50}, // S_SIGN49
- {SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN51}, // S_SIGN50
- {SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN53}, // S_SIGN51
- {SPR_SIGN, 3, -1, {NULL}, 0, 0, S_NULL}, // S_SIGN52 Eggman
- {SPR_SIGN, 7, -1, {A_SignPlayer}, 0, 0, S_NULL}, // S_SIGN53 Blank
+ {SPR_SIGN, 0, -1, {A_SignPlayer}, -3, 0, S_NULL}, // S_SIGN
+ {SPR_SIGN, 0, 1, {A_SignSpin}, 30, 0, S_SIGNSPIN2}, // S_SIGNSPIN1
+ {SPR_SIGN, 0, 0, {A_Repeat}, 4, S_SIGNSPIN1, S_SIGNSPIN3}, // S_SIGNSPIN2
+ {SPR_SIGN, 0, 0, {A_SignPlayer}, -2, 0, S_SIGNSPIN4}, // S_SIGNSPIN3
+ {SPR_SIGN, 0, 1, {A_SignSpin}, 30, 0, S_SIGNSPIN5}, // S_SIGNSPIN4
+ {SPR_SIGN, 0, 0, {A_Repeat}, 4, S_SIGNSPIN4, S_SIGNSPIN6}, // S_SIGNSPIN5
+ {SPR_SIGN, 0, 0, {A_SignPlayer}, -3, 0, S_SIGNSPIN1}, // S_SIGNSPIN6
+ {SPR_SIGN, 0, 1, {A_SignPlayer}, -1, 0, S_SIGNSLOW}, // S_SIGNPLAYER
+ {SPR_SIGN, 0, 1, {A_SignSpin}, 30, 0, S_SIGNSLOW}, // S_SIGNSLOW
+ {SPR_SIGN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SIGNSTOP
+ {SPR_SIGN, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL}, // S_SIGNBOARD
+ {SPR_SIGN, FF_PAPERSPRITE|1, -1, {NULL}, 0, 29, S_NULL}, // S_EGGMANSIGN
// Spike Ball
{SPR_SPIK, 0, 1, {NULL}, 0, 0, S_SPIKEBALL2}, // S_SPIKEBALL1
@@ -7832,29 +7791,29 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_SIGN
501, // doomednum
- S_SIGN52, // spawnstate
+ S_SIGN, // spawnstate
1000, // spawnhealth
S_PLAY_SIGN, // seestate
sfx_lvpass, // seesound
8, // reactiontime
sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
+ S_SIGNPLAYER, // painstate
+ MT_SPARK, // painchance
sfx_None, // painsound
- S_NULL, // meleestate
+ S_EGGMANSIGN, // meleestate
S_NULL, // missilestate
- S_NULL, // deathstate
+ S_SIGNSTOP, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
8, // speed
- 8*FRACUNIT, // radius
+ 36*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOCLIP|MF_SCENERY, // flags
- S_NULL // raisestate
+ MF_NOCLIP|MF_SCENERY|MF_BOUNCE|MF_RUNSPAWNFUNC, // flags
+ S_SIGNBOARD // raisestate
},
{ // MT_SPIKEBALL
diff --git a/src/info.h b/src/info.h
index 57943c3890c95696ca7ec3b8b29243fbf8f1c515..b7ea1061e48ef289be54dee4b8ab363862a6906a 100644
--- a/src/info.h
+++ b/src/info.h
@@ -63,6 +63,7 @@ void A_FishJump(); // Fish Jump
void A_ThrownRing(); // Sparkle trail for red ring
void A_SetSolidSteam();
void A_UnsetSolidSteam();
+void A_SignSpin();
void A_SignPlayer();
void A_OverlayThink();
void A_JetChase();
@@ -2058,59 +2059,18 @@ typedef enum state
S_BUBBLES4,
// Level End Sign
- S_SIGN1,
- S_SIGN2,
- S_SIGN3,
- S_SIGN4,
- S_SIGN5,
- S_SIGN6,
- S_SIGN7,
- S_SIGN8,
- S_SIGN9,
- S_SIGN10,
- S_SIGN11,
- S_SIGN12,
- S_SIGN13,
- S_SIGN14,
- S_SIGN15,
- S_SIGN16,
- S_SIGN17,
- S_SIGN18,
- S_SIGN19,
- S_SIGN20,
- S_SIGN21,
- S_SIGN22,
- S_SIGN23,
- S_SIGN24,
- S_SIGN25,
- S_SIGN26,
- S_SIGN27,
- S_SIGN28,
- S_SIGN29,
- S_SIGN30,
- S_SIGN31,
- S_SIGN32,
- S_SIGN33,
- S_SIGN34,
- S_SIGN35,
- S_SIGN36,
- S_SIGN37,
- S_SIGN38,
- S_SIGN39,
- S_SIGN40,
- S_SIGN41,
- S_SIGN42,
- S_SIGN43,
- S_SIGN44,
- S_SIGN45,
- S_SIGN46,
- S_SIGN47,
- S_SIGN48,
- S_SIGN49,
- S_SIGN50,
- S_SIGN51,
- S_SIGN52, // Eggman
- S_SIGN53,
+ S_SIGN,
+ S_SIGNSPIN1,
+ S_SIGNSPIN2,
+ S_SIGNSPIN3,
+ S_SIGNSPIN4,
+ S_SIGNSPIN5,
+ S_SIGNSPIN6,
+ S_SIGNPLAYER,
+ S_SIGNSLOW,
+ S_SIGNSTOP,
+ S_SIGNBOARD,
+ S_EGGMANSIGN,
// Spike Ball
S_SPIKEBALL1,
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 9a5d6d0366b917ff4fe27820ec126997ec9301b0..d1080a37ca741f4508a54f3bcd7d87c7b5b88653 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -129,6 +129,7 @@ void A_FishJump(mobj_t *actor);
void A_ThrownRing(mobj_t *actor);
void A_SetSolidSteam(mobj_t *actor);
void A_UnsetSolidSteam(mobj_t *actor);
+void A_SignSpin(mobj_t *actor);
void A_SignPlayer(mobj_t *actor);
void A_OverlayThink(mobj_t *actor);
void A_JetChase(mobj_t *actor);
@@ -5015,59 +5016,186 @@ void A_UnsetSolidSteam(mobj_t *actor)
actor->flags |= MF_NOCLIP;
}
+// Function: A_SignSpin
+//
+// Description: Spins a signpost until it hits the ground and reaches its mapthing's angle.
+//
+// var1 = degrees to rotate object (must be positive, because I'm lazy)
+// var2 = unused
+//
+void A_SignSpin(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ INT16 i;
+ angle_t rotateangle = FixedAngle(locvar1 << FRACBITS);
+
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_SignSpin", actor))
+ return;
+#endif
+
+ if (P_IsObjectOnGround(actor) && P_MobjFlip(actor) * actor->momz <= 0)
+ {
+ if (actor->spawnpoint)
+ {
+ angle_t mapangle = FixedAngle(actor->spawnpoint->angle << FRACBITS);
+ angle_t diff = mapangle - actor->angle;
+ if (diff < ANG2)
+ {
+ actor->angle = mapangle;
+ P_SetMobjState(actor, actor->info->deathstate);
+ return;
+ }
+ if ((statenum_t)(actor->state-states) != actor->info->painstate)
+ P_SetMobjState(actor, actor->info->painstate);
+ actor->movedir = min((mapangle - actor->angle) >> 2, actor->movedir);
+ }
+ else // no mapthing? just finish in your current angle
+ {
+ P_SetMobjState(actor, locvar2);
+ return;
+ }
+ }
+ else
+ {
+ actor->movedir = rotateangle;
+ }
+ actor->angle += actor->movedir;
+ if (actor->tracer == NULL || P_MobjWasRemoved(actor->tracer)) return;
+ for (i = -1; i < 2; i += 2)
+ {
+ P_SpawnMobjFromMobj(actor,
+ P_ReturnThrustX(actor, actor->tracer->angle, i * actor->radius),
+ P_ReturnThrustY(actor, actor->tracer->angle, i * actor->radius),
+ (actor->eflags & MFE_VERTICALFLIP) ? 0 : actor->height,
+ actor->info->painchance)->destscale >>= 1;
+ }
+}
+
// Function: A_SignPlayer
//
// Description: Changes the state of a level end sign to reflect the player that hit it.
+// Also used to display Eggman or the skin roulette whilst spinning.
//
-// var1 = unused
-// var2 = unused
+// var1 = number of skin to display (e.g. 2 = Knuckles; special cases: -1 = target's skin, -2 = skin roulette, -3 = Eggman)
+// var2 = custom sign color, if desired.
//
void A_SignPlayer(mobj_t *actor)
{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ skin_t *skin = NULL;
mobj_t *ov;
- skin_t *skin;
+ UINT8 facecolor, signcolor = (UINT8)locvar2;
+ UINT32 signframe = states[actor->info->raisestate].frame;
+
#ifdef HAVE_BLUA
if (LUA_CallAction("A_SignPlayer", actor))
return;
#endif
- if (!actor->target)
- return;
- if (!actor->target->player)
+ if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins)
return;
- skin = &skins[actor->target->player->skin];
+ // if no face overlay, spawn one
+ if (actor->tracer->tracer == NULL || P_MobjWasRemoved(actor->tracer->tracer))
+ {
+ ov = P_SpawnMobj(actor->x, actor->y, actor->z, MT_OVERLAY);
+ P_SetTarget(&ov->target, actor->tracer);
+ P_SetTarget(&actor->tracer->tracer, ov);
+ }
+ else
+ ov = actor->tracer->tracer;
- if ((actor->target->player->skincolor == skin->prefcolor) && (skin->prefoppositecolor)) // Set it as the skin's preferred oppositecolor?
+ if (locvar1 == -1) // set to target's skin
{
- actor->color = skin->prefoppositecolor;
- /*
- If you're here from the comment above Color_Opposite,
- the following line is the one which is dependent on the
- array being symmetrical. It gets the opposite of the
- opposite of your desired colour just so it can get the
- brightness frame for the End Sign. It's not a great
- design choice, but it's constant time array access and
- the idea that the colours should be OPPOSITES is kind
- of in the name. If you have a better idea, feel free
- to let me know. ~toast 2016/07/20
- */
- actor->frame += (15 - Color_Opposite[Color_Opposite[skin->prefoppositecolor - 1][0] - 1][1]);
+ if (!actor->target)
+ return;
+
+ if (!actor->target->player)
+ return;
+
+ skin = &skins[actor->target->player->skin];
+ facecolor = actor->target->player->skincolor;
+
+ if (signcolor)
+ ;
+ else if ((actor->target->player->skincolor == skin->prefcolor) && (skin->prefoppositecolor)) // Set it as the skin's preferred oppositecolor?
+ {
+ signcolor = skin->prefoppositecolor;
+ /*
+ If you're here from the comment above Color_Opposite,
+ the following line is the one which is dependent on the
+ array being symmetrical. It gets the opposite of the
+ opposite of your desired colour just so it can get the
+ brightness frame for the End Sign. It's not a great
+ design choice, but it's constant time array access and
+ the idea that the colours should be OPPOSITES is kind
+ of in the name. If you have a better idea, feel free
+ to let me know. ~toast 2016/07/20
+ */
+ signframe += (15 - Color_Opposite[Color_Opposite[skin->prefoppositecolor - 1][0] - 1][1]);
+ }
+ else if (actor->target->player->skincolor) // Set the sign to be an appropriate background color for this player's skincolor.
+ {
+ signcolor = Color_Opposite[actor->target->player->skincolor - 1][0];
+ signframe += (15 - Color_Opposite[actor->target->player->skincolor - 1][1]);
+ }
+ else
+ signcolor = SKINCOLOR_NONE;
}
- else if (actor->target->player->skincolor) // Set the sign to be an appropriate background color for this player's skincolor.
+ else if (locvar1 != -3) // set to a defined skin
{
- actor->color = Color_Opposite[actor->target->player->skincolor - 1][0];
- actor->frame += (15 - Color_Opposite[actor->target->player->skincolor - 1][1]);
+ // I turned this function into a fucking mess. I'm so sorry. -Lach
+ if (locvar1 == -2) // next skin
+ {
+ if (ov->skin == NULL) // pick a random skin to start with!
+ skin = &skins[P_RandomKey(numskins)];
+ else // otherwise, advance 1 skin
+ {
+ UINT8 skinnum = (skin_t*)ov->skin-skins;
+ player_t *player = actor->target ? actor->target->player : NULL;
+ while ((skinnum = (skinnum + 1) % numskins) && (player ? !R_SkinUsable(player-players, skinnum) : skins[skinnum].availability > 0));
+ skin = &skins[skinnum];
+ }
+ }
+ else // specific skin
+ {
+ skin = &skins[locvar1];
+ }
+
+ facecolor = skin->prefcolor;
+ if (signcolor)
+ ;
+ else if (skin->prefoppositecolor)
+ {
+ signcolor = skin->prefoppositecolor;
+ }
+ else
+ {
+ signcolor = Color_Opposite[facecolor - 1][0];
+ }
+ signframe += (15 - Color_Opposite[Color_Opposite[signcolor - 1][0] - 1][1]);
}
- if (skin->sprites[SPR2_SIGN].numframes)
+ if (skin != NULL && skin->sprites[SPR2_SIGN].numframes) // player face
{
- // spawn an overlay of the player's face.
- ov = P_SpawnMobj(actor->x, actor->y, actor->z, MT_OVERLAY);
- P_SetTarget(&ov->target, actor);
- ov->color = actor->target->player->skincolor;
+ ov->color = facecolor;
ov->skin = skin;
P_SetMobjState(ov, actor->info->seestate); // S_PLAY_SIGN
+ actor->tracer->color = signcolor;
+ actor->tracer->frame = signframe;
+ }
+ else // Eggman face
+ {
+ ov->color = SKINCOLOR_NONE;
+ P_SetMobjState(ov, actor->info->meleestate); // S_EGGMANSIGN
+ if (signcolor)
+ actor->tracer->color = signcolor;
+ else
+ actor->tracer->color = signcolor = SKINCOLOR_CARBON;
+ actor->tracer->frame = signframe += (15 - Color_Opposite[Color_Opposite[signcolor - 1][0] - 1][1]);
}
}
@@ -5115,7 +5243,7 @@ void A_OverlayThink(mobj_t *actor)
actor->z = actor->target->z + actor->target->height - mobjinfo[actor->type].height - ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT;
else
actor->z = actor->target->z + ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT;
- actor->angle = actor->target->angle;
+ actor->angle = actor->target->angle + actor->movedir;
actor->eflags = actor->target->eflags;
actor->momx = actor->target->momx;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index f3f83b90a7973ec5f6ac437029907e8dd75a8f72..d6c0050b7e538f0b1d74ee225362f243003fa85e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6907,7 +6907,7 @@ void P_RunOverlays(void)
mo->eflags = (mo->eflags & ~MFE_VERTICALFLIP) | (mo->target->eflags & MFE_VERTICALFLIP);
mo->scale = mo->destscale = mo->target->scale;
- mo->angle = mo->target->angle;
+ mo->angle = mo->target->angle + mo->movedir;
if (!(mo->state->frame & FF_ANIMATE))
zoffs = FixedMul(((signed)mo->state->var2)*FRACUNIT, mo->scale);
@@ -10444,6 +10444,11 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
mobj->extravalue2 = 0;
mobj->fuse = 100;
break;
+ case MT_SIGN:
+ P_SetTarget(&mobj->tracer, P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_OVERLAY));
+ P_SetTarget(&mobj->tracer->target, mobj);
+ P_SetMobjState(mobj->tracer, S_SIGNBOARD);
+ mobj->tracer->movedir = ANGLE_90;
default:
break;
}
diff --git a/src/p_spec.c b/src/p_spec.c
index 7b23ecbe7ae22794eb8961399ec76b8f9e9aaf28..366377bedbf926228dc5253173ece07678f8dccd 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4054,11 +4054,15 @@ void P_SetupSignExit(player_t *player)
if (thing->type != MT_SIGN)
continue;
+ if (!player->mo->target || player->mo->target->type != MT_SIGN)
+ P_SetTarget(&player->mo->target, thing);
+
if (thing->state != &states[thing->info->spawnstate])
continue;
P_SetTarget(&thing->target, player->mo);
- P_SetMobjState(thing, S_SIGN1);
+ P_SetObjectMomZ(thing, 12*FRACUNIT, false);
+ P_SetMobjState(thing, S_SIGNSPIN1);
if (thing->info->seesound)
S_StartSound(thing, thing->info->seesound);
@@ -4079,11 +4083,15 @@ void P_SetupSignExit(player_t *player)
if (thing->type != MT_SIGN)
continue;
+ if (!player->mo->target || player->mo->target->type != MT_SIGN)
+ P_SetTarget(&player->mo->target, thing);
+
if (thing->state != &states[thing->info->spawnstate])
continue;
P_SetTarget(&thing->target, player->mo);
- P_SetMobjState(thing, S_SIGN1);
+ P_SetObjectMomZ(thing, 12*FRACUNIT, false);
+ P_SetMobjState(thing, S_SIGNSPIN1);
if (thing->info->seesound)
S_StartSound(thing, thing->info->seesound);
diff --git a/src/p_user.c b/src/p_user.c
index bd865341318b19f9598d888a15c90f7b1b73d07d..5141bbd53ccdee20f38d4f765fd20e036ae438c1 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9506,7 +9506,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
fixed_t x, y, z, dist, distxy, distz, checkdist, viewpointx, viewpointy, camspeed, camdist, camheight, pviewheight, slopez = 0;
INT32 camrotate;
boolean camstill, cameranoclip, camorbit;
- mobj_t *mo;
+ mobj_t *mo, *sign = NULL;
subsector_t *newsubsec;
fixed_t f1, f2;
@@ -9516,6 +9516,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
mo = player->mo;
+ if (player->exiting && mo->target && mo->target->type == MT_SIGN)
+ sign = mo->target;
+
cameranoclip = (player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
if (!(player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || tutorialmode))
@@ -9562,6 +9565,11 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
focusangle = mo->angle;
focusaiming = 0;
}
+ else if (sign)
+ {
+ focusangle = FixedAngle(sign->spawnpoint->angle << FRACBITS) + ANGLE_180;
+ focusaiming = 0;
+ }
else if (player == &players[consoleplayer])
{
focusangle = localangle;
@@ -9710,6 +9718,12 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camheight = FixedMul(camheight, 6*FRACUNIT/5);
}
+ if (sign)
+ {
+ camheight = mo->scale << 7;
+ camspeed = FRACUNIT/12;
+ }
+
if (player->climbing || player->exiting || player->playerstate == PST_DEAD || (player->powers[pw_carry] == CR_ROPEHANG || player->powers[pw_carry] == CR_GENERIC || player->powers[pw_carry] == CR_MACESPIN))
dist <<= 1;
}
@@ -9756,8 +9770,16 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
distz = slopez;
}
- x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
- y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
+ if (sign)
+ {
+ x = sign->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
+ y = sign->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
+ }
+ else
+ {
+ x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
+ y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
+ }
#if 0
if (twodlevel || (mo->flags2 & MF2_TWOD))
@@ -10002,14 +10024,30 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
// point viewed by the camera
// this point is just 64 unit forward the player
dist = FixedMul(64 << FRACBITS, mo->scale);
- viewpointx = mo->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
- viewpointy = mo->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ if (sign)
+ {
+ viewpointx = sign->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ viewpointy = sign->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ }
+ else
+ {
+ viewpointx = mo->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ viewpointy = mo->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ }
if (!camstill && !resetcalled && !paused)
thiscam->angle = R_PointToAngle2(thiscam->x, thiscam->y, viewpointx, viewpointy);
- viewpointx = mo->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
- viewpointy = mo->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ if (sign)
+ {
+ viewpointx = sign->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ viewpointy = sign->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ }
+ else
+ {
+ viewpointx = mo->x + FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ viewpointy = mo->y + FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+ }
/*
if (twodlevel || (mo->flags2 & MF2_TWOD))