stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-18 07:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Battle scoring, hopefully

Browse source
This commit is contained in:
TehRealSalt 2018-06-02 10:57:43 -04:00
parent 73205c8229
commit dff33deb52
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_kart.c
View file

@ -1390,8 +1390,8 @@ void K_SpinPlayer(player_t *player, mobj_t *source)
if (G_BattleGametype()) if (G_BattleGametype())
{ {
/*if (source && source->player && player != source->player) if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);*/ P_AddPlayerScore(source->player, 1);
if (player->kartstuff[k_balloon] > 0) if (player->kartstuff[k_balloon] > 0)
{ {
@ -1448,8 +1448,8 @@ void K_SquishPlayer(player_t *player, mobj_t *source)
if (G_BattleGametype()) if (G_BattleGametype())
{ {
/*if (source && source->player && player != source->player) if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);*/ P_AddPlayerScore(source->player, 1);
if (player->kartstuff[k_balloon] > 0) if (player->kartstuff[k_balloon] > 0)
{ {
@ -1505,7 +1505,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source) // A bit of a hack, we ju
if (source->player->kartstuff[k_comebackpoints] >= 3) if (source->player->kartstuff[k_comebackpoints] >= 3)
K_StealBalloon(source->player, player, true); K_StealBalloon(source->player, player, true);
} }
//P_AddPlayerScore(source->player, 1); P_AddPlayerScore(source->player, 1);
} }
if (player->kartstuff[k_balloon] > 0) if (player->kartstuff[k_balloon] > 0)
@ -3437,7 +3437,7 @@ void K_CheckBalloons(void)
if (playeringame[winnernum]) if (playeringame[winnernum])
{ {
P_AddPlayerScore(&players[winnernum], 1); players[winnernum].score += 1;
CONS_Printf(M_GetText("%s recieved a point for winning!\n"), player_names[winnernum]); CONS_Printf(M_GetText("%s recieved a point for winning!\n"), player_names[winnernum]);
} }

4
src/p_user.c
View file

@ -1041,6 +1041,10 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
{ {
UINT32 oldscore; UINT32 oldscore;
#if 1
return; // Nope, still don't need this for Battle even
#endif
if (player->bot) if (player->bot)
player = &players[consoleplayer]; player = &players[consoleplayer];