summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-11 03:35:44 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-11 03:35:44 +0300
commit0b373909f1ad987e38b9c07f799f48c3c0b0c3fd (patch)
treea3170b0f5138da46f730f76725259e39cab32ff6 /src
parent4d236566cc8132fdbcb901668c3291f7cf3279af (diff)
downloadmv-0b373909f1ad987e38b9c07f799f48c3c0b0c3fd.tar.gz
mv-0b373909f1ad987e38b9c07f799f48c3c0b0c3fd.tar.bz2
mv-0b373909f1ad987e38b9c07f799f48c3c0b0c3fd.tar.xz
mv-0b373909f1ad987e38b9c07f799f48c3c0b0c3fd.zip
Fix compilation issues.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/scrollarea.cpp2
-rw-r--r--src/net/eathena/network.cpp4
-rw-r--r--src/net/tmwa/network.cpp4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e865839ab..b7073372c 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -956,6 +956,8 @@ gcn::Rectangle ScrollArea::getHorizontalMarkerDimension()
const int w3 = content->getWidth();
if (w3)
length = (width * getChildrenArea().width) / w3;
+ else
+ length = width;
}
else
{
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 419459e35..b16d36158 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -108,9 +108,9 @@ short packet_lengths[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-static constexpr const int packet_lengths_size
+static const int packet_lengths_size
= static_cast<int>(sizeof(packet_lengths) / sizeof (short));
-static constexpr const int messagesSize = 0xffff;
+static const int messagesSize = 0xffff;
Network *Network::mInstance = nullptr;
Network::Network() :
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 52cd5cf62..40106ebfa 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -86,9 +86,9 @@ short packet_lengths[] =
-1, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-static constexpr const int packet_lengths_size
+static const int packet_lengths_size
= static_cast<int>(sizeof(packet_lengths) / sizeof (short));
-static constexpr const int messagesSize = 0xffff;
+static const int messagesSize = 0xffff;
Network *Network::mInstance = nullptr;
Network::Network() :