mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
win32 gcc 4.3.0 fixes
git-svn-id: https://svn.eduke32.com/eduke32@760 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
65c2fd394a
commit
1747bc460e
5 changed files with 8 additions and 10 deletions
|
@ -18,10 +18,8 @@
|
||||||
//#include <GL/glext.h>
|
//#include <GL/glext.h>
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
# include <OpenGL/glext.h>
|
# include <OpenGL/glext.h>
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# include "glext.h"
|
|
||||||
#else
|
#else
|
||||||
# include "GL/glext.h"
|
# include "glext.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT
|
#ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT
|
||||||
|
|
|
@ -576,7 +576,7 @@ int32 CONFIG_ReadSetup(void)
|
||||||
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
||||||
|
|
||||||
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
||||||
myname[sizeof(myname)] = '\0';
|
myname[sizeof(myname)-1] = '\0';
|
||||||
|
|
||||||
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
||||||
|
|
||||||
|
|
|
@ -9873,7 +9873,7 @@ static void Startup(void)
|
||||||
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
||||||
|
|
||||||
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
||||||
myname[sizeof(myname)] = '\0';
|
myname[sizeof(myname)-1] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CommandMap)
|
if (CommandMap)
|
||||||
|
|
|
@ -1912,10 +1912,10 @@ static void DoPlayer(int iSet, int lVar1, int lLabelID, int lVar2, int lParm2)
|
||||||
case PLAYER_WEAPRECS:
|
case PLAYER_WEAPRECS:
|
||||||
if (iSet)
|
if (iSet)
|
||||||
{
|
{
|
||||||
g_player[iPlayer].ps->weaprecs[16]=lValue;
|
g_player[iPlayer].ps->weaprecs[15]=lValue;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SetGameVarID(lVar2, g_player[iPlayer].ps->weaprecs[16], g_i, g_p);
|
SetGameVarID(lVar2, g_player[iPlayer].ps->weaprecs[15], g_i, g_p);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case PLAYER_WEAPRECCNT:
|
case PLAYER_WEAPRECCNT:
|
||||||
|
@ -2143,14 +2143,14 @@ static void DoPlayer(int iSet, int lVar1, int lLabelID, int lVar2, int lParm2)
|
||||||
SetGameVarID(lVar2, g_player[iPlayer].ps->on_ground, g_i, g_p);
|
SetGameVarID(lVar2, g_player[iPlayer].ps->on_ground, g_i, g_p);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case PLAYER_NAME:
|
/* case PLAYER_NAME:
|
||||||
if (iSet)
|
if (iSet)
|
||||||
{
|
{
|
||||||
g_player[iPlayer].ps->name[32]=lValue;
|
g_player[iPlayer].ps->name[32]=lValue;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SetGameVarID(lVar2, g_player[iPlayer].ps->name[32], g_i, g_p);
|
SetGameVarID(lVar2, g_player[iPlayer].ps->name[32], g_i, g_p);
|
||||||
return;
|
return;*/
|
||||||
|
|
||||||
case PLAYER_INVEN_ICON:
|
case PLAYER_INVEN_ICON:
|
||||||
if (iSet)
|
if (iSet)
|
||||||
|
|
|
@ -942,7 +942,7 @@ static int osdcmd_name(const osdfuncparm_t *parm)
|
||||||
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
tempbuf[Bstrlen(tempbuf)-1] = '\0';
|
||||||
|
|
||||||
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
Bstrncpy(myname,tempbuf,sizeof(myname)-1);
|
||||||
myname[sizeof(myname)] = '\0';
|
myname[sizeof(myname)-1] = '\0';
|
||||||
|
|
||||||
OSD_Printf("name %s\n",myname);
|
OSD_Printf("name %s\n",myname);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue