[hedgewars] 01/03: Imported Upstream version 0.9.20.5

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/0.9.20.5-1
in repository hedgewars.

commit c465069b47b8672442810f11cb289b6d0209f067
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jan 9 09:39:08 2014 +0100

    Imported Upstream version 0.9.20.5
---
 QTfrontend/drawmapscene.cpp |  2 +-
 QTfrontend/servermessages.h | 32 --------------------------------
 share/version_info.txt      |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/QTfrontend/drawmapscene.cpp b/QTfrontend/drawmapscene.cpp
index eec4e88..63b80d7 100644
--- a/QTfrontend/drawmapscene.cpp
+++ b/QTfrontend/drawmapscene.cpp
@@ -459,7 +459,7 @@ QList<QPointF> DrawMapScene::makeEllipse(const QPointF &center, const QPointF &c
         l.append(center);
     } else
     {
-        qreal angleDelta = qMax(0.1, qMin(0.7, 120 / r));
+        qreal angleDelta = qMax(static_cast<qreal> (0.1), qMin(static_cast<qreal> (0.7), 120 / r));
         for(qreal angle = 0.0; angle < 2*M_PI; angle += angleDelta)
             l.append(center + QPointF(rx * cos(angle), ry * sin(angle)));
         l.append(l.first());
diff --git a/QTfrontend/servermessages.h b/QTfrontend/servermessages.h
deleted file mode 100644
index e57b1ff..0000000
--- a/QTfrontend/servermessages.h
+++ /dev/null
@@ -1,32 +0,0 @@
-const char * serverMessages[] = {
-QT_TRANSLATE_NOOP("server", "Restricted"),
-QT_TRANSLATE_NOOP("server", "Not room master"),
-QT_TRANSLATE_NOOP("server", "Corrupted hedgehogs info"),
-QT_TRANSLATE_NOOP("server", "too many teams"),
-QT_TRANSLATE_NOOP("server", "too many hedgehogs"),
-QT_TRANSLATE_NOOP("server", "There's already a team with same name in the list"),
-QT_TRANSLATE_NOOP("server", "round in progress"),
-QT_TRANSLATE_NOOP("server", "restricted"),
-QT_TRANSLATE_NOOP("server", "REMOVE_TEAM: no such team"),
-QT_TRANSLATE_NOOP("server", "Not team owner!"),
-QT_TRANSLATE_NOOP("server", "Less than two clans!"),
-QT_TRANSLATE_NOOP("server", "Illegal room name"),
-QT_TRANSLATE_NOOP("server", "Room with such name already exists"),
-QT_TRANSLATE_NOOP("server", "Nickname already chosen"),
-QT_TRANSLATE_NOOP("server", "Illegal nickname"),
-QT_TRANSLATE_NOOP("server", "Protocol already known"),
-QT_TRANSLATE_NOOP("server", "Bad number"),
-QT_TRANSLATE_NOOP("server", "Nickname is already in use"),
-QT_TRANSLATE_NOOP("server", "No checker rights"),
-QT_TRANSLATE_NOOP("server", "Authentication failed"),
-QT_TRANSLATE_NOOP("server", "60 seconds cooldown after kick"),
-QT_TRANSLATE_NOOP("server", "kicked"),
-QT_TRANSLATE_NOOP("server", "Ping timeout"),
-QT_TRANSLATE_NOOP("server", "bye"),
-QT_TRANSLATE_NOOP("server", "No such room"),
-QT_TRANSLATE_NOOP("server", "Room version incompatible to your hedgewars version"),
-QT_TRANSLATE_NOOP("server", "Joining restricted"),
-QT_TRANSLATE_NOOP("server", "Registered users only"),
-QT_TRANSLATE_NOOP("server", "You are banned in this room"),
-QT_TRANSLATE_NOOP("server", "Empty config entry")
-};
diff --git a/share/version_info.txt b/share/version_info.txt
index 2ef1589..63faa3b 100644
--- a/share/version_info.txt
+++ b/share/version_info.txt
@@ -1,3 +1,3 @@
 Hedgewars versioning information, do not modify
-rev 9915
+rev 9903
 hash 9d79a52c5586

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git