# HG changeset patch
# User unc0rr
# Date 1231500166 0
# Node ID d1ded2532d3fc46a7fa5c052319774fb4538a9c6
# Parent  5f4cd6708eb5d0f239c7d562a89f1ed38cf69485
 - svn maintenance
 - add forgotten chinese engine tranlation
 - start refactoring stats page

diff -r 5f4cd6708eb5 -r d1ded2532d3f CMakeLists.txt
--- a/CMakeLists.txt	Thu Jan 08 22:40:56 2009 +0000
+++ b/CMakeLists.txt	Fri Jan 09 11:22:46 2009 +0000
@@ -19,7 +19,7 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 22)
+set(HEDGEWARS_PROTO_VER 21)
 
 if(WITH_SERVER)
 	set(HAVE_NETSERVER true)
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/CMakeLists.txt	Fri Jan 09 11:22:46 2009 +0000
@@ -76,7 +76,9 @@
 	itemNum.cpp
 	input_ip.cpp
 	igbox.cpp
-	weaponItem.cpp)
+	weaponItem.cpp
+	statsPage.cpp
+	)
 
 if(MINGW)
 	# resource compilation for mingw
@@ -121,7 +123,9 @@
 	itemNum.h
 	input_ip.h
 	igbox.h
-	weaponItem.h)
+	weaponItem.h
+	statsPage.h
+	)
 
 set(hwfr_hdrs
 	binds.h
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/hedgewars.pro
--- a/QTfrontend/hedgewars.pro	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/hedgewars.pro	Fri Jan 09 11:22:46 2009 +0000
@@ -78,7 +78,7 @@
            hwconsts.cpp \
            selectWeapon.cpp \
            itemNum.cpp \
-	   input_ip.cpp
+           input_ip.cpp
 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/hwform.cpp	Fri Jan 09 11:22:46 2009 +0000
@@ -40,6 +40,7 @@
 #include "selectWeapon.h"
 #include "gameuiconfig.h"
 #include "pages.h"
+#include "statsPage.h"
 #include "hwconsts.h"
 #include "newnetclient.h"
 #include "gamecfgwidget.h"
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/pages.cpp	Fri Jan 09 11:22:46 2009 +0000
@@ -579,21 +579,6 @@
 	pageLayout->addWidget(about, 0, 0, 1, 3);
 }
 
-PageGameStats::PageGameStats(QWidget* parent) : AbstractPage(parent)
-{
-	QFont * font14 = new QFont("MS Shell Dlg", 14);
-	QGridLayout * pageLayout = new QGridLayout(this);
-	pageLayout->setColumnStretch(0, 1);
-	pageLayout->setColumnStretch(1, 1);
-	pageLayout->setColumnStretch(2, 1);
-
-	BtnBack = addButton(":/res/Exit.png", pageLayout, 1, 0, true);
-
-	labelGameStats = new QLabel(this);
-	labelGameStats->setTextFormat(Qt::RichText);
-	pageLayout->addWidget(labelGameStats, 0, 0, 1, 3);
-}
-
 PageSinglePlayer::PageSinglePlayer(QWidget* parent) : AbstractPage(parent)
 {
 	QFont * font14 = new QFont("MS Shell Dlg", 14);
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/pages.h
--- a/QTfrontend/pages.h	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/pages.h	Fri Jan 09 11:22:46 2009 +0000
@@ -292,17 +292,6 @@
 	About *about;
 };
 
-class PageGameStats : public AbstractPage
-{
-	Q_OBJECT
-
-public:
-	PageGameStats(QWidget* parent = 0);
-
-	QPushButton *BtnBack;
-	QLabel *labelGameStats;
-};
-
 class PageSinglePlayer : public AbstractPage
 {
 	Q_OBJECT
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/statsPage.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/statsPage.cpp	Fri Jan 09 11:22:46 2009 +0000
@@ -0,0 +1,37 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QLabel>
+#include <QGridLayout>
+
+#include "statsPage.h"
+
+PageGameStats::PageGameStats(QWidget* parent) : AbstractPage(parent)
+{
+	QFont * font14 = new QFont("MS Shell Dlg", 14);
+	QGridLayout * pageLayout = new QGridLayout(this);
+	pageLayout->setColumnStretch(0, 1);
+	pageLayout->setColumnStretch(1, 1);
+	pageLayout->setColumnStretch(2, 1);
+
+	BtnBack = addButton(":/res/Exit.png", pageLayout, 1, 0, true);
+
+	labelGameStats = new QLabel(this);
+	labelGameStats->setTextFormat(Qt::RichText);
+	pageLayout->addWidget(labelGameStats, 0, 0, 1, 3);
+}
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/statsPage.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/statsPage.h	Fri Jan 09 11:22:46 2009 +0000
@@ -0,0 +1,35 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2009 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef STATSPAGE_H
+#define STATSPAGE_H
+
+#include "pages.h"
+
+class PageGameStats : public AbstractPage
+{
+	Q_OBJECT
+
+public:
+	PageGameStats(QWidget* parent = 0);
+
+	QPushButton *BtnBack;
+	QLabel *labelGameStats;
+};
+
+#endif // STATSPAGE_H
diff -r 5f4cd6708eb5 -r d1ded2532d3f QTfrontend/ui_hwform.cpp
--- a/QTfrontend/ui_hwform.cpp	Thu Jan 08 22:40:56 2009 +0000
+++ b/QTfrontend/ui_hwform.cpp	Fri Jan 09 11:22:46 2009 +0000
@@ -23,6 +23,7 @@
 
 #include "ui_hwform.h"
 #include "pages.h"
+#include "statsPage.h"
 #include "playrecordpage.h"
 #include "hwconsts.h"
 
diff -r 5f4cd6708eb5 -r d1ded2532d3f netserver/HWProto.hs
--- a/netserver/HWProto.hs	Thu Jan 08 22:40:56 2009 +0000
+++ b/netserver/HWProto.hs	Fri Jan 09 11:22:46 2009 +0000
@@ -397,7 +397,7 @@
 
 handleCmd_inRoom client clients rooms ["ROUNDFINISHED"] =
 	if isMaster client then
-		(modifyRoomClients clRoom (\cl -> cl{isReady = False}), modifyRoom clRoom{gameinprogress = False, readyPlayers = 0, roundMsgs =[]}, answerAllNotReady)
+		(modifyRoomClients clRoom (\cl -> cl{isReady = False}), modifyRoom clRoom{gameinprogress = False, readyPlayers = 0, roundMsgs = []}, answerAllNotReady)
 	else
 		(noChangeClients, noChangeRooms, [])
 	where
diff -r 5f4cd6708eb5 -r d1ded2532d3f share/hedgewars/Data/Locale/zh.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Locale/zh.txt	Fri Jan 09 11:22:46 2009 +0000
@@ -0,0 +1,39 @@
+00:00=手榴彈
+00:01=子母炸彈
+00:02=火箭筒
+00:03=飛碟
+00:04=射擊槍
+00:05=棒槌
+00:06=略過
+00:07=繩子
+00:08=地雷
+00:09=沙漠之鷹
+00:09=炸藥
+00:11=棒球棍
+00:12=火焰拳
+00:13=秒
+00:14=降落傘
+00:15=空襲
+00:16=地雷攻擊
+00:17=噴燈
+00:18=建造物
+00:19=瞬間移動
+00:20=刺蝟轉換
+00:21=迫擊炮
+00:22=鞭子 
+00:23=神風特攻隊
+00:24=蛋糕
+00:25=誘惑
+00:26=西瓜炸彈
+00:27=地獄手榴彈
+00:28=Drill Rocket
+00:29=Ballgun
+00:30=Napalm
+
+01:00=戰鬥開始!
+01:01=平手
+01:02=%1 勝利!
+01:03=音量 %1%
+01:04=暫停
+01:05=真的要離開嗎 (Y/Esc)?
+01:06=意外死亡!
diff -r 5f4cd6708eb5 -r d1ded2532d3f share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Fri Jan 09 11:22:46 2009 +0000
@@ -0,0 +1,5 @@
+file(GLOB SingerSounds *.ogg)
+
+install(FILES
+	${SingerSounds}
+	DESTINATION ${SHAREPATH}Data/Sounds/voices/Singer)
diff -r 5f4cd6708eb5 -r d1ded2532d3f share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Fri Jan 09 11:22:46 2009 +0000
@@ -0,0 +1,5 @@
+file(GLOB SurferSounds *.ogg)
+
+install(FILES
+	${BaseSounds}
+	DESTINATION ${SHAREPATH}Data/Sounds/voices/Surfer)