quick and dirty gcc 15 compile fix

need to fix this properly
This commit is contained in:
Alug committed 2025-04-28 13:26:08 +01:00
1 parent 984d501ee1
commit 4c1cfc91da
2 files changed
+7

No files matched your search

+4
View File
@@ -1414,6 +1414,9 @@ static void readhuditem(MYFILE *f, INT32 num)
// IMPORTANT!
// DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
actionpointer_t actionpointers[] =
{
{{A_Explode}, "A_EXPLODE"},
@@ -1622,6 +1625,7 @@ actionpointer_t actionpointers[] =
// This NULL entry must be the last in the list
{{NULL}, NULL},
};
#pragma GCC diagnostic pop
static void readframe(MYFILE *f, INT32 num)
{
+3
View File
@@ -69,6 +69,8 @@ char sprnames[NUMSPRITES + 1][5] =
};
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
state_t states[NUMSTATES] =
{
// frame is masked through FF_FRAMEMASK
@@ -3410,6 +3412,7 @@ state_t states[NUMSTATES] =
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
#endif
};
#pragma GCC diagnostic pop
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{