--- a/hedgewars/uConsts.pas Tue Oct 26 19:04:51 2010 +0200
+++ b/hedgewars/uConsts.pas Wed Oct 27 01:33:25 2010 +0200
@@ -319,8 +319,6 @@
{$ENDIF}
cSendEmptyPacketTime = 1000;
-
- // from uTriggers
trigTurns = $80000001;
// Training Flags
@@ -332,7 +330,7 @@
tfTargetRespawn = $00000010;
gfAny = $FFFFFFFF;
- gfForts = $00000001;
+ gfOneClanMode = $00000001; // used in trainings
gfMultiWeapon = $00000002; // used in trainings
gfSolidLand = $00000004;
gfBorder = $00000008;
@@ -344,18 +342,17 @@
gfVampiric = $00000200;
gfKarma = $00000400;
gfArtillery = $00000800;
- gfOneClanMode = $00001000; // used for testing
+ gfForts = $00001000;
gfRandomOrder = $00002000;
gfKing = $00004000;
gfPlaceHog = $00008000;
gfSharedAmmo = $00010000;
gfDisableGirders = $00020000;
- //gfExplosives = $00040000; // unused flag, reuse it
- gfDisableLandObjects = $00080000;
- gfAISurvival = $00100000;
- gfInfAttack = $00200000;
- gfResetWeps = $00400000;
- gfPerHogAmmo = $00800000;
+ gfDisableLandObjects = $00040000;
+ gfAISurvival = $00080000;
+ gfInfAttack = $00100000;
+ gfResetWeps = $00200000;
+ gfPerHogAmmo = $00400000;
// NOTE: When adding new game flags, ask yourself
// if a "game start notice" would be useful. If so,
// add one in uWorld.pas - look for "AddGoal".