From b13f72857af93489f535b84d62882f681dc84a73 Mon Sep 17 00:00:00 2001
From: Chris Xiong <chirs241097@gmail.com>
Date: Tue, 27 Dec 2016 23:25:09 +0800
Subject: Fix stupid crashes.

---
 smelt/glfw/smelt_internal.hpp | 3 ++-
 smelt/glfw/sys_glfw.cpp       | 5 ++---
 smelt/sdl/sys_sdl.cpp         | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'smelt')

diff --git a/smelt/glfw/smelt_internal.hpp b/smelt/glfw/smelt_internal.hpp
index 35251e2..9f51838 100644
--- a/smelt/glfw/smelt_internal.hpp
+++ b/smelt/glfw/smelt_internal.hpp
@@ -20,6 +20,7 @@
 #include <cstdarg>
 #include <dirent.h>
 #include <unistd.h>
+#define GLEW_STATIC
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 #ifndef ENABLE_DUMB
@@ -186,12 +187,12 @@ public:
 	char logFile[256];
 	int limfps;
 	bool hideMouse,noSuspend;
-	GLuint IndexBufferObject;
 
 	TOpenGLDevice *pOpenGLDevice;
 	smVertex *vertexArray;
 	smVertex *vertexBuf;
 	GLushort *indexBuf;
+	GLuint IndexBufferObject;
 	TRenderTargetList *targets;
 	TRenderTargetList *curTarget;
 	TTextureList *textures;
diff --git a/smelt/glfw/sys_glfw.cpp b/smelt/glfw/sys_glfw.cpp
index 663fdf4..6a35016 100644
--- a/smelt/glfw/sys_glfw.cpp
+++ b/smelt/glfw/sys_glfw.cpp
@@ -73,7 +73,7 @@ bool SMELT_IMPL::smInit()
 		else if(i==0x80000004)
 		memcpy(cpuName+32, CPUInfo, sizeof(CPUInfo));
 	}
-	while(*cpuName=' ')++cpuName;
+	while(*cpuName==' ')++cpuName;
 	smLog("%s:" SLINE ": CPU: %s\n", SYS_GLFW_SRCFN,cpuName);
 	free(loced);
 
@@ -106,8 +106,7 @@ bool SMELT_IMPL::smInit()
 		return false;
 	}
 	GLFWmonitor *moninfo=glfwGetPrimaryMonitor();
-	dispw=glfwGetVideoMode(moninfo)->width;
-	disph=glfwGetVideoMode(moninfo)->height;
+	glfwGetMonitorPhysicalSize(moninfo,&dispw,&disph);
 	smLog("%s:" SLINE ": Screen: %d x %d\n",SYS_GLFW_SRCFN,dispw,disph);
 	glfwWindowHint(GLFW_RED_BITS,8);
 	glfwWindowHint(GLFW_GREEN_BITS,8);
diff --git a/smelt/sdl/sys_sdl.cpp b/smelt/sdl/sys_sdl.cpp
index 2c0ae93..beb07a0 100644
--- a/smelt/sdl/sys_sdl.cpp
+++ b/smelt/sdl/sys_sdl.cpp
@@ -62,7 +62,7 @@ bool SMELT_IMPL::smInit()
 		else if(i==0x80000004)
 		memcpy(cpuName+32, CPUInfo, sizeof(CPUInfo));
 	}
-	while(*cpuName=' ')++cpuName;
+	while(*cpuName==' ')++cpuName;
 	smLog("%s:" SLINE ": CPU: %s\n", SYS_SDL_SRCFN,cpuName);
 	free(loced);
 
@@ -132,7 +132,6 @@ bool SMELT_IMPL::smInit()
 		if(!pSM->Active)pSM->focusChange(true);
 	}
 	SDL_ShowCursor(hideMouse?SDL_DISABLE:SDL_ENABLE);
-	SDL_EnableScreenSaver();
 	initInput();
 	if(!initOGL()){smFinale();return false;}
 	if(!initOAL()){smFinale();return false;}
-- 
cgit v1.2.3