Got rid of unused "osx" global var

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 6c8ac0abe05950020c30dacb385a5f8132374624..51edee1a289e28dd437392c1f8bc969cb5787293 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -40,7 +40,6 @@ extern Light light;
 extern Objects objects;
 extern int detail;
 extern float usermousesensitivity;
-extern bool osx;
 extern float camerashake;
 extern int slomo;
 extern float slomodelay;

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 60727a73b66dc1e1910f65d4b32de6f097ea226a..df7790451e90969724642bb88ceee2a009bcce3f 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -45,7 +45,6 @@ extern GLubyte bloodText[512 * 512 * 3];
 extern GLubyte wolfbloodText[512 * 512 * 3];
 extern bool ismotionblur;
 extern bool trilinear;
-extern bool osx;
 extern bool musictoggle;
 extern int environment;
 extern bool ambientsound;

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 709e021f273778149893124dcb7ece7f272f92a7..624aa587c1a619ec8fa7e72ada0f4c2cbfbcdabe 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -88,7 +88,6 @@ GLubyte bloodText[512 * 512 * 3] = {0};
 GLubyte wolfbloodText[512 * 512 * 3] = {0};
 float colors[3] = {0};
 int bloodtoggle = 0;
-bool osx = false;
 float camerashake = 0;
 float woozy = 0;
 float blackout = 0;

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index d79162bf38930d2f10bdb9237cb708f7e56f6641..d66fb7290cd1d0b351f0e7f5388dd0395095d4fc 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -47,7 +47,6 @@ extern int slomo;
 extern bool cellophane;
 extern float texdetail;
 
-extern bool osx;
 extern bool freeze;
 extern bool stillloading;
 extern int mainmenu;
@@ -245,7 +244,6 @@ bool SetUp ()
 {
     LOGFUNC;
 
-    osx = 0;
     cellophane = 0;
     texdetail = 4;
     slomospeed = 0.25;

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 95e06b9b554d333a3562673063f8c752cc63ceb0..0b526400b9cbb2fa1b8821475021d00ba7184494 100644 (file)
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -42,7 +42,6 @@ extern GLubyte bloodText[512 * 512 * 3];
 extern GLubyte wolfbloodText[512 * 512 * 3];
 extern int bloodtoggle;
 extern Objects objects;
-extern bool osx;
 extern bool autoslomo;
 extern float camerashake;
 extern float woozy;
@@ -4208,7 +4207,7 @@ void Person::DoStuff()
         bleeding -= multiplier * .3;
         if (bloodtoggle == 2) {
             skeleton.drawmodel.textureptr.bind();
-            if (bleeding <= 0 && (detail != 2 || osx))
+            if ((bleeding <= 0) && (detail != 2))
                 DoMipmaps();
         }
     }
@@ -4359,7 +4358,7 @@ void Person::DoStuff()
                 }
             }
         }
-        if (!osx && detail > 1) {
+        if (detail > 1) {
             skeleton.drawmodel.textureptr.bind();
             DoMipmaps();
         }

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 44c78cfe686a36557025238567c6abe02a64de24..b8784587613e13ae5b11ceee8f2a61bf38a8ab4b 100644 (file)
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -42,7 +42,6 @@ extern float texdetail;
 extern GLubyte bloodText[512 * 512 * 3];
 extern int bloodtoggle;
 extern Objects objects;
-extern bool osx;
 extern bool autoslomo;
 extern float camerashake;
 extern float woozy;