Cleaned up TextureRes lifecycle to make sure it’s destroyed by RAII

[lugaru.git] / Source / Game.hpp

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 596ade47f59dfb58d325024e922f0ff5f6f5dd97..48f51f9eeacc1b4ba325a7bcd0f5cbeabf4232bc 100644 (file)
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -32,7 +32,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Graphic/Stereo.hpp"
 #include "Graphic/Text.hpp"
 #include "Graphic/Texture.hpp"
-#include "Objects/Objects.hpp"
+#include "Objects/Object.hpp"
 #include "Objects/Person.hpp"
 #include "Objects/Weapons.hpp"
 #include "Thirdparty/optionparser.h"
@@ -120,11 +120,6 @@ extern int numchallengelevels;
 
 extern bool console;
 extern std::string consoletext[15];
-extern std::string displaytext[15];
-extern float displaytime[15];
-extern float displayblinkdelay;
-extern bool displayblink;
-extern unsigned displayselected;
 extern float consoleblinkdelay;
 extern bool consoleblink;
 extern unsigned consoleselected;
@@ -155,8 +150,6 @@ void TickOnce();
 void TickOnceAfter();
 void SetUpLighting();
 GLvoid ReSizeGLScene(float fov, float near);
-int checkcollide(XYZ startpoint, XYZ endpoint);
-int checkcollide(XYZ startpoint, XYZ endpoint, int what);
 
 void fireSound(int sound = fireendsound);
 
@@ -183,13 +176,6 @@ static __forceinline void swap_gl_buffers(void)
     frameticks = now;
 }
 
-extern "C" {
-    void UndefinedSymbolToExposeStubbedCode(void);
-}
-//#define STUBBED(x) UndefinedSymbolToExposeStubbedCode();
-#define STUBBED(x) { static bool seen = false; if (!seen) { seen = true; fprintf(stderr, "STUBBED: %s at %s:%d\n", x, __FILE__, __LINE__); } }
-//#define STUBBED(x)
-
 enum maptypes {
     mapkilleveryone, mapgosomewhere,
     mapkillsomeone, mapkillmost // These two are unused