thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 14:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v1' into new-palette

Browse source
This commit is contained in:
TehRealSalt 2019-05-14 21:01:32 -04:00
commit ce39456a24
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/f_finale.c
View file

@ -459,9 +459,13 @@ static const char *credits[] = {
"\"ZarroTsu\"", "\"ZarroTsu\"",
"", "",
"\1External Artists", "\1External Artists",
"\"1-Up Mason\"",
"\"Chengi\"",
"\"Chrispy\"", "\"Chrispy\"",
"\"DirkTheHusky\"", "\"DirkTheHusky\"",
"\"LJSTAR\"",
"\"MotorRoach\"", "\"MotorRoach\"",
"\"Mr. McScrewup\"",
"\"Nev3r\"", "\"Nev3r\"",
"\"Ritz\"", "\"Ritz\"",
"\"Rob\"", "\"Rob\"",
@ -470,6 +474,7 @@ static const char *credits[] = {
"\"Spherallic\"", "\"Spherallic\"",
"\"VAdaPEGA\"", "\"VAdaPEGA\"",
"\"Virt\"", "\"Virt\"",
"\"Voltrix\"",
"\"zxyspku\"", "\"zxyspku\"",
"", "",
"\1Sound Design", "\1Sound Design",

18
src/g_game.c
View file

@ -1249,7 +1249,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (demo.playback) return; if (demo.playback) return;
if (ssplayer == 1)
player = &players[consoleplayer];
else
player = &players[displayplayers[ssplayer-1]]; player = &players[displayplayers[ssplayer-1]];
if (ssplayer == 2) if (ssplayer == 2)
thiscam = (player->bot == 2 ? &camera[0] : &camera[ssplayer-1]); thiscam = (player->bot == 2 ? &camera[0] : &camera[ssplayer-1]);
else else
@ -5941,7 +5945,8 @@ void G_StoreRewindInfo(void)
void G_PreviewRewind(tic_t previewtime) void G_PreviewRewind(tic_t previewtime)
{ {
size_t i, j; SINT8 i;
size_t j;
fixed_t tweenvalue = 0; fixed_t tweenvalue = 0;
rewindinfo_t *info = rewindhead, *next_info = rewindhead; rewindinfo_t *info = rewindhead, *next_info = rewindhead;
@ -6001,13 +6006,14 @@ void G_PreviewRewind(tic_t previewtime)
players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j]; players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
} }
for (i = splitscreen+1; i > 0; i--) for (i = splitscreen; i >= 0; i--)
P_ResetCamera(&players[displayplayers[i]], &camera[i]); P_ResetCamera(&players[displayplayers[i]], &camera[i]);
} }
void G_ConfirmRewind(tic_t rewindtime) void G_ConfirmRewind(tic_t rewindtime)
{ {
tic_t i; SINT8 i;
tic_t j;
boolean oldmenuactive = menuactive, oldsounddisabled = sound_disabled; boolean oldmenuactive = menuactive, oldsounddisabled = sound_disabled;
INT32 olddp1 = displayplayers[0], olddp2 = displayplayers[1], olddp3 = displayplayers[2], olddp4 = displayplayers[3]; INT32 olddp1 = displayplayers[0], olddp2 = displayplayers[1], olddp3 = displayplayers[2], olddp4 = displayplayers[3];
@ -6027,10 +6033,10 @@ void G_ConfirmRewind(tic_t rewindtime)
G_DoPlayDemo(NULL); // Restart the current demo G_DoPlayDemo(NULL); // Restart the current demo
for (i = 0; i < rewindtime && leveltime < rewindtime; i++) for (j = 0; j < rewindtime && leveltime < rewindtime; i++)
{ {
//TryRunTics(1); //TryRunTics(1);
G_Ticker((i % NEWTICRATERATIO) == 0); G_Ticker((j % NEWTICRATERATIO) == 0);
} }
demo.rewinding = false; demo.rewinding = false;
@ -6049,7 +6055,7 @@ void G_ConfirmRewind(tic_t rewindtime)
R_ExecuteSetViewSize(); R_ExecuteSetViewSize();
G_ResetViews(); G_ResetViews();
for (i = splitscreen+1; i > 0; i--) for (i = splitscreen; i >= 0; i--)
P_ResetCamera(&players[displayplayers[i]], &camera[i]); P_ResetCamera(&players[displayplayers[i]], &camera[i]);
} }