stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 07:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixx GCC 4.4 array-bounds compile errors

Browse source
This commit is contained in:
mazmazz 2019-01-02 20:57:57 -05:00
parent b8fe77b6e2
commit e7ffd86c6e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -2098,7 +2098,7 @@ void D_SetupVote(void)
else else
m = G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, true, votebuffer); m = G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, true, votebuffer);
if (i < 3) if (i < 3)
votebuffer[i] = m; votebuffer[min(i, 2)] = m; // min() is a dumb workaround for gcc 4.4 array-bounds error
WRITEUINT16(p, m); WRITEUINT16(p, m);
} }

4
src/dehacked.c
View file

@ -3234,9 +3234,9 @@ static void readwipes(MYFILE *f)
else if (fastcmp(pword, "FINAL")) else if (fastcmp(pword, "FINAL"))
wipeoffset = wipe_specinter_final; wipeoffset = wipe_specinter_final;
} }
else if (fastncmp(word, "VOTING_", 10)) else if (fastncmp(word, "VOTING_", 7))
{ {
pword = word + 10; pword = word + 7;
if (fastcmp(pword, "TOBLACK")) if (fastcmp(pword, "TOBLACK"))
wipeoffset = wipe_specinter_toblack; wipeoffset = wipe_specinter_toblack;
else if (fastcmp(pword, "FINAL")) else if (fastcmp(pword, "FINAL"))