diff --git a/src/g_game.c b/src/g_game.c index b479b61f8..d4db31a02 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1750,7 +1750,7 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive) // Increment a viewpoint by offset from the current player. A negative value // decrements. // -static void G_ActuallyAdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam) +void G_AdjustViewEx(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam) { INT32 *displayplayerp, oldview; displayplayerp = &displayplayers[viewnum-1]; @@ -1767,12 +1767,6 @@ static void G_ActuallyAdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive (*displayplayerp) = oldview; } -// im a lazy ass :chonkbuncle: -void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive) -{ - G_ActuallyAdjustView(viewnum, offset, onlyactive, true); -} - // // G_ResetViews // Ensures all viewpoints are valid @@ -1802,7 +1796,7 @@ void G_ResetViews(boolean resetfreecam) */ for (viewd = 1; viewd <= splits; ++viewd) { - G_ActuallyAdjustView(viewd, 0, false, resetfreecam); + G_AdjustViewEx(viewd, 0, false, resetfreecam); } } @@ -1891,7 +1885,6 @@ void G_Ticker(boolean run) switch (gamestate) { case GS_LEVEL: - for (; ra_timeskip < starttime - TICRATE*4; ra_timeskip++) // this looks weird but this is done to not break compability with older demos for now. { if (demo.title) diff --git a/src/g_game.h b/src/g_game.h index a8e2b5135..b300bca9e 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -264,7 +264,8 @@ INT32 G_CountPlayersPotentiallyViewable(boolean active); void G_ResetViews(boolean resetfreecam); void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive); -void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive); +void G_AdjustViewEx(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam); +#define G_AdjustView(v,o,oa) G_AdjustViewEx(v,o,oa, true) void G_AddPlayer(INT32 playernum);