zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 16:07:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix c++11's compile problems.

Browse source
This commit is contained in:
Christoph Oelckers 2013-08-28 08:33:11 +02:00
parent 4d3f6cae2e
commit 737708b635
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmdlib.cpp
View file

@ -957,7 +957,7 @@ void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
} }
} }
#elif defined(__sun) || defined(linux) #elif defined(__sun) || defined(__linux__)
//========================================================================== //==========================================================================
// //

2
src/gl/data/gl_portaldata.cpp
View file

@ -223,7 +223,7 @@ struct FCoverageBuilder
{ {
FCoverageVertex *v1 = &shape[i]; FCoverageVertex *v1 = &shape[i];
FCoverageVertex *v2 = &shape[(i+1) % shape.Size()]; FCoverageVertex *v2 = &shape[(i+1) % shape.Size()];
FCoverageLine vl = { *v1, *v2 }; FCoverageLine vl = {{*v1, *v2}};
double dist_v1 = PartitionDistance(v1, bsp); double dist_v1 = PartitionDistance(v1, bsp);
double dist_v2 = PartitionDistance(v2, bsp); double dist_v2 = PartitionDistance(v2, bsp);

4
src/gl/data/gl_setup.cpp
View file

@ -130,7 +130,7 @@ static int MergeMapSections(int num)
cvertex_t vt; cvertex_t vt;
// first step: Set mapsection for all vertex positions. // first step: Set mapsection for all vertex positions.
for(DWORD i=0;i<numsegs;i++) for(DWORD i=0;i<(DWORD)numsegs;i++)
{ {
seg_t * seg = &segs[i]; seg_t * seg = &segs[i];
int section = seg->Subsector->mapsection; int section = seg->Subsector->mapsection;
@ -142,7 +142,7 @@ static int MergeMapSections(int num)
} }
// second step: Check if any seg references more than one mapsection, either by subsector or by vertex // second step: Check if any seg references more than one mapsection, either by subsector or by vertex
for(DWORD i=0;i<numsegs;i++) for(DWORD i=0;i<(DWORD)numsegs;i++)
{ {
seg_t * seg = &segs[i]; seg_t * seg = &segs[i];
int section = seg->Subsector->mapsection; int section = seg->Subsector->mapsection;

2
src/gl/scene/gl_portal.cpp
View file

@ -781,7 +781,7 @@ void GLPlaneMirrorPortal::DrawContents()
gl.Enable(GL_CLIP_PLANE0+renderdepth); gl.Enable(GL_CLIP_PLANE0+renderdepth);
// This only works properly for non-sloped planes so don't bother with the math. // This only works properly for non-sloped planes so don't bother with the math.
//double d[4]={origin->a/65536., origin->c/65536., origin->b/65536., FIXED2FLOAT(origin->d)}; //double d[4]={origin->a/65536., origin->c/65536., origin->b/65536., FIXED2FLOAT(origin->d)};
double d[4]={0, PlaneMirrorMode, 0, FIXED2FLOAT(origin->d)}; double d[4]={0, static_cast<double>(PlaneMirrorMode), 0, FIXED2FLOAT(origin->d)};
gl.ClipPlane(GL_CLIP_PLANE0+renderdepth, d); gl.ClipPlane(GL_CLIP_PLANE0+renderdepth, d);
GLRenderer->DrawScene(); GLRenderer->DrawScene();

4
src/gl/system/gl_interface.cpp
View file

@ -44,7 +44,7 @@
#include "i_system.h" #include "i_system.h"
#include "gl/system/gl_cvars.h" #include "gl/system/gl_cvars.h"
#if defined (unix) || defined (__APPLE__) #if defined (__unix__) || defined (__APPLE__)
#include <SDL.h> #include <SDL.h>
#define wglGetProcAddress(x) (*SDL_GL_GetProcAddress)(x) #define wglGetProcAddress(x) (*SDL_GL_GetProcAddress)(x)
#endif #endif
@ -210,7 +210,7 @@ void gl_LoadExtensions()
// Don't even start if it's lower than 1.4 // Don't even start if it's lower than 1.4
if (strcmp(version, "1.4") < 0) if (strcmp(version, "1.4") < 0)
{ {
I_FatalError("Unsupported OpenGL version.\nAt least GL 1.4 is required to run "GAMENAME".\n"); I_FatalError("Unsupported OpenGL version.\nAt least GL 1.4 is required to run " GAMENAME ".\n");
} }
// This loads any function pointers and flags that require a vaild render context to // This loads any function pointers and flags that require a vaild render context to

2
src/gl/textures/gl_material.cpp
View file

@ -430,7 +430,7 @@ const FHardwareTexture *FGLTexture::Bind(int texunit, int cm, int clampmode, int
if (!hwtex->Bind(texunit, cm, translation)) if (!hwtex->Bind(texunit, cm, translation))
{ {
int w, h; int w=0, h=0;
// Create this texture // Create this texture
unsigned char * buffer = NULL; unsigned char * buffer = NULL;

2
src/sdl/sdlglvideo.cpp
View file

@ -56,7 +56,7 @@ EXTERN_CVAR (Int, vid_renderer)
CUSTOM_CVAR(Int, gl_vid_multisample, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL ) CUSTOM_CVAR(Int, gl_vid_multisample, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL )
{ {
Printf("This won't take effect until "GAMENAME" is restarted.\n"); Printf("This won't take effect until " GAMENAME " is restarted.\n");
} }
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------