diff -r 2e836bebb518 -r 453917e94e55 hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Wed Nov 14 00:23:29 2012 +0100 +++ b/hedgewars/uVariables.pas Thu Nov 22 00:41:53 2012 +0100 @@ -118,9 +118,6 @@ SDWaterOpacity: byte; GrayScale: Boolean; - // originally from uConsts - Pathz: array[TPathType] of shortstring; - UserPathz: array[TPathType] of shortstring; CountTexz: array[0..Pred(AMMO_INFINITE)] of PTexture; LAND_WIDTH : LongInt; LAND_HEIGHT : LongInt; @@ -225,28 +222,28 @@ // these consts are here because they would cause circular dependencies in uConsts/uTypes cPathz: array[TPathType] of shortstring = ( '', // ptNone - '', // ptData - 'Graphics', // ptGraphics - 'Themes', // ptThemes - 'Themes/Bamboo', // ptCurrTheme - 'Teams', // ptTeams - 'Maps', // ptMaps + '/', // ptData + '/Graphics', // ptGraphics + '/Themes', // ptThemes + '/Themes/Bamboo', // ptCurrTheme + '/Teams', // ptTeams + '/Maps', // ptMaps '', // ptMapCurrent - 'Demos', // ptDemos - 'Sounds', // ptSounds - 'Graphics/Graves', // ptGraves - 'Fonts', // ptFonts - 'Forts', // ptForts - 'Locale', // ptLocale - 'Graphics/AmmoMenu', // ptAmmoMenu - 'Graphics/Hedgehog', // ptHedgehog - 'Sounds/voices', // ptVoices - 'Graphics/Hats', // ptHats - 'Graphics/Flags', // ptFlags - 'Missions/Maps', // ptMissionMaps - 'Graphics/SuddenDeath', // ptSuddenDeath - 'Graphics/Buttons', // ptButton - 'Shaders' // ptShaders + '/Demos', // ptDemos + '/Sounds', // ptSounds + '/Graphics/Graves', // ptGraves + '/Fonts', // ptFonts + '/Forts', // ptForts + '/Locale', // ptLocale + '/Graphics/AmmoMenu', // ptAmmoMenu + '/Graphics/Hedgehog', // ptHedgehog + '/Sounds/voices', // ptVoices + '/Graphics/Hats', // ptHats + '/Graphics/Flags', // ptFlags + '/Missions/Maps', // ptMissionMaps + '/Graphics/SuddenDeath', // ptSuddenDeath + '/Graphics/Buttons', // ptButton + '/Shaders' // ptShaders ); var @@ -825,7 +822,7 @@ TimeAfterTurn: Longword; minAngle, maxAngle: Longword; isDamaging: boolean; - SkipTurns: LongInt; {xymeng, org:LongWord} + SkipTurns: LongInt; {xymeng, orinally: LongWord} PosCount: Longword; PosSprite: TSprite; ejectX, ejectY: Longint; @@ -2582,6 +2579,7 @@ GrayScale := false; PathPrefix := './'; GameType := gmtLocal; + cOnlyStats := False; {$IFDEF USE_VIDEO_RECORDING} RecPrefix := ''; @@ -2602,11 +2600,9 @@ cFlattenFlakes := false; cFlattenClouds := false; - cOnlyStats := False; lastVisualGearByUID := nil; lastGearByUID := nil; cReadyDelay := 5000; - Pathz := cPathz; {* REFERENCE 4096 -> $FFFFF000