stjr
/
Kart-Public
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixx GCC 4.4 array-bounds compile errors

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);
} }

6
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"))
@ -6934,7 +6934,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_GARU1", "S_GARU1",
"S_GARU2", "S_GARU2",
"S_GARU3", "S_GARU3",
"S_TGARU", "S_TGARU",
"S_TGARU1", "S_TGARU1",
"S_TGARU2", "S_TGARU2",
"S_TGARU3", // Wind attack used by Roaming Shadows on Players. "S_TGARU3", // Wind attack used by Roaming Shadows on Players.