Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2 minor bugfixes. fix shoppa hack, strip translation from 2 scheme/weapon filters - breaks otherwise.
authornemo
Fri, 05 Nov 2010 19:07:17 -0400
changeset 4141 2bd5ecf7b4fb
parent 4140 1563b216f243
child 4142 980ec01b98e1
2 minor bugfixes. fix shoppa hack, strip translation from 2 scheme/weapon filters - breaks otherwise. They aren't dynamic yet.
QTfrontend/pages.cpp file | annotate | diff | comparison | revisions
hedgewars/uAmmos.pas file | annotate | diff | comparison | revisions 
--- a/QTfrontend/pages.cpp	Fri Nov 05 18:56:12 2010 -0400
+++ b/QTfrontend/pages.cpp	Fri Nov 05 19:07:17 2010 -0400
@@ -1119,13 +1119,13 @@
     ruleLabel->setText(tr("Rules:"));
     CBRules = new QComboBox(this);
     CBRules->addItem(QComboBox::tr("Any"));
-    CBRules->addItem(QComboBox::tr("Default"));
-    CBRules->addItem(QComboBox::tr("Pro mode"));
-    CBRules->addItem(QComboBox::tr("Shoppa"));
-    CBRules->addItem(QComboBox::tr("Basketball"));
-    CBRules->addItem(QComboBox::tr("Minefield"));
-    CBRules->addItem(QComboBox::tr("Barrel mayhem"));
-    CBRules->addItem(QComboBox::tr("Tunnel hogs"));
+    CBRules->addItem("Default");
+    CBRules->addItem("Pro mode");
+    CBRules->addItem("Shoppa");
+    CBRules->addItem("Clean Slate");
+    CBRules->addItem("Minefield");
+    CBRules->addItem("Barrel mayhem");
+    CBRules->addItem("Tunnel hogs");
     filterLayout->addWidget(ruleLabel);
     filterLayout->addWidget(CBRules);
     filterLayout->addSpacing(30);
@@ -1134,12 +1134,12 @@
     weaponLabel->setText(tr("Weapons:"));
     CBWeapons = new QComboBox(this);
     CBWeapons->addItem(QComboBox::tr("Any"));
-    CBWeapons->addItem(QComboBox::tr("Basketball"));
-    CBWeapons->addItem(QComboBox::tr("Crazy"));
-    CBWeapons->addItem(QComboBox::tr("Default"));
-    CBWeapons->addItem(QComboBox::tr("Minefield"));
-    CBWeapons->addItem(QComboBox::tr("Pro mode"));
-    CBWeapons->addItem(QComboBox::tr("Shoppa"));
+    CBWeapons->addItem("Clean Slate");
+    CBWeapons->addItem("Crazy");
+    CBWeapons->addItem("Default");
+    CBWeapons->addItem("Minefield");
+    CBWeapons->addItem("Pro mode");
+    CBWeapons->addItem("Shoppa");
     filterLayout->addWidget(weaponLabel);
     filterLayout->addWidget(CBWeapons);
     filterLayout->addSpacing(30);
--- a/hedgewars/uAmmos.pas	Fri Nov 05 18:56:12 2010 -0400
+++ b/hedgewars/uAmmos.pas	Fri Nov 05 19:07:17 2010 -0400
@@ -98,7 +98,7 @@
 TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true);
 
 // FIXME - TEMPORARY hardcoded check on shoppa pending creation of crate *type* probability editor
-substr:= Copy(ammoLoadout,1,39);
+substr:= Copy(ammoLoadout,1,42);
 if (substr = '000000990000009000000000000000000000000000') or  // ropes + parachute
    (substr = '000000900000000000000000000000000000009000') or  // saucer
    (substr = '000000900000000000000000000000000000000009') or  // portal
hedgewars