--------
Fixed Drift Sparks.
Added a "IF YOU CHANGE THIS" memo comment.
This commit is contained in:
ZTsukei 2017-04-17 13:46:34 -04:00
parent cfdb127630
commit 3a90256ff8
3 changed files with 12 additions and 7 deletions

View file

@ -143,16 +143,16 @@ extern FILE *logstream;
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP
#define VERSION 103 // Game version
#define SUBVERSION 4 // more precise version number
#define SUBVERSION 5 // more precise version number
#define VERSIONSTRING "Development EXE"
#define VERSIONSTRINGW "v1.3.04"
#define VERSIONSTRINGW "v1.3.05"
// most interface strings are ignored in development mode.
// we use comprevision and compbranch instead.
#else
#define VERSION 103 // Game version
#define SUBVERSION 4 // more precise version number
#define VERSIONSTRING "DevEXE v1.3.04"
#define VERSIONSTRINGW L"v1.3.04"
#define SUBVERSION 5 // more precise version number
#define VERSIONSTRING "DevEXE v1.3.05"
#define VERSIONSTRINGW L"v1.3.05"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif

View file

@ -1973,6 +1973,7 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
static void K_KartDrift(player_t *player, boolean onground)
{
// IF YOU CHANGE THESE: MAKE SURE YOU UPDATE THE SAME VALUES IN p_mobjc, "case MT_DRIFT:"
fixed_t dsone = 51 + player->kartspeed; // 52 - 60
fixed_t dstwo = dsone*2; // 104 - 120

View file

@ -6404,8 +6404,11 @@ void P_MobjThinker(mobj_t *mobj)
break;
//{ SRB2kart mobs
case MT_DRIFT:
{
fixed_t dsone = 51 + mobj->target->player->kartspeed; // 52 - 60
fixed_t dstwo = dsone*2; // 104 - 120
if ((mobj->target && mobj->target->player && mobj->target->player->mo && mobj->target->player->health > 0 && !mobj->target->player->spectator)
&& (mobj->type == MT_DRIFT && mobj->target->player->kartstuff[k_driftcharge] >= 26*2 + mobj->target->player->kartspeed))
&& (mobj->type == MT_DRIFT && mobj->target->player->kartstuff[k_driftcharge] >= dsone))
{
INT32 HEIGHT;
fixed_t radius;
@ -6434,7 +6437,7 @@ void P_MobjThinker(mobj_t *mobj)
// Switch blue flames to red flames
if (mobj->target->player && mobj->type == MT_DRIFT
&& mobj->target->player->kartstuff[k_driftcharge] >= 52*2 + mobj->target->player->kartspeed*2
&& mobj->target->player->kartstuff[k_driftcharge] >= dstwo
&& !(mobj->state >= &states[S_DRIFTSPARK4] && mobj->state <= &states[S_DRIFTSPARK6]))
P_SetMobjStateNF(mobj, S_DRIFTSPARK4);
@ -6472,6 +6475,7 @@ void P_MobjThinker(mobj_t *mobj)
return;
}
break;
}
case MT_GREENSHIELD:
case MT_REDSHIELD:
case MT_BANANASHIELD: