--- a/hedgewars/uVariables.pas Wed Nov 23 20:12:16 2011 +0300
+++ b/hedgewars/uVariables.pas Thu Nov 24 16:18:45 2011 +0100
@@ -137,6 +137,8 @@
bWaterRising : boolean;
//ShowCrosshair : boolean; This variable is inconvenient to set. Easier to decide when rendering
+ CrosshairX : LongInt;
+ CrosshairY : LongInt;
CursorMovementX : LongInt;
CursorMovementY : LongInt;
cDrownSpeed : hwFloat;
@@ -214,7 +216,8 @@
'Graphics/Hats', // ptHats
'Graphics/Flags', // ptFlags
'Missions/Maps', // ptMissionMaps
- 'Graphics/SuddenDeath' // ptSuddenDeath
+ 'Graphics/SuddenDeath', // ptSuddenDeath
+ 'Graphics/Buttons' // ptButton
);
cTagsMasks : array[0..15] of byte = (7, 0, 0, 0, 15, 6, 4, 5, 0, 0, 0, 0, 0, 14, 12, 13);
@@ -244,7 +247,7 @@
Height: 10;
style: TTF_STYLE_NORMAL;
Name: 'DejaVuSans-Bold.ttf')
- {$IFNDEF IPHONEOS}, // remove chinese fonts for now
+ {$IFNDEF MOBILE}, // remove chinese fonts for now
(Handle: nil;
Height: 12;
style: TTF_STYLE_NORMAL;
@@ -621,8 +624,10 @@
Width: 80; Height: 50; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprSDSplash
(FileName: 'SDDroplet'; Path: ptCurrTheme; AltPath: ptSuddenDeath; Texture: nil; Surface: nil;
Width: 16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprSDDroplet
- (FileName: 'TARDIS'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
- Width: 48; Height: 79; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true)// sprTardis
+ (FileName: 'Egg'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;//TODO change back 'Egg' to 'Tardis'
+ Width: 0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: true; getImageDimensions: true),// sprTardis
+ (FileName: 'firebutton'; Path: ptButtons; AltPath: ptNone; Texture: nil; Surface: nil;
+ Width: 450; Height: 150; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHigh; getDimensions: false; getImageDimensions: true) // sprFireButton
);
@@ -760,7 +765,7 @@
(FileName: 'bump.ogg'; Path: ptSounds),// sndBump
(FileName: 'hogchant3.ogg'; Path: ptSounds),// sndResurrector
(FileName: 'plane.ogg'; Path: ptSounds), // sndPlane
- (FileName: 'TARDIS.ogg'; Path: ptSounds) // sndTardis
+ (FileName: 'plane.ogg'; Path: ptSounds) // sndTardis TODO change when using a new data set
);
Ammoz: array [TAmmoType] of record