From 19b52d19cb5e10912eb70f1f3ec1fe755666264c Mon Sep 17 00:00:00 2001 From: Wolfy Date: Fri, 20 Feb 2015 17:25:27 -0600 Subject: [PATCH 1/2] Have super sparks scale with the player Fixes https://mb.srb2.org/showthread.php?t=40279 Should work fine, but do keep in mind that this fix is untested. --- src/p_user.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 0600d9e30..4fb2d3490 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3325,6 +3325,7 @@ firenormal: // static void P_DoSuperStuff(player_t *player) { + mobj_t *spark; ticcmd_t *cmd = &player->cmd; if (player->mo->state >= &states[S_PLAY_SUPER_TRANS] && player->mo->state <= &states[S_PLAY_SUPER_TRANS9]) return; // don't do anything right now, we're in the middle of transforming! @@ -3400,8 +3401,12 @@ static void P_DoSuperStuff(player_t *player) if ((cmd->forwardmove != 0 || cmd->sidemove != 0 || player->pflags & (PF_CARRIED|PF_ROPEHANG|PF_ITEMHANG|PF_MACESPIN)) && !(leveltime % TICRATE) && (player->mo->momx || player->mo->momy)) - P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SUPERSPARK); - + { + spark = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SUPERSPARK); + spark->destscale = player->mo->scale; + P_SetScale(spark, player->mo->scale); + } + G_GhostAddColor(GHC_SUPER); // Ran out of rings while super! From 82fc6fd4c00eb4df0c5a52da36ad6e71a5bd174d Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sun, 1 Mar 2015 19:30:22 -0500 Subject: [PATCH 2/2] whitespace cleanup --- src/p_user.c | 2 +- src/sdl/i_system.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 4fb2d3490..d60de97a8 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3406,7 +3406,7 @@ static void P_DoSuperStuff(player_t *player) spark->destscale = player->mo->scale; P_SetScale(spark, player->mo->scale); } - + G_GhostAddColor(GHC_SUPER); // Ran out of rings while super! diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index fa09dc343..66e1ece18 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -2759,8 +2759,8 @@ static const char *locateWad(void) if (isWadPathOk(returnWadPath)) return NULL; #endif - - + + #ifdef CMAKECONFIG #ifndef NDEBUG I_OutputMsg(","CMAKE_ASSETS_DIR); @@ -2771,7 +2771,7 @@ static const char *locateWad(void) } #endif #endif - + #ifdef __APPLE__ OSX_GetResourcesPath(returnWadPath); I_OutputMsg(",%s", returnWadPath); @@ -2779,7 +2779,7 @@ static const char *locateWad(void) { return returnWadPath; } - + #endif // examine default dirs