summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-18 23:08:12 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-18 23:08:12 +0300
commit55d43e6dfd890df0ce7b26f6c9cb5692e2c136b1 (patch)
treea105b3cc7277170e3d51b70d362540bae4483d5f /src/resources
parentf1558113c591ccdca3596b900c4cbcfc56644860 (diff)
downloadmv-55d43e6dfd890df0ce7b26f6c9cb5692e2c136b1.tar.gz
mv-55d43e6dfd890df0ce7b26f6c9cb5692e2c136b1.tar.bz2
mv-55d43e6dfd890df0ce7b26f6c9cb5692e2c136b1.tar.xz
mv-55d43e6dfd890df0ce7b26f6c9cb5692e2c136b1.zip
Fix some style issues.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.cpp10
-rw-r--r--src/resources/openglimagehelper.cpp14
-rw-r--r--src/resources/safeopenglimagehelper.cpp14
3 files changed, 22 insertions, 16 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index d86360059..2b6dd070b 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -975,12 +975,14 @@ Path Map::findPath(const int startX, const int startY,
++Gcost;
}
+/*
// It costs extra to walk through a being (needs to be enough
// to make it more attractive to walk around).
-// if (occupied(x, y))
-// {
-// Gcost += 3 * basicCost;
-// }
+ if (occupied(x, y))
+ {
+ Gcost += 3 * basicCost;
+ }
+*/
// Skip if Gcost becomes too much
// Warning: probably not entirely accurate
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index c67ec8a1c..ef0ef063e 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -363,12 +363,14 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage,
0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels);
#ifdef DEBUG_OPENGL
-// disabled for now, because debugger can't show it
-// if (isGLNotNull(mglLabelObject))
-// {
-// const char *const text = "image text";
-// mglLabelObject(GL_TEXTURE, texture, strlen(text), text);
-// }
+/*
+ disabled for now, because debugger can't show it
+ if (isGLNotNull(mglLabelObject))
+ {
+ const char *const text = "image text";
+ mglLabelObject(GL_TEXTURE, texture, strlen(text), text);
+ }
+*/
#endif
/*
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 8376ae0c8..f43351d7c 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -360,12 +360,14 @@ Image *SafeOpenGLImageHelper::glLoad(SDL_Surface *tmpImage,
0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels);
#ifdef DEBUG_OPENGL
-// disabled for now, because debugger can't show it
-// if (isGLNotNull(mglLabelObject))
-// {
-// const char *const text = "image text";
-// mglLabelObject(GL_TEXTURE, texture, strlen(text), text);
-// }
+/*
+ disabled for now, because debugger can't show it
+ if (isGLNotNull(mglLabelObject))
+ {
+ const char *const text = "image text";
+ mglLabelObject(GL_TEXTURE, texture, strlen(text), text);
+ }
+*/
#endif
/*