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.
increase # of mines to 50, limit max depth of drowning damage tag
authornemo
Mon, 18 May 2009 00:54:21 +0000
changeset 2076 aa3263e57b8f
parent 2075 53399947c944
child 2077 7320931f12a0
increase # of mines to 50, limit max depth of drowning damage tag
QTfrontend/pages.cpp file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/QTfrontend/pages.cpp	Sun May 17 22:48:06 2009 +0000
+++ b/QTfrontend/pages.cpp	Mon May 18 00:54:21 2009 +0000
@@ -1045,7 +1045,7 @@
 	l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon
 	glBSLayout->addWidget(l,6,1,1,1);
 	SB_Mines = new QSpinBox(gbBasicSettings);
-	SB_Mines->setRange(1, 25);
+	SB_Mines->setRange(1, 50);
 	SB_Mines->setValue(1);
 	SB_Mines->setSingleStep(5);
 	glBSLayout->addWidget(SB_Mines,6,2,1,1);
--- a/hedgewars/uGears.pas	Sun May 17 22:48:06 2009 +0000
+++ b/hedgewars/uGears.pas	Mon May 18 00:54:21 2009 +0000
@@ -412,11 +412,11 @@
 		end
 	else
 		begin
-		if not (hwRound(Gear^.Y) < cWaterLine) then
+		if (hwRound(Gear^.Y) >= cWaterLine) then
 			begin
 			t:= max(Gear^.Damage, Gear^.Health);
 			Gear^.Damage:= t;
-			AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtHealthTag, t, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
+			AddGear(hwRound(Gear^.X), min(hwRound(Gear^.Y),cWaterLine+cVisibleWater+32), gtHealthTag, t, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
 			uStats.HedgehogDamaged(Gear)
 			end;
hedgewars