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.
yay i'm free to break things again!
authorkoda
Fri, 12 Nov 2010 15:20:54 +0100
changeset 4248 e127b3d26248
parent 4246 e5cb885492df
child 4250 d83b53997e0b
yay i'm free to break things again!
QTfrontend/gamecfgwidget.cpp file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uMisc.pas file | annotate | diff | comparison | revisions
hedgewars/uWorld.pas file | annotate | diff | comparison | revisions 
--- a/QTfrontend/gamecfgwidget.cpp	Fri Nov 12 14:54:53 2010 +0100
+++ b/QTfrontend/gamecfgwidget.cpp	Fri Nov 12 15:20:54 2010 +0100
@@ -165,7 +165,7 @@
     sl.append(QString("e$gmflags %1").arg(getGameFlags()));
     sl.append(QString("e$damagepct %1").arg(schemeData(22).toInt()));
     sl.append(QString("e$turntime %1").arg(schemeData(23).toInt() * 1000));
-    sl.append(QString("e$minestime %1").arg(schemeData(27).toInt() * 1000));
+    sl.append(QString("e$minestime %1").arg(schemeData(27).toInt()));
     sl.append(QString("e$minesnum %1").arg(schemeData(28).toInt()));
     sl.append(QString("e$sd_turns %1").arg(schemeData(25).toInt()));
     sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
--- a/hedgewars/uGears.pas	Fri Nov 12 14:54:53 2010 +0100
+++ b/hedgewars/uGears.pas	Fri Nov 12 15:20:54 2010 +0100
@@ -365,9 +365,9 @@
                 gear^.Elasticity:= _0_55;
                 gear^.Friction:= _0_995;
                 if cMinesTime < 0 then
-                    gear^.Timer:= getrandom(6)*1000
+                    gear^.Timer:= getrandom(51)*100
                 else
-                    gear^.Timer:= cMinesTime*1;
+                    gear^.Timer:= cMinesTime*1000;
                 end;
        gtSMine: begin
                 gear^.Health:= 10;
--- a/hedgewars/uMisc.pas	Fri Nov 12 14:54:53 2010 +0100
+++ b/hedgewars/uMisc.pas	Fri Nov 12 15:20:54 2010 +0100
@@ -758,7 +758,7 @@
     cMapGen             := 0;   // MAPGEN_REGULAR
     cMazeSize           := 0;
     cHedgehogTurnTime   := 45000;
-    cMinesTime          := 3000;
+    cMinesTime          := 3;
     cMaxAIThinkTime     := 9000;
     cCloudsNumber       := 9;
     cHealthCaseProb     := 35;
--- a/hedgewars/uWorld.pas	Fri Nov 12 14:54:53 2010 +0100
+++ b/hedgewars/uWorld.pas	Fri Nov 12 15:20:54 2010 +0100
@@ -149,14 +149,14 @@
 ScreenFadeSpeed:= 1;
 
 // modified mine timers?
-if cMinesTime <> 3000 then
+if cMinesTime <> 3 then
     begin
     if cMinesTime = 0 then
         g:= AddGoal(g, gfAny, gidNoMineTimer)
     else if cMinesTime < 0 then
         g:= AddGoal(g, gfAny, gidRandomMineTimer)
     else
-        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
+        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime);
     end;
 
 // if the string has been set, show it for (default timeframe) seconds
hedgewars