Fix another round of squirrel coverity issues

[supertux.git] / src / video / texture.hpp

diff --git a/src/video/texture.hpp b/src/video/texture.hpp
index e814547..76964a9 100644 (file)
--- a/src/video/texture.hpp
+++ b/src/video/texture.hpp
@@ -26,16 +26,18 @@
 #include "video/texture_manager.hpp"
 
 /// bitset for drawing effects
-enum DrawingEffect {
+enum {
   /** Don't apply anything */
-  NO_EFFECT,
+  NO_EFFECT = 0,
   /** Draw the Surface upside down */
-  VERTICAL_FLIP,
+  VERTICAL_FLIP = (1<<1),
   /** Draw the Surface from left to down */
-  HORIZONTAL_FLIP,
+  HORIZONTAL_FLIP = (1<<2),
   NUM_EFFECTS
 };
 
+typedef unsigned int DrawingEffect;
+
 /**
  * This class is a wrapper around a texture handle. It stores the texture width
  * and height and provides convenience functions for uploading SDL_Surfaces
@@ -51,12 +53,12 @@ private:
 
 public:
   Texture() : cache_filename() {}
-  virtual ~Texture() 
+  virtual ~Texture()
   {
-    if (texture_manager && cache_filename != "")
+    if (TextureManager::current() && cache_filename != "")
       /* The cache entry is now useless: its weak pointer to us has been
        * cleared.  Remove the entry altogether to save memory. */
-      texture_manager->reap_cache_entry(cache_filename);
+      TextureManager::current()->reap_cache_entry(cache_filename);
   }
 
   virtual unsigned int get_texture_width() const = 0;