Fix compilation with Clang on FreeBSD

This commit is contained in:
Cacodemon345 2021-05-09 12:58:37 +06:00 committed by Christoph Oelckers
parent 6cfc814463
commit ce4b748ff0
3 changed files with 4 additions and 4 deletions

View file

@ -2795,10 +2795,10 @@ int ConCompiler::parsecommand()
setscriptvalue(tempscrptr, scriptpos()); // save 'end' location setscriptvalue(tempscrptr, scriptpos()); // save 'end' location
} }
casescriptptr = NULL; casescriptptr = 0;
// decremented in endswitch. Don't decrement here... // decremented in endswitch. Don't decrement here...
// checking_switch--; // allow nesting (maybe if other things work) // checking_switch--; // allow nesting (maybe if other things work)
tempscrptr = NULL; tempscrptr = 0;
break; break;

View file

@ -431,7 +431,7 @@ void ClearGameEvents()
int i; int i;
for (i=0;i<MAXGAMEEVENTS;i++) for (i=0;i<MAXGAMEEVENTS;i++)
{ {
apScriptGameEvent[i]=NULL; apScriptGameEvent[i]=(intptr_t)0;
} }
} }

View file

@ -79,7 +79,7 @@ INVENTORY_DATA InventoryData[MAX_INVENTORY+1] =
{"GAS BOMB", UseInventoryChemBomb, NULL, 0, 1, (FRACUNIT), INVF_COUNT}, {"GAS BOMB", UseInventoryChemBomb, NULL, 0, 1, (FRACUNIT), INVF_COUNT},
{"FLASH BOMB", UseInventoryFlashBomb, NULL, 0, 2, (FRACUNIT), INVF_COUNT}, {"FLASH BOMB", UseInventoryFlashBomb, NULL, 0, 2, (FRACUNIT), INVF_COUNT},
{"CALTROPS", UseInventoryCaltrops, NULL, 0, 3, (FRACUNIT), INVF_COUNT}, {"CALTROPS", UseInventoryCaltrops, NULL, 0, 3, (FRACUNIT), INVF_COUNT},
{NULL, NULL, NULL, NULL, 0, 0, 0} {NULL, NULL, NULL, 0, 0, 0, 0}
}; };
void PanelInvTestSuicide(PANEL_SPRITEp psp) void PanelInvTestSuicide(PANEL_SPRITEp psp)