update, remove config files

diff --git a/Data/Users b/Data/Users
deleted file mode 100644 (file)
index 94ed689..0000000
Binary files a/Data/Users and /dev/null differ

diff --git a/Data/config.txt b/Data/config.txt
deleted file mode 100644 (file)
index 98480c9..0000000
--- a/Data/config.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-Screenwidth:
-1024
-Screenheight:
-768
-Mouse sensitivity:
-1
-Blur(0,1):
-0
-Overall Detail(0,1,2) higher=better:
-2
-Floating jump:
-0
-Mouse jump:
-0
-Ambient sound:
-1
-Blood (0,1,2):
-1
-Auto slomo:
-1
-Foliage:
-1
-Music:
-1
-Trilinear:
-1
-Decals(shadows,blood puddles,etc):
-1
-Invert mouse:
-0
-Gamespeed:
-1
-Difficulty(0,1,2) higher=harder:
-2
-Damage effects(blackout, doublevision):
-1
-Text:
-1
-Debug:
-0
-VBL Sync:
-0
-Show Points:
-0
-Always Blur:
-0
-Immediate mode (turn on on G5):
-0
-Velocity blur:
-1
-Volume:
-0.8
-Forward key:
-w
-Back key:
-s
-Left key:
-a
-Right key:
-d
-Jump key:
-space
-Crouch key:
-shift
-Draw key:
-e
-Throw key:
-q
-Attack key:
-mouse1
-Chat key:
-unknown
-Damage bar:
-0
-StereoMode:
-0
-StereoSeparation:
-0.05
-StereoReverse:
-0

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 5d73e7a139c3e20217204ff9ec26082460baa005..23a5f1a407b58f56b6df81c3c2a07d55ef929491 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -296,7 +296,9 @@ Boolean SetUp (Game & game)
 
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
+#if SDL_VERSION_ATLEAST(1, 2, 10)
     SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, vblsync);
+#endif
     
     if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
     {