diff --git a/src/p_inter.c b/src/p_inter.c index fce8ccd5..5481b131 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -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; 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); - /* // SRB2kart - This shouldn't be reachable, but this frame is invalid. - if (player->charflags & SF_SUPERANIMS) - P_SetPlayerMobjState(player->mo, S_PLAY_SUPERHIT); - else - */ + // SRB2kart - This shouldn't be reachable, but this frame is invalid. + //if (player->charflags & SF_SUPERANIMS) + // P_SetPlayerMobjState(player->mo, S_PLAY_SUPERHIT); + //else P_SetPlayerMobjState(player->mo, player->mo->info->painstate); 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) ++player->timeshit; } +*/ void P_RemoveShield(player_t *player) { diff --git a/src/r_data.c b/src/r_data.c index b2c10a65..2d63317a 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -924,7 +924,8 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex) 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; UINT16 lump; @@ -939,6 +940,7 @@ static inline lumpnum_t R_CheckNumForNameList(const char *name, lumplist_t *list } return LUMPERROR; } +*/ /*static lumplist_t *colormaplumps = NULL; ///\todo free leak static size_t numcolormaplumps = 0; diff --git a/src/st_stuff.c b/src/st_stuff.c index a3429690..747d4b06 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -439,11 +439,14 @@ void ST_changeDemoView(void) boolean st_overlay; +/* static INT32 SCZ(INT32 z) { return FixedInt(FixedMul(z<health-1, 0); @@ -701,6 +710,7 @@ static inline void ST_drawRings(void) ST_DrawNumFromHudWS(HUD_RINGSNUM, ringnum); } +*/ /* 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)) 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)); } } +*/ /* 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. -static inline void ST_drawTeamName(void) +/* +static inline void ST_drawTeamName(void) // SRB2kart - unused. { if (stplyr->ctfteam == 1) V_DrawString(256, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "RED TEAM"); @@ -1641,6 +1654,7 @@ static inline void ST_drawTeamName(void) else V_DrawString(244, splitscreen ? STRINGY(184) : STRINGY(192), V_HUDTRANSHALF, "SPECTATOR"); } +*/ /* static void ST_drawSpecialStageHUD(void) // SRB2kart - unused.