stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dummy out unused functions (OSX xcode errors)

Browse source
This commit is contained in:
mazmazz 2019-01-02 20:02:03 -05:00
parent b08e522aca
commit 3a0217c8c8
3 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_inter.c
View file

@ -2951,7 +2951,8 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
} }
} }
static inline void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage) /*
static inline void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage) // SRB2kart - unused.
{ {
fixed_t fallbackspeed; fixed_t fallbackspeed;
angle_t ang; angle_t ang;
@ -2997,11 +2998,10 @@ static inline void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *so
P_InstaThrust(player->mo, ang, fallbackspeed); P_InstaThrust(player->mo, ang, fallbackspeed);
/* // SRB2kart - This shouldn't be reachable, but this frame is invalid. // SRB2kart - This shouldn't be reachable, but this frame is invalid.
if (player->charflags & SF_SUPERANIMS) //if (player->charflags & SF_SUPERANIMS)
P_SetPlayerMobjState(player->mo, S_PLAY_SUPERHIT); // P_SetPlayerMobjState(player->mo, S_PLAY_SUPERHIT);
else //else
*/
P_SetPlayerMobjState(player->mo, player->mo->info->painstate); P_SetPlayerMobjState(player->mo, player->mo->info->painstate);
P_ResetPlayer(player); P_ResetPlayer(player);
@ -3009,6 +3009,7 @@ static inline void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *so
if (player->timeshit != UINT8_MAX) if (player->timeshit != UINT8_MAX)
++player->timeshit; ++player->timeshit;
} }
*/
void P_RemoveShield(player_t *player) void P_RemoveShield(player_t *player)
{ {

4
src/r_data.c
View file

@ -924,7 +924,8 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
Z_Free((void *)texturesText); Z_Free((void *)texturesText);
} }
static inline lumpnum_t R_CheckNumForNameList(const char *name, lumplist_t *list, size_t listsize) /*
static inline lumpnum_t R_CheckNumForNameList(const char *name, lumplist_t *list, size_t listsize) // SRB2kart - unused.
{ {
size_t i; size_t i;
UINT16 lump; UINT16 lump;
@ -939,6 +940,7 @@ static inline lumpnum_t R_CheckNumForNameList(const char *name, lumplist_t *list
} }
return LUMPERROR; return LUMPERROR;
} }
*/
/*static lumplist_t *colormaplumps = NULL; ///\todo free leak /*static lumplist_t *colormaplumps = NULL; ///\todo free leak
static size_t numcolormaplumps = 0; static size_t numcolormaplumps = 0;

20
src/st_stuff.c
View file

@ -439,11 +439,14 @@ void ST_changeDemoView(void)
boolean st_overlay; boolean st_overlay;
/*
static INT32 SCZ(INT32 z) static INT32 SCZ(INT32 z)
{ {
return FixedInt(FixedMul(z<<FRACBITS, vid.fdupy)); return FixedInt(FixedMul(z<<FRACBITS, vid.fdupy));
} }
*/
/*
static INT32 SCY(INT32 y) static INT32 SCY(INT32 y)
{ {
//31/10/99: fixed by Hurdler so it _works_ also in hardware mode //31/10/99: fixed by Hurdler so it _works_ also in hardware mode
@ -458,7 +461,9 @@ static INT32 SCY(INT32 y)
} }
return y; return y;
} }
*/
/*
static INT32 STRINGY(INT32 y) static INT32 STRINGY(INT32 y)
{ {
//31/10/99: fixed by Hurdler so it _works_ also in hardware mode //31/10/99: fixed by Hurdler so it _works_ also in hardware mode
@ -472,6 +477,7 @@ static INT32 STRINGY(INT32 y)
} }
return y; return y;
} }
*/
/* /*
static INT32 SPLITFLAGS(INT32 f) static INT32 SPLITFLAGS(INT32 f)
@ -488,10 +494,12 @@ static INT32 SPLITFLAGS(INT32 f)
} }
*/ */
/*
static INT32 SCX(INT32 x) static INT32 SCX(INT32 x)
{ {
return FixedInt(FixedMul(x<<FRACBITS, vid.fdupx)); return FixedInt(FixedMul(x<<FRACBITS, vid.fdupx));
} }
*/
#if 0 #if 0
static INT32 SCR(INT32 r) static INT32 SCR(INT32 r)
@ -682,7 +690,8 @@ static void ST_drawTime(void)
} }
*/ */
static inline void ST_drawRings(void) /*
static inline void ST_drawRings(void) // SRB2kart - unused.
{ {
INT32 ringnum = max(stplyr->health-1, 0); INT32 ringnum = max(stplyr->health-1, 0);
@ -701,6 +710,7 @@ static inline void ST_drawRings(void)
ST_DrawNumFromHudWS(HUD_RINGSNUM, ringnum); ST_DrawNumFromHudWS(HUD_RINGSNUM, ringnum);
} }
*/
/* /*
static void ST_drawLives(void) // SRB2kart - unused. static void ST_drawLives(void) // SRB2kart - unused.
@ -1501,7 +1511,8 @@ static void ST_drawMatchHUD(void) // SRB2kart - unused.
} }
*/ */
static inline void ST_drawRaceHUD(void) /*
static inline void ST_drawRaceHUD(void) // SRB2kart - unused.
{ {
if (leveltime > starttime-(3*TICRATE) && leveltime <= starttime-(2*TICRATE)) if (leveltime > starttime-(3*TICRATE) && leveltime <= starttime-(2*TICRATE))
V_DrawScaledPatch(SCX((BASEVIDWIDTH - SHORT(race3->width))/2), (INT32)(SCY(BASEVIDHEIGHT/2)), V_NOSCALESTART, race3); V_DrawScaledPatch(SCX((BASEVIDWIDTH - SHORT(race3->width))/2), (INT32)(SCY(BASEVIDHEIGHT/2)), V_NOSCALESTART, race3);
@ -1520,6 +1531,7 @@ static inline void ST_drawRaceHUD(void)
V_DrawString(hudinfo[HUD_LAP].x, STRINGY(hudinfo[HUD_LAP].y), 0, va("Lap: %u/%d", stplyr->laps+1, cv_numlaps.value)); V_DrawString(hudinfo[HUD_LAP].x, STRINGY(hudinfo[HUD_LAP].y), 0, va("Lap: %u/%d", stplyr->laps+1, cv_numlaps.value));
} }
} }
*/
/* /*
static void ST_drawTagHUD(void) // SRB2kart - unused. static void ST_drawTagHUD(void) // SRB2kart - unused.
@ -1632,7 +1644,8 @@ static void ST_drawCTFHUD(void) // SRB2kart - unused.
*/ */
// Draws "Red Team", "Blue Team", or "Spectator" for team gametypes. // Draws "Red Team", "Blue Team", or "Spectator" for team gametypes.
static inline void ST_drawTeamName(void) /*
static inline void ST_drawTeamName(void) // SRB2kart - unused.
{ {
if (stplyr->ctfteam == 1) if (stplyr->ctfteam == 1)
V_DrawString(256, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "RED TEAM"); V_DrawString(256, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "RED TEAM");
@ -1641,6 +1654,7 @@ static inline void ST_drawTeamName(void)
else else
V_DrawString(244, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "SPECTATOR"); V_DrawString(244, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "SPECTATOR");
} }
*/
/* /*
static void ST_drawSpecialStageHUD(void) // SRB2kart - unused. static void ST_drawSpecialStageHUD(void) // SRB2kart - unused.