summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-18 00:23:51 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-18 00:23:51 +0300
commit6fbcdfbbb6a8ad2ba73bde2a5043b523df8ff244 (patch)
treef89b797be3797bddea62096d1993e0c3b273a58d
parentc0d0f64cc4d9df7dc0430cf33eff118fc951ee35 (diff)
downloadmanaplus-6fbcdfbbb6a8ad2ba73bde2a5043b523df8ff244.tar.gz
manaplus-6fbcdfbbb6a8ad2ba73bde2a5043b523df8ff244.tar.bz2
manaplus-6fbcdfbbb6a8ad2ba73bde2a5043b523df8ff244.tar.xz
manaplus-6fbcdfbbb6a8ad2ba73bde2a5043b523df8ff244.zip
Fix code style.
-rw-r--r--src/being.h2
-rw-r--r--src/graphicsvertexes.h6
-rw-r--r--src/localplayer.h2
-rw-r--r--src/map.cpp2
-rw-r--r--src/utils/gettext.h2
5 files changed, 8 insertions, 6 deletions
diff --git a/src/being.h b/src/being.h
index a496121e8..092e324e4 100644
--- a/src/being.h
+++ b/src/being.h
@@ -750,7 +750,7 @@ class Being : public ActorSprite, public ConfigListener
{ return mAdvanced; }
void setAdvanced(bool n)
- { mAdvanced = n; addToCache();}
+ { mAdvanced = n; addToCache(); }
bool isShopEnabled()
{ return mShop; }
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index ac5168b4f..5b39dfb08 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -122,10 +122,12 @@ class ImageVertexes
{
public:
ImageVertexes() :
- image(0),
- ogl(new OpenGLGraphicsVertexes())
+ image(0)
{
sdl.reserve(30);
+#ifdef USE_OPENGL
+ ogl = new OpenGLGraphicsVertexes();
+#endif
}
~ImageVertexes();
diff --git a/src/localplayer.h b/src/localplayer.h
index 81232e4b6..df2a61b03 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -332,7 +332,7 @@ class LocalPlayer : public Being, public ActorSpriteListener,
void setAway(const std::string &message);
void setHalfAway(bool n)
- { mInactive = n;}
+ { mInactive = n; }
void afkRespond(ChatTab *tab, const std::string &nick);
diff --git a/src/map.cpp b/src/map.cpp
index 838a2c68f..3c800018a 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -825,7 +825,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
updateFlag = 2;
}
else if (mRedrawMap || startX != mDrawX || startY != mDrawY ||
- scrollX != mDrawScrollX || scrollY != mDrawScrollY)
+ scrollX != mDrawScrollX || scrollY != mDrawScrollY)
{ // player mode to new position
mRedrawMap = false;
mDrawX = startX;
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 67d74aa19..696f0d4bf 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -39,7 +39,7 @@
#define gettext(s) (const_cast <char*>(s))
#define _(s) (const_cast <char*>(s))
#define N_(s) (const_cast <char*>(s))
-#define ngettext(s1,s2,i1) (const_cast <char*>(s1))
+#define ngettext(s1, s2, i1) (const_cast <char*>(s1))
#endif