# HG changeset patch
# User koda
# Date 1288112691 -7200
# Node ID 411e71912f4cb7cb967398cf854ed11b4c2af198
# Parent  eb549fd864a5640a328b45a442e87f48622ccd14
restore king mode

diff -r eb549fd864a5 -r 411e71912f4c QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp	Mon Oct 25 22:19:00 2010 +0200
+++ b/QTfrontend/pages.cpp	Tue Oct 26 19:04:51 2010 +0200
@@ -1529,35 +1529,35 @@
 
     TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog.png");
     TBW_placehog->setToolTip("<b>" + ToggleButtonWidget::tr("Place Hedgehogs") + "</b>:<br />" + tr("Take turns placing your hedgehogs before the start of play."));
-    glGMLayout->addWidget(TBW_placehog,2,2,1,1);
+    glGMLayout->addWidget(TBW_placehog,2,3,1,1);
 
     TBW_sharedammo = new ToggleButtonWidget(gbGameModes, ":/res/btnSharedAmmo.png");
     TBW_sharedammo->setToolTip("<b>" + ToggleButtonWidget::tr("Clan Shares Ammo") + "</b>:<br />" + tr("Ammo is shared between all teams that share a colour."));
-    glGMLayout->addWidget(TBW_sharedammo,2,3,1,1);
+    glGMLayout->addWidget(TBW_sharedammo,2,4,1,1);
 
     TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders.png");
     TBW_disablegirders->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Girders") + "</b>:<br />" + tr("Disable girders when generating random maps."));
-    glGMLayout->addWidget(TBW_disablegirders,2,4,1,1);
+    glGMLayout->addWidget(TBW_disablegirders,3,0,1,1);
 
     TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects.png");
     TBW_disablelandobjects->setToolTip("<b>" + ToggleButtonWidget::tr("Disable Land Objects") + "</b>:<br />" + tr("Disable land objects when generating random maps."));
-    glGMLayout->addWidget(TBW_disablelandobjects,3,0,1,1);
+    glGMLayout->addWidget(TBW_disablelandobjects,3,1,1,1);
 
     TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival.png");
     TBW_aisurvival->setToolTip("<b>" + ToggleButtonWidget::tr("AI Survival Mode") + "</b>:<br />" + tr("AI respawns on death."));
-    glGMLayout->addWidget(TBW_aisurvival,3,1,1,1);
+    glGMLayout->addWidget(TBW_aisurvival,3,2,1,1);
 
     TBW_infattack = new ToggleButtonWidget(gbGameModes, ":/res/btnInfAttack.png");
     TBW_infattack->setToolTip("<b>" + ToggleButtonWidget::tr("Unlimited Attacks") + "</b>:<br />" + tr("Attacking does not end your turn."));
-    glGMLayout->addWidget(TBW_infattack,3,2,1,1);
+    glGMLayout->addWidget(TBW_infattack,3,3,1,1);
 
     TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps.png");
     TBW_resetweps->setToolTip("<b>" + ToggleButtonWidget::tr("Reset Weapons") + "</b>:<br />" + tr("Weapons are reset to starting values each turn."));
-    glGMLayout->addWidget(TBW_resetweps,3,3,1,1);
+    glGMLayout->addWidget(TBW_resetweps,3,4,1,1);
 
     TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo.png");
     TBW_perhogammo->setToolTip("<b>" + ToggleButtonWidget::tr("Per Hedgehog Ammo") + "</b>:<br />" + tr("Each hedgehog has its own ammo. It does not share with the team."));
-    glGMLayout->addWidget(TBW_perhogammo,3,4,1,1);
+    glGMLayout->addWidget(TBW_perhogammo,4,0,1,1);
 
     // Right
     QLabel * l;
diff -r eb549fd864a5 -r 411e71912f4c hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Mon Oct 25 22:19:00 2010 +0200
+++ b/hedgewars/uConsts.pas	Tue Oct 26 19:04:51 2010 +0200
@@ -333,24 +333,24 @@
 
     gfAny                = $FFFFFFFF;
     gfForts              = $00000001;
-    gfMultiWeapon        = $00000002;
+    gfMultiWeapon        = $00000002;           // used in trainings
     gfSolidLand          = $00000004;
     gfBorder             = $00000008;
     gfDivideTeams        = $00000010;
     gfLowGravity         = $00000020;
     gfLaserSight         = $00000040;
     gfInvulnerable       = $00000080;
-    gfMines              = $00000100;
+    gfMines              = $00000100;           // redundant? same effect as 'landadds 0'
     gfVampiric           = $00000200;
     gfKarma              = $00000400;
     gfArtillery          = $00000800;
-    gfOneClanMode        = $00001000;
+    gfOneClanMode        = $00001000;           // used for testing
     gfRandomOrder        = $00002000;
     gfKing               = $00004000;
     gfPlaceHog           = $00008000;
     gfSharedAmmo         = $00010000;
     gfDisableGirders     = $00020000;
-    gfExplosives         = $00040000;
+    //gfExplosives       = $00040000;           // unused flag, reuse it
     gfDisableLandObjects = $00080000;
     gfAISurvival         = $00100000;
     gfInfAttack          = $00200000;
diff -r eb549fd864a5 -r 411e71912f4c hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Mon Oct 25 22:19:00 2010 +0200
+++ b/hedgewars/uGears.pas	Tue Oct 26 19:04:51 2010 +0200
@@ -1208,7 +1208,6 @@
             FindPlace(Gear, false, 0, LAND_WIDTH);
             end;
 //  No game flag for this for now
-//  if ((GameFlags and gfExplosives) <> 0) then
         for i:= 0 to Pred(cExplosives) do
             begin
             Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0);
diff -r eb549fd864a5 -r 411e71912f4c hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Mon Oct 25 22:19:00 2010 +0200
+++ b/hedgewars/uScript.pas	Tue Oct 26 19:04:51 2010 +0200
@@ -1049,7 +1049,6 @@
 ScriptSetInteger('gfPlaceHog', gfPlaceHog);
 ScriptSetInteger('gfSharedAmmo', gfSharedAmmo);
 ScriptSetInteger('gfDisableGirders', gfDisableGirders);
-ScriptSetInteger('gfExplosives', gfExplosives);
 
 ScriptSetInteger('gmLeft', gmLeft);
 ScriptSetInteger('gmRight', gmRight);