Move localization data to uVariables, some Uses cleanup
authorunc0rr
Sat, 20 Nov 2010 23:55:00 +0300
changeset 4390 f219628ed666
parent 4389 d1c65b60cd68
child 4391 de9e1a5102b4
Move localization data to uVariables, some Uses cleanup
hedgewars/uLandTexture.pas
hedgewars/uLocale.pas
hedgewars/uStore.pas
hedgewars/uVariables.pas
hedgewars/uVisualGears.pas
--- a/hedgewars/uLandTexture.pas	Sat Nov 20 23:48:04 2010 +0300
+++ b/hedgewars/uLandTexture.pas	Sat Nov 20 23:55:00 2010 +0300
@@ -28,7 +28,7 @@
 procedure DrawLand(dX, dY: LongInt);
 
 implementation
-uses uMisc, uStore, uConsts, GLunit, uTypes, uVariables, uTextures, uIO, uRender;
+uses uConsts, GLunit, uTypes, uVariables, uTextures, uIO, uRender;
 
 const TEXSIZE = 256;
 
--- a/hedgewars/uLocale.pas	Sat Nov 20 23:48:04 2010 +0300
+++ b/hedgewars/uLocale.pas	Sat Nov 20 23:55:00 2010 +0300
@@ -23,11 +23,6 @@
 uses uTypes;
 
 const MAX_EVENT_STRINGS = 100;
-var trammo:  array[TAmmoStrId] of ansistring;   // name of the weapon
-    trammoc: array[TAmmoStrId] of ansistring;   // caption of the weapon
-    trammod: array[TAmmoStrId] of ansistring;   // description of the weapon
-    trmsg:   array[TMsgStrId]  of ansistring;   // message of the event
-    trgoal:  array[TGoalStrId] of ansistring;   // message of the goal
 
 procedure LoadLocale(FileName: shortstring);
 function  Format(fmt: shortstring; var arg: shortstring): shortstring;
@@ -35,7 +30,7 @@
 function  GetEventString(e: TEventId): ansistring;
 
 implementation
-uses uRandom, uUtils, uIO;
+uses uRandom, uUtils, uIO, uVariables;
 
 var trevt: array[TEventId] of array [0..Pred(MAX_EVENT_STRINGS)] of ansistring;
     trevt_n: array[TEventId] of integer;
--- a/hedgewars/uStore.pas	Sat Nov 20 23:48:04 2010 +0300
+++ b/hedgewars/uStore.pas	Sat Nov 20 23:55:00 2010 +0300
@@ -39,7 +39,7 @@
 procedure FreeWeaponTooltip;
 
 implementation
-uses uMisc, uConsole, uLocale, uMobile, uVariables, uUtils, uTextures, uIO, uRender, uRenderUtils;
+uses uMisc, uConsole, uMobile, uVariables, uUtils, uTextures, uIO, uRender, uRenderUtils;
 
 type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple);
 
--- a/hedgewars/uVariables.pas	Sat Nov 20 23:48:04 2010 +0300
+++ b/hedgewars/uVariables.pas	Sat Nov 20 23:55:00 2010 +0300
@@ -2095,6 +2095,13 @@
     pauseAction: boolean;
 {$ENDIF}
 
+var trammo:  array[TAmmoStrId] of ansistring;   // name of the weapon
+    trammoc: array[TAmmoStrId] of ansistring;   // caption of the weapon
+    trammod: array[TAmmoStrId] of ansistring;   // description of the weapon
+    trmsg:   array[TMsgStrId]  of ansistring;   // message of the event
+    trgoal:  array[TGoalStrId] of ansistring;   // message of the goal
+
+
 procedure initModule;
 procedure freeModule;
 
--- a/hedgewars/uVisualGears.pas	Sat Nov 20 23:48:04 2010 +0300
+++ b/hedgewars/uVisualGears.pas	Sat Nov 20 23:55:00 2010 +0300
@@ -34,7 +34,7 @@
 procedure AddDamageTag(X, Y, Damage, Color: LongWord);
 
 implementation
-uses uMisc, uStore, uSound, uMobile, uVariables, uTextures, uRender, uUtils, Math, uRenderUtils;
+uses uSound, uMobile, uVariables, uTextures, uRender, Math, uRenderUtils;
 
 const cExplFrameTicks = 110;