diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-02 15:42:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-02 16:05:59 +0300 |
| commit | f4f16b2fd6c455cd38e089a97db374c5ee3ea9fd (patch) | |
| tree | e8df9308ab06877da48f0d3cc9f0f2f02b8bd084 | |
| parent | a724b4610ae422c224291256f36d201fa9907ccb (diff) | |
| download | manaverse-f4f16b2fd6c455cd38e089a97db374c5ee3ea9fd.tar.gz manaverse-f4f16b2fd6c455cd38e089a97db374c5ee3ea9fd.tar.bz2 manaverse-f4f16b2fd6c455cd38e089a97db374c5ee3ea9fd.tar.xz manaverse-f4f16b2fd6c455cd38e089a97db374c5ee3ea9fd.zip | |
fix code style.
| -rw-r--r-- | src/graphicsmanager.h | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 450040eed..ab69a0cc6 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -24,14 +24,12 @@ #include "main.h" #ifdef USE_OPENGL -#ifndef WIN32 #define GL_GLEXT_PROTOTYPES 1 #include <SDL_opengl.h> // hack to hide warnings #undef GL_GLEXT_VERSION #undef GL_GLEXT_PROTOTYPES #endif -#endif #include <set> #include <string> diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 71b5e9a1d..b6befb491 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -271,9 +271,10 @@ void ResourceManager::clearDeleted() if (!(*resDelIter)->getRefCount()) { status = true; - logResource(*resDelIter); + Resource *res = *resDelIter; + logResource(res); mDeletedResources.erase(resDelIter); - delete *resDelIter; + delete res; break; } ++ resDelIter; |