summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-19 00:30:23 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-19 00:30:23 +0300
commitfca6de3288adc230f0e42f82973697615932bbe8 (patch)
tree904e80ee873a0301b96e92c36c67a9ed7d150742
parentad8126fa429f74034c45a1b7d2bdf929473c882c (diff)
downloadmv-fca6de3288adc230f0e42f82973697615932bbe8.tar.gz
mv-fca6de3288adc230f0e42f82973697615932bbe8.tar.bz2
mv-fca6de3288adc230f0e42f82973697615932bbe8.tar.xz
mv-fca6de3288adc230f0e42f82973697615932bbe8.zip
add some more consts.
-rw-r--r--src/being/localplayer.cpp2
-rw-r--r--src/net/ea/network.cpp2
-rw-r--r--src/resources/spritedef.cpp3
-rw-r--r--src/resources/spritedef.h3
4 files changed, 6 insertions, 4 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index f78dd7329..e6332300b 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -2254,7 +2254,7 @@ std::string LocalPlayer::getAwayModeString()
const unsigned cameraModeSize = 2;
-static const char *cameraModeStrings[] =
+static const char *const cameraModeStrings[] =
{
// TRANSLATORS: camera mode in status bar
N_("(G) game camera mode"),
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 01270bcbc..2ad8fbf03 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -87,7 +87,7 @@ bool Network::connect(ServerInfo server)
if (mState != IDLE && mState != NET_ERROR)
{
logger->log1("Tried to connect an already connected socket!");
- assert(false);
+// assert(false);
return false;
}
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 89450486d..2d5d25fb4 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -267,7 +267,8 @@ void SpriteDef::loadAction(const XmlNodePtr node, const int variant_offset)
}
void SpriteDef::loadAnimation(const XmlNodePtr animationNode,
- Action *const action, ImageSet *const imageSet,
+ Action *const action,
+ const ImageSet *const imageSet,
const int variant_offset) const
{
if (!action || !imageSet)
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 6ef64bbae..533042c02 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -202,7 +202,8 @@ class SpriteDef final : public Resource
* Loads an animation element.
*/
void loadAnimation(const XmlNodePtr animationNode,
- Action *const action, ImageSet *const imageSet,
+ Action *const action,
+ const ImageSet *const imageSet,
const int variant_offset) const;
/**