# HG changeset patch
# User Henek
# Date 1313014690 -7200
# Node ID 5e597b72531654cc4a3d29c8f4134675a7a95c9c
# Parent ec3685a583a5190c743ff79f6afc431bb1f0e3bb
disable campaign button, structure and change sudden death music to hell.ogg
diff -r ec3685a583a5 -r 5e597b725316 QTfrontend/hwconsts.h
--- a/QTfrontend/hwconsts.h Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/hwconsts.h Thu Aug 11 00:18:10 2011 +0200
@@ -58,41 +58,40 @@
extern bool isDevBuild;
#endif
-#define AMMOLINE_DEFAULT_QT "939192942219912103223511100120100000021111010101111991"
-#define AMMOLINE_DEFAULT_PROB "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_DEFAULT_QT "939192942219912103223511100120100000021111010101111101"
+#define AMMOLINE_DEFAULT_PROB "040504054160065554655446477657666666615551010111541101"
#define AMMOLINE_DEFAULT_DELAY "000000000000020550000004000700400000000022000000060000"
-#define AMMOLINE_DEFAULT_CRATE "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_DEFAULT_CRATE "131111031211111112311411111111111111121111110111111101"
-//TODO: Remove Piano's unlimited uses!
-#define AMMOLINE_CRAZY_QT "999999999999999999299999999999999929999999990999999229"
-#define AMMOLINE_CRAZY_PROB "111111011111111111111111111111111111111111110111111111"
+#define AMMOLINE_CRAZY_QT "999999999999999999299999999999999929999999990999999209"
+#define AMMOLINE_CRAZY_PROB "111111011111111111111111111111111111111111110111111101"
#define AMMOLINE_CRAZY_DELAY "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CRAZY_CRATE "131111031211111112311411111111111111121111010111111111"
+#define AMMOLINE_CRAZY_CRATE "131111031211111112311411111111111111121111010111111101"
#define AMMOLINE_PROMODE_QT "909000900000000000000900000000000000000000000000000000"
#define AMMOLINE_PROMODE_PROB "000000000000000000000000000000000000000000000000000000"
#define AMMOLINE_PROMODE_DELAY "000000000000020550000004000700400000000020000000000000"
-#define AMMOLINE_PROMODE_CRATE "111111111111111111111111111111111111111110010111111111"
+#define AMMOLINE_PROMODE_CRATE "111111111111111111111111111111111111111110010111111101"
#define AMMOLINE_SHOPPA_QT "000000990000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_PROB "444441004424440221011212122242200000000200040001001111"
+#define AMMOLINE_SHOPPA_PROB "444441004424440221011212122242200000000200040001001101"
#define AMMOLINE_SHOPPA_DELAY "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_CRATE "111111111111111111111111111111111111111110110111111111"
+#define AMMOLINE_SHOPPA_CRATE "111111111111111111111111111111111111111110110111111101"
#define AMMOLINE_CLEAN_QT "101000900001000001100000000000000000000000000000100000"
-#define AMMOLINE_CLEAN_PROB "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_CLEAN_PROB "040504054160065554655446477657666666615551010111541101"
#define AMMOLINE_CLEAN_DELAY "000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CLEAN_CRATE "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_CLEAN_CRATE "131111031211111112311411111111111111121111110111111101"
#define AMMOLINE_MINES_QT "000000990009000000030000000000000000000000000000000000"
#define AMMOLINE_MINES_PROB "000000000000000000000000000000000000000000000000000000"
#define AMMOLINE_MINES_DELAY "000000000000020550000004000700400000000020000000060000"
-#define AMMOLINE_MINES_CRATE "111111111111111111111111111111111111111111110111111111"
+#define AMMOLINE_MINES_CRATE "111111111111111111111111111111111111111111110111111101"
#define AMMOLINE_PORTALS_QT "900000900200000000210000000000000011000009000000000000"
-#define AMMOLINE_PORTALS_PROB "040504054160065554655446477657666666615551010111541111"
+#define AMMOLINE_PORTALS_PROB "040504054160065554655446477657666666615551010111541101"
#define AMMOLINE_PORTALS_DELAY "000000000000020550000004000700400000000020000000060000"
-#define AMMOLINE_PORTALS_CRATE "131111031211111112311411111111111111121111110111111111"
+#define AMMOLINE_PORTALS_CRATE "131111031211111112311411111111111111121111110111111101"
#define NETGAME_DEFAULT_PORT 46631
diff -r ec3685a583a5 -r 5e597b725316 QTfrontend/pagesingleplayer.cpp
--- a/QTfrontend/pagesingleplayer.cpp Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/pagesingleplayer.cpp Thu Aug 11 00:18:10 2011 +0200
@@ -46,7 +46,7 @@
BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
- //BtnCampaignPage->setVisible(false);
+ BtnCampaignPage->setVisible(false);
BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
diff -r ec3685a583a5 -r 5e597b725316 QTfrontend/selectWeapon.cpp
--- a/QTfrontend/selectWeapon.cpp Wed Aug 10 17:22:17 2011 -0400
+++ b/QTfrontend/selectWeapon.cpp Thu Aug 11 00:18:10 2011 +0200
@@ -129,6 +129,7 @@
int i = 0, k = 0;
for(; i < m_numItems; ++i) {
if (i == 6) continue;
+ if (i == 52) continue; // Disable structures for now
if (k % 4 == 0) ++j;
SelWeaponItem * swi = new SelWeaponItem(true, i, currentState[i].digitValue(), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this);
weaponItems[i].append(swi);
diff -r ec3685a583a5 -r 5e597b725316 hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas Wed Aug 10 17:22:17 2011 -0400
+++ b/hedgewars/uVariables.pas Thu Aug 11 00:18:10 2011 +0200
@@ -2409,7 +2409,7 @@
SDWaterColorArray[1]:= SDWaterColorArray[0];
SDWaterColorArray[3]:= SDWaterColorArray[2];
- SDMusic:= 'main_theme.ogg';
+ SDMusic:= 'hell.ogg';
SDTint:= $80;
cDrownSpeed.QWordValue := 257698038; // 0.06
diff -r ec3685a583a5 -r 5e597b725316 misc/theme_editor.html
--- a/misc/theme_editor.html Wed Aug 10 17:22:17 2011 -0400
+++ b/misc/theme_editor.html Thu Aug 11 00:18:10 2011 +0200
@@ -125,7 +125,7 @@
Hedgewars Theme editor
-
+