thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Battle arrows

Browse source
This commit is contained in:
TehRealSalt 2018-06-11 00:59:20 -04:00
parent b783c54c44
commit 8dca2bf5b1
5 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -6578,8 +6578,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_PLAYERARROW", // Above player arrow "S_PLAYERARROW", // Above player arrow
"S_PLAYERARROW_BOX", "S_PLAYERARROW_BOX",
"S_PLAYERARROW_ITEM", "S_PLAYERARROW_ITEM",
"S_PLAYERARROW_INVINCIBILITY",
"S_PLAYERARROW_ROULETTE",
"S_PLAYERARROW_NUMBER", "S_PLAYERARROW_NUMBER",
"S_PLAYERARROW_X", "S_PLAYERARROW_X",

8
src/info.c
View file

@ -2658,7 +2658,7 @@ state_t states[NUMSTATES] =
{SPR_JAWZ, 0, 1, {A_JawzChase}, 0, 0, S_JAWZ}, // S_JAWZ {SPR_JAWZ, 0, 1, {A_JawzChase}, 0, 0, S_JAWZ}, // S_JAWZ
{SPR_JAWZ, 0, 1, {NULL}, 0, 0, S_JAWZ_SHIELD}, // S_JAWZ_SHIELD {SPR_JAWZ, 0, 1, {NULL}, 0, 0, S_JAWZ_SHIELD}, // S_JAWZ_SHIELD
{SPR_JAWZ, 0, 0, {NULL}, 0, 0, S_NULL}, // S_JAWZ_DEAD {SPR_JAWZ, 0, 1, {NULL}, 0, 0, S_NULL}, // S_JAWZ_DEAD
{SPR_FBLL, 13, 3, {NULL}, 0, 0, S_FIRETRAIL2}, // S_FIRETRAIL1 {SPR_FBLL, 13, 3, {NULL}, 0, 0, S_FIRETRAIL2}, // S_FIRETRAIL1
{SPR_FBLL, 14, 3, {NULL}, 0, 0, S_FIRETRAIL3}, // S_FIRETRAIL2 {SPR_FBLL, 14, 3, {NULL}, 0, 0, S_FIRETRAIL3}, // S_FIRETRAIL2
@ -2894,10 +2894,8 @@ state_t states[NUMSTATES] =
{SPR_ARRO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW {SPR_ARRO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW
{SPR_ARRO, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_BOX {SPR_ARRO, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_BOX
{SPR_ITEM, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_ITEM {SPR_ITEM, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_ITEM
{SPR_ITMI, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 6, 3, S_NULL}, // S_PLAYERARROW_INVINCIBILITY {SPR_ITMN, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_NUMBER
{SPR_ITEM, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 16, 3, S_NULL}, // S_PLAYERARROW_ROULETTE {SPR_ITMN, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_X
{SPR_ITMN, FF_FULLBRIGHT, -1, {NULL}, 16, 3, S_NULL}, // S_PLAYERARROW_NUMBER
{SPR_ITMN, FF_FULLBRIGHT|10, -1, {NULL}, 16, 3, S_NULL}, // S_PLAYERARROW_X
{SPR_PBOM, FF_ANIMATE, -1, {NULL}, 3, 3, S_NULL}, // S_PLAYERBOMB {SPR_PBOM, FF_ANIMATE, -1, {NULL}, 3, 3, S_NULL}, // S_PLAYERBOMB
{SPR_RNDM, FF_ANIMATE, -1, {NULL}, 23, 3, S_NULL}, // S_PLAYERITEM {SPR_RNDM, FF_ANIMATE, -1, {NULL}, 23, 3, S_NULL}, // S_PLAYERITEM

2
src/info.h
View file

@ -3420,8 +3420,6 @@ typedef enum state
S_PLAYERARROW, // Above player arrow S_PLAYERARROW, // Above player arrow
S_PLAYERARROW_BOX, S_PLAYERARROW_BOX,
S_PLAYERARROW_ITEM, S_PLAYERARROW_ITEM,
S_PLAYERARROW_INVINCIBILITY,
S_PLAYERARROW_ROULETTE,
S_PLAYERARROW_NUMBER, S_PLAYERARROW_NUMBER,
S_PLAYERARROW_X, S_PLAYERARROW_X,

8
src/m_menu.c
View file

@ -1509,16 +1509,16 @@ static menuitem_t OP_MonitorToggleMenu[] =
// Printing handled by drawing function // Printing handled by drawing function
// Instead of using this for dumb monitors, lets use the new item bools we have :V // Instead of using this for dumb monitors, lets use the new item bools we have :V
{IT_STRING | IT_CVAR, NULL, "Sneakers", &cv_sneaker, 10}, {IT_STRING | IT_CVAR, NULL, "Sneakers", &cv_sneaker, 10},
{IT_STRING | IT_CVAR, NULL, "Triple Sneakers", &cv_triplesneaker, 18}, {IT_STRING | IT_CVAR, NULL, "Sneakers x3", &cv_triplesneaker, 18},
{IT_STRING | IT_CVAR, NULL, "Rocket Sneakers", &cv_rocketsneaker, 26}, {IT_STRING | IT_CVAR, NULL, "Rocket Sneakers", &cv_rocketsneaker, 26},
{IT_STRING | IT_CVAR, NULL, "Invinciblity", &cv_invincibility, 34}, {IT_STRING | IT_CVAR, NULL, "Invinciblity", &cv_invincibility, 34},
{IT_STRING | IT_CVAR, NULL, "Bananas", &cv_banana, 42}, {IT_STRING | IT_CVAR, NULL, "Bananas", &cv_banana, 42},
{IT_STRING | IT_CVAR, NULL, "Triple Bananas", &cv_triplebanana, 50}, {IT_STRING | IT_CVAR, NULL, "Bananas x3", &cv_triplebanana, 50},
{IT_STRING | IT_CVAR, NULL, "Eggman Monitors", &cv_eggmanmonitor, 58}, {IT_STRING | IT_CVAR, NULL, "Eggman Monitors", &cv_eggmanmonitor, 58},
{IT_STRING | IT_CVAR, NULL, "Orbinauts", &cv_orbinaut, 66}, {IT_STRING | IT_CVAR, NULL, "Orbinauts", &cv_orbinaut, 66},
{IT_STRING | IT_CVAR, NULL, "Triple Orbinauts", &cv_tripleorbinaut, 74}, {IT_STRING | IT_CVAR, NULL, "Orbinauts x3", &cv_tripleorbinaut, 74},
{IT_STRING | IT_CVAR, NULL, "Jawz", &cv_jawz, 82}, {IT_STRING | IT_CVAR, NULL, "Jawz", &cv_jawz, 82},
{IT_STRING | IT_CVAR, NULL, "Dual Jawz", &cv_dualjawz, 90}, {IT_STRING | IT_CVAR, NULL, "Jawz x2", &cv_dualjawz, 90},
{IT_STRING | IT_CVAR, NULL, "Mines", &cv_mine, 98}, {IT_STRING | IT_CVAR, NULL, "Mines", &cv_mine, 98},
{IT_STRING | IT_CVAR, NULL, "Ballhogs", &cv_ballhog, 106}, {IT_STRING | IT_CVAR, NULL, "Ballhogs", &cv_ballhog, 106},
{IT_STRING | IT_CVAR, NULL, "Self-Propelled Bombs",&cv_selfpropelledbomb,114}, {IT_STRING | IT_CVAR, NULL, "Self-Propelled Bombs",&cv_selfpropelledbomb,114},

54
src/p_mobj.c
View file

@ -6924,12 +6924,12 @@ void P_MobjThinker(mobj_t *mobj)
fixed_t scale = mobj->target->scale; fixed_t scale = mobj->target->scale;
mobj->color = mobj->target->color; mobj->color = mobj->target->color;
if (!netgame || G_RaceGametype() /*if (!netgame || G_RaceGametype()
|| mobj->target->player == &players[displayplayer] || mobj->target->player == &players[displayplayer]
|| mobj->target->player->kartstuff[k_balloon] <= 0 || mobj->target->player->kartstuff[k_balloon] <= 0
|| (mobj->target->player->mo->flags2 & MF2_DONTDRAW)) || (mobj->target->player->mo->flags2 & MF2_DONTDRAW))
mobj->flags2 |= MF2_DONTDRAW; mobj->flags2 |= MF2_DONTDRAW;
else else*/
mobj->flags2 &= ~MF2_DONTDRAW; mobj->flags2 &= ~MF2_DONTDRAW;
P_UnsetThingPosition(mobj); P_UnsetThingPosition(mobj);
@ -6968,36 +6968,38 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->target->player->kartstuff[k_itemroulette]) if (mobj->target->player->kartstuff[k_itemroulette])
{ {
P_SetMobjState(mobj, S_PLAYERARROW_BOX); P_SetMobjState(mobj, S_PLAYERARROW_BOX);
P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
if (mobj->tracer->state != &states[S_PLAYERARROW_ROULETTE]) // don't reset FF_ANIMATE mobj->tracer->frame = FF_FULLBRIGHT|((stplyr->kartstuff[k_itemroulette] % (13*3)) / 3);
P_SetMobjState(mobj->tracer, S_PLAYERARROW_ROULETTE);
} }
else if (mobj->target->player->kartstuff[k_itemtype]) else if (mobj->target->player->kartstuff[k_itemtype])
{ {
P_SetMobjState(mobj, S_PLAYERARROW_BOX); P_SetMobjState(mobj, S_PLAYERARROW_BOX);
P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
if (mobj->tracer->state != &states[S_PLAYERARROW_ITEM]
|| mobj->tracer->state != &states[S_PLAYERARROW_INVINCIBILITY])
P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
switch (mobj->target->player->kartstuff[k_itemtype]) switch (mobj->target->player->kartstuff[k_itemtype])
{ {
case KITEM_INVINCIBILITY: case KITEM_INVINCIBILITY:
if (mobj->tracer->state != &states[S_PLAYERARROW_INVINCIBILITY]) mobj->tracer->sprite = SPR_ITMI;
P_SetMobjState(mobj->tracer, S_PLAYERARROW_INVINCIBILITY); mobj->tracer->frame = FF_FULLBRIGHT|((leveltime % (7*3)) / 3);
break; break;
case KITEM_SAD: case KITEM_SAD:
mobj->tracer->sprite = SPR_ITEM;
mobj->tracer->frame = FF_FULLBRIGHT; mobj->tracer->frame = FF_FULLBRIGHT;
break; break;
default: default:
mobj->tracer->frame = FF_FULLBRIGHT|(mobj->tracer->target->player->kartstuff[k_itemtype]); mobj->tracer->sprite = SPR_ITEM;
mobj->tracer->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemtype]);
break; break;
} }
if (mobj->target->player->kartstuff[k_growshrinktimer] > 1 && (leveltime & 1)) if (mobj->target->player->kartstuff[k_growshrinktimer])
{
mobj->tracer->frame = FF_FULLBRIGHT|KITEM_GROW; mobj->tracer->frame = FF_FULLBRIGHT|KITEM_GROW;
else if (mobj->target->player->kartstuff[k_growshrinktimer] > 1 && !(leveltime & 1)) if (leveltime & 1)
P_SetMobjState(mobj, S_INVISIBLE); mobj->tracer->flags2 |= MF2_DONTDRAW;
else
mobj->tracer->flags2 &= ~MF2_DONTDRAW;
}
} }
else else
{ {
@ -7008,7 +7010,7 @@ void P_MobjThinker(mobj_t *mobj)
mobj->tracer->destscale = scale; mobj->tracer->destscale = scale;
if (mobj->target->player->kartstuff[k_itemamount] > 1 if (mobj->target->player->kartstuff[k_itemamount] > 1
&& mobj->target->player->kartstuff[k_itemamount] < 10) // Meh, too difficult to support greater than this :V && mobj->target->player->kartstuff[k_itemamount] < 10) // Meh, too difficult to support greater than this; convert this to a decent HUD object and then maybe :V
{ {
mobj_t *number = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY); mobj_t *number = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
mobj_t *numx = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY); mobj_t *numx = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
@ -7016,14 +7018,12 @@ void P_MobjThinker(mobj_t *mobj)
P_SetTarget(&number->target, mobj); P_SetTarget(&number->target, mobj);
P_SetMobjState(number, S_PLAYERARROW_NUMBER); P_SetMobjState(number, S_PLAYERARROW_NUMBER);
P_SetScale(number, mobj->scale); P_SetScale(number, mobj->scale);
number->fuse = 1;
number->destscale = scale; number->destscale = scale;
number->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemamount]); number->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemamount]);
P_SetTarget(&numx->target, mobj); P_SetTarget(&numx->target, mobj);
P_SetMobjState(numx, S_PLAYERARROW_X); P_SetMobjState(numx, S_PLAYERARROW_X);
P_SetScale(numx, mobj->scale); P_SetScale(numx, mobj->scale);
numx->fuse = 1;
numx->destscale = scale; numx->destscale = scale;
} }
} }
@ -9625,7 +9625,6 @@ void P_SpawnPlayer(INT32 playernum)
{ {
player_t *p = &players[playernum]; player_t *p = &players[playernum];
mobj_t *mobj; mobj_t *mobj;
mobj_t *overheadarrow;
if (p->playerstate == PST_REBORN) if (p->playerstate == PST_REBORN)
G_PlayerReborn(playernum); G_PlayerReborn(playernum);
@ -9713,13 +9712,14 @@ void P_SpawnPlayer(INT32 playernum)
// Spawn with a pity shield if necessary. // Spawn with a pity shield if necessary.
//P_DoPityCheck(p); //P_DoPityCheck(p);
overheadarrow = P_SpawnMobj(mobj->x, mobj->y, mobj->z + P_GetPlayerHeight(p)+16*FRACUNIT, MT_PLAYERARROW); if (G_BattleGametype()) // SRB2kart
P_SetTarget(&overheadarrow->target, mobj);
overheadarrow->flags2 |= MF2_DONTDRAW;
P_SetScale(overheadarrow, mobj->destscale);
if (G_BattleGametype())
{ {
mobj_t *overheadarrow = P_SpawnMobj(mobj->x, mobj->y, mobj->z + P_GetPlayerHeight(p)+16*FRACUNIT, MT_PLAYERARROW);
P_SetTarget(&overheadarrow->target, mobj);
overheadarrow->flags2 |= MF2_DONTDRAW;
P_SetScale(overheadarrow, mobj->destscale);
/*INT32 i; /*INT32 i;
INT32 pcount = 0; INT32 pcount = 0;
@ -9727,12 +9727,12 @@ void P_SpawnPlayer(INT32 playernum)
{ {
if (!playeringame[i] || players[i].spectator || &players[i] == p) if (!playeringame[i] || players[i].spectator || &players[i] == p)
continue; continue;
if (players[i].jointime > 0) if (players[i].jointime > 1)
continue; continue;
pcount++; pcount++;
}*/ }*/
if (p->kartstuff[k_balloon] > 0 || leveltime < 1/* || pcount <= 1*/) // srb2kart if (p->kartstuff[k_balloon] > 0 || leveltime < 1/* || pcount <= 1*/)
{ {
INT32 i; INT32 i;
angle_t newangle; angle_t newangle;