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

- fixed compile errors.

Browse source 
(Include dependencies suck, it's time for modules to become an option.)
This commit is contained in:
Christoph Oelckers 2019-11-25 17:19:48 +01:00
parent a9ee5940fc
commit 556c61b60b
8 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/menu/menu.h
View file

@ -8,11 +8,12 @@
#include "v_font.h"
#include "version.h"
#include "textures.h"
#include "zstring.h"
EXTERN_CVAR(Float, snd_menuvolume)
EXTERN_CVAR(Int, m_use_mouse);
enum
enum EMax
{
MAXSKILLS = 7,
MAXVOLUMES = 7,

2
source/duke3d/src/duke3d.h
View file

@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "pragmas.h"
#include "polymost.h"
#include "gamecvars.h"
#include "menu/menu.h"
#define HEAD2 APPNAME
@ -58,7 +59,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define MOVEFIFOSIZ 2
// KEEPINSYNC lunatic/con_lang.lua
#define MAXVOLUMES 7
#define MAXLEVELS 64
#define MAXGAMETYPES 16

1
source/duke3d/src/game.h
View file

@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gamevars.h"
#include "mmulti.h"
#include "network.h"
#include "menu/menu.h"
BEGIN_DUKE_NS

4
source/duke3d/src/gamedef.cpp
View file

@ -5018,7 +5018,7 @@ repeatcase:
}
i = strcspn(textptr, "\r\n");
gVolumeNames[j] = StringTable::MakeMacro(textptr, i);
gVolumeNames[j] = FStringTable::MakeMacro(textptr, i);
textptr += i;
g_volumeCnt = j+1;
@ -5119,7 +5119,7 @@ repeatcase:
}
i = strcspn(textptr, "\r\n");
gSkillNames[j] = StringTable::MakeMacro(textptr, i);
gSkillNames[j] = FStringTable::MakeMacro(textptr, i);
textptr+=i;
for (i=0; i<MAXSKILLS; i++)

2
source/duke3d/src/global.h
View file

@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "quotes.h"
#include "sector.h"
#include "sounds.h"
#include "menu/menu.h"
BEGIN_DUKE_NS
@ -41,7 +42,6 @@ BEGIN_DUKE_NS
#define MAXINTERPOLATIONS MAXSPRITES
// KEEPINSYNC lunatic/con_lang.lua
#define MAXSKILLS 7
// duke3d global soup :(

2
source/rr/src/duke3d.h
View file

@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "polymost.h"
#include "gamecvars.h"
#include "menu/menu.h"
BEGIN_RR_NS
@ -60,7 +61,6 @@ BEGIN_RR_NS
#define MOVEFIFOSIZ 256
// KEEPINSYNC lunatic/con_lang.lua
#define MAXVOLUMES 7
#define MAXLEVELS 64
#define MAXGAMETYPES 16

4
source/rr/src/gamedef.cpp
View file

@ -1887,7 +1887,7 @@ static int32_t C_ParseCommand(int32_t loop)
}
i = strcspn(textptr, "\r\n");
gVolumeNames[j] = StringTable::MakeMacro(textptr, i);
gVolumeNames[j] = FStringTable::MakeMacro(textptr, i);
textptr+=i;
g_volumeCnt = j+1;
continue;
@ -1911,7 +1911,7 @@ static int32_t C_ParseCommand(int32_t loop)
}
i = strcspn(textptr, "\r\n");
gSkillNames[j] = StringTable::MakeMacro(textptr, i);
gSkillNames[j] = FStringTable::MakeMacro(textptr, i);
textptr+=i;
for (i=0; i<MAXSKILLS; i++)

1
source/rr/src/global.h
View file

@ -47,7 +47,6 @@ BEGIN_RR_NS
#define MAXINTERPOLATIONS MAXSPRITES
// KEEPINSYNC lunatic/con_lang.lua
#define MAXSKILLS 7
// duke3d global soup :(