Merge branch 'v1-errors' into 'master'
V1 errors See merge request KartKrew/Kart-Public!140
This commit is contained in:
commit
c96f5dba0c
|
@ -107,7 +107,7 @@ matrix:
|
||||||
- p7zip-full
|
- p7zip-full
|
||||||
- gcc-8
|
- gcc-8
|
||||||
compiler: gcc-8
|
compiler: gcc-8
|
||||||
env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow" GCC81=1
|
env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" GCC81=1
|
||||||
if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
|
if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
|
||||||
#gcc-8 (Ubuntu 7.2.0-1ubuntu1~14.04) 8.1.0
|
#gcc-8 (Ubuntu 7.2.0-1ubuntu1~14.04) 8.1.0
|
||||||
- os: linux
|
- os: linux
|
||||||
|
|
|
@ -6032,7 +6032,7 @@ void G_ConfirmRewind(tic_t rewindtime)
|
||||||
|
|
||||||
G_DoPlayDemo(NULL); // Restart the current demo
|
G_DoPlayDemo(NULL); // Restart the current demo
|
||||||
|
|
||||||
for (j = 0; j < rewindtime && leveltime < rewindtime; i++)
|
for (j = 0; j < rewindtime && leveltime < rewindtime; j++)
|
||||||
{
|
{
|
||||||
//TryRunTics(1);
|
//TryRunTics(1);
|
||||||
G_Ticker((j % NEWTICRATERATIO) == 0);
|
G_Ticker((j % NEWTICRATERATIO) == 0);
|
||||||
|
|
|
@ -7913,7 +7913,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
||||||
static void P_CalcPostImg(player_t *player)
|
static void P_CalcPostImg(player_t *player)
|
||||||
{
|
{
|
||||||
sector_t *sector = player->mo->subsector->sector;
|
sector_t *sector = player->mo->subsector->sector;
|
||||||
postimg_t *type = postimg_none;
|
postimg_t *type = NULL;
|
||||||
INT32 *param;
|
INT32 *param;
|
||||||
fixed_t pviewheight;
|
fixed_t pviewheight;
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
|
|
Loading…
Reference in New Issue