Fix an error from match-balancing being merged in. Apparently match-balancing also doesn't have a prototype for P_StealPlayerScore for whatever reason.
This commit is contained in:
parent
ba77b235d1
commit
7dcf0d3d09
|
@ -3025,7 +3025,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||||
}
|
}
|
||||||
|
|
||||||
if (damagetype & DMG_DEATHMASK)
|
if (damagetype & DMG_DEATHMASK)
|
||||||
damage = 0;
|
|
||||||
player->rings = 0;
|
player->rings = 0;
|
||||||
else if (damage == 0 || player->rings) //quickfix to just get things back to normal ...for now (sans Tag, I'll deal with that later)
|
else if (damage == 0 || player->rings) //quickfix to just get things back to normal ...for now (sans Tag, I'll deal with that later)
|
||||||
{
|
{
|
||||||
|
|
|
@ -123,6 +123,7 @@ fixed_t P_GetPlayerHeight(player_t *player);
|
||||||
fixed_t P_GetPlayerSpinHeight(player_t *player);
|
fixed_t P_GetPlayerSpinHeight(player_t *player);
|
||||||
INT32 P_GetPlayerControlDirection(player_t *player);
|
INT32 P_GetPlayerControlDirection(player_t *player);
|
||||||
void P_AddPlayerScore(player_t *player, UINT32 amount);
|
void P_AddPlayerScore(player_t *player, UINT32 amount);
|
||||||
|
void P_StealPlayerScore(player_t *player, UINT32 amount);
|
||||||
void P_ResetCamera(player_t *player, camera_t *thiscam);
|
void P_ResetCamera(player_t *player, camera_t *thiscam);
|
||||||
boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam);
|
boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam);
|
||||||
void P_SlideCameraMove(camera_t *thiscam);
|
void P_SlideCameraMove(camera_t *thiscam);
|
||||||
|
|
Loading…
Reference in New Issue