From fca6de3288adc230f0e42f82973697615932bbe8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 19 Sep 2013 00:30:23 +0300
Subject: add some more consts.

---
 src/being/localplayer.cpp   | 2 +-
 src/net/ea/network.cpp      | 2 +-
 src/resources/spritedef.cpp | 3 ++-
 src/resources/spritedef.h   | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

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;
 
         /**
-- 
cgit v1.2.3-60-g2f50