# HG changeset patch # User unc0rr # Date 1290286500 -10800 # Node ID f219628ed666a893e93b28af819d3fc70805ea14 # Parent d1c65b60cd681c8d32bf047a533782f232de57de Move localization data to uVariables, some Uses cleanup diff -r d1c65b60cd68 -r f219628ed666 hedgewars/uLandTexture.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; diff -r d1c65b60cd68 -r f219628ed666 hedgewars/uLocale.pas --- 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; diff -r d1c65b60cd68 -r f219628ed666 hedgewars/uStore.pas --- 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); diff -r d1c65b60cd68 -r f219628ed666 hedgewars/uVariables.pas --- 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; diff -r d1c65b60cd68 -r f219628ed666 hedgewars/uVisualGears.pas --- 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;