Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix optimized compile warnings. Remove unused GLee remains.

master
Per Inge Mathisen 2011-04-25 00:32:57 +02:00
parent 8919334d9b
commit 0fc0eeeb86
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/framework/wzapp.cpp
View File

@ -1303,7 +1303,7 @@ void WzConfig::setVector3f(const QString &name, const Vector3f &v)
Vector3f WzConfig::vector3f(const QString &name)
{
Vector3f r;
Vector3f r(0.0, 0.0, 0.0);
ASSERT_OR_RETURN(r, contains(name), "Missing %s", name.toUtf8().constData());
QStringList v = value(name).toStringList();
ASSERT(v.size() == 3, "Bad list of %s", name.toUtf8().constData());
@ -1324,7 +1324,7 @@ void WzConfig::setVector3i(const QString &name, const Vector3i &v)
Vector3i WzConfig::vector3i(const QString &name)
{
Vector3i r;
Vector3i r(0, 0, 0);
ASSERT_OR_RETURN(r, contains(name), "Missing %s", name.toUtf8().constData());
QStringList v = value(name).toStringList();
ASSERT(v.size() == 3, "Bad list of %s", name.toUtf8().constData());
@ -1344,7 +1344,7 @@ void WzConfig::setVector2i(const QString &name, const Vector2i &v)
Vector2i WzConfig::vector2i(const QString &name)
{
Vector2i r;
Vector2i r(0, 0);
ASSERT_OR_RETURN(r, contains(name), "Missing %s", name.toUtf8().constData());
QStringList v = value(name).toStringList();
ASSERT(v.size() == 2, "Bad list of %s", name.toUtf8().constData());

3
src/terrain.cpp
View File

@ -29,9 +29,6 @@
* The water is drawn using the hardcoded page-80 and page-81 textures.
*/
#ifdef CursorShape
#undef CursorShape // Random #defines are bad.
#endif
#include <string.h>
#include "lib/framework/frame.h"

3
src/texture.cpp
View File

@ -23,9 +23,6 @@
* This is where we do texture atlas generation.
*/
#ifdef CursorShape
#undef CursorShape // Random #defines are bad.
#endif
#include "lib/framework/frame.h"
#include "lib/framework/opengl.h"