fixed last commit

teeworlds · Mar 22, 2015 · 663c396 · 663c396
1 parent 721739e
commit 663c396
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/other/sdl/sdl.lua b/other/sdl/sdl.lua
@@ -36,9 +36,9 @@ SDL = {
 			elseif option.use_winlib > 0 then
 				settings.cc.includes:Add(SDL.basepath .. "/include")
 				if option.use_winlib == 32 then
-					settings.link.libpath:Add(SDL.basepath .. "/lib32")
+					settings.link.libpath:Add(SDL.basepath .. "/lib/x86")
 				else
-					settings.link.libpath:Add(SDL.basepath .. "/lib64")
+					settings.link.libpath:Add(SDL.basepath .. "/lib/x64")
 				end
 				settings.link.libs:Add("SDL2")
 				settings.link.libs:Add("SDL2main")

diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
@@ -687,8 +687,8 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int Screen, int *pWidth
 		pName,
 		SDL_WINDOWPOS_UNDEFINED_DISPLAY(0),
 		SDL_WINDOWPOS_UNDEFINED_DISPLAY(0),
-		*Width,
-		*Height,
+		*pWidth,
+		*pHeight,
 		SdlFlags);
 
 	if(m_pWindow == NULL)
@@ -697,7 +697,7 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int Screen, int *pWidth
 		return -1;
 	}
 
-	SDL_GetWindowSize(m_pWindow, Width, Height);
+	SDL_GetWindowSize(m_pWindow, pWidth, pHeight);
 
 	m_GLContext = SDL_GL_CreateContext(m_pWindow);
 

diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
@@ -242,7 +242,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		TextRender()->TextEx(&Cursor, aBuf, -1);
 	}
 
-	if(IncreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_UP) || Input()->KeyDown(KEY_PLUS) || Input()->KeyDown(KEY_KP_PLUS))
+	if(IncreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_UP) /*TODO: Fix me|| Input()->KeyDown(KEY_PLUS)*/ || Input()->KeyDown(KEY_KP_PLUS))
 	{
 		if(pInfo->m_Speed < 0.1f) DemoPlayer()->SetSpeed(0.1f);
 		else if(pInfo->m_Speed < 0.25f) DemoPlayer()->SetSpeed(0.25f);