zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Fix -fpermissive function pointer type errors

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7523 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-04-08 06:27:31 +00:00 committed by Christoph Oelckers
parent b6c8147842
commit 3d3348c2b8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/sw/src/save.cpp
View file

@ -171,7 +171,7 @@ int SaveSymDataInfo(MFILE_WRITE fil, void *ptr)
return 0;
}
int SaveSymCodeInfo(MFILE_WRITE fil, void *ptr)
static int SaveSymCodeInfo_raw(MFILE_WRITE fil, void *ptr)
{
savedcodesym sym;
@ -192,6 +192,11 @@ int SaveSymCodeInfo(MFILE_WRITE fil, void *ptr)
return 0;
}
template <typename T>
static int SaveSymCodeInfo(MFILE_WRITE fil, T * ptr)
{
return SaveSymCodeInfo_raw(fil, (void *)ptr);
}
int LoadSymDataInfo(MFILE_READ fil, void **ptr)
{

4
source/sw/src/text.cpp
View file

@ -171,7 +171,7 @@ PutStringTimer(PLAYERp pp, short x, short y, const char *string, short seconds)
extern unsigned short xlatfont[];
long kill_tics;
short id, ac;
void *func;
PANEL_SPRITE_FUNCp func;
offset = x;
@ -200,7 +200,7 @@ PutStringTimer(PLAYERp pp, short x, short y, const char *string, short seconds)
if (c > asc_Space && c < 127)
{
nsp = pSpawnFullViewSprite(pp, ac, PRI_FRONT_MAX, offset, y);
nsp->PanelSpriteFunc = (PANEL_SPRITE_FUNCp)func;
nsp->PanelSpriteFunc = func;
nsp->kill_tics = kill_tics;
nsp->ID = id;
offset += tilesiz[ac].x;