Stopped using Account pointers, and removed general difficulty setting (difficulty...

[lugaru.git] / Source / Stereo.cpp

diff --git a/Source/Stereo.cpp b/Source/Stereo.cpp
index 378942a1f5056d889de77f7cb8a6fd762227486e..8887a526c6b5faec3330f6a286e61ac4d4b6eb34 100644 (file)
--- a/Source/Stereo.cpp
+++ b/Source/Stereo.cpp
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Game.h"
@@ -32,8 +31,6 @@ bool CanInitStereo(StereoMode mode)
 
     switch (mode) {
     case stereoNone:
-        return true;
-        break;
     case stereoAnaglyph:
         return true;
         break;
@@ -57,15 +54,13 @@ bool CanInitStereo(StereoMode mode)
 void InitStereo(StereoMode mode)
 {
     switch (mode) {
+    default:
     case stereoNone:
-        glDisable( GL_STENCIL_TEST);
-        return;
     case stereoAnaglyph:
-        glDisable( GL_STENCIL_TEST);
+        glDisable(GL_STENCIL_TEST);
         return;
     case stereoHorizontalInterlaced:
     case stereoVerticalInterlaced:
-
         fprintf(stderr, "Screen width is %i, height is %i\n", kContextWidth, kContextHeight);
 
         // Setup stencil buffer
@@ -122,12 +117,11 @@ void InitStereo(StereoMode mode)
         glEnable(GL_CULL_FACE);
         glEnable(GL_LIGHTING);
         glEnable(GL_TEXTURE_2D);
-
     }
 
 }
 
-const char* StereoModeName(StereoMode mode)
+const std::string StereoModeName(StereoMode mode)
 {
     switch (mode) {
     case stereoNone:
@@ -155,4 +149,4 @@ const char* StereoModeName(StereoMode mode)
         return "(error)";
         break;
     }
-}
\ No newline at end of file
+}