# HG changeset patch # User nemo # Date 1242608061 0 # Node ID aa3263e57b8fa5dcf198bab15a11822d3526789d # Parent 53399947c944af5e7da3bc75058c4fe792fb1885 increase # of mines to 50, limit max depth of drowning damage tag diff -r 53399947c944 -r aa3263e57b8f QTfrontend/pages.cpp --- 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); diff -r 53399947c944 -r aa3263e57b8f hedgewars/uGears.pas --- 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;