# HG changeset patch
# User Medo <smaxein@googlemail.com>
# Date 1345316730 -7200
# Node ID b9ec869e624af601852db06574019f33a04669af
# Parent  4e223b05be7c7af7950e1c8799d268150c685e80# Parent  020c93746b0d8d2552266144e59c1ea708e325a4
Merge

diff -r 4e223b05be7c -r b9ec869e624a hedgewars/uLand.pas
--- a/hedgewars/uLand.pas	Sat Aug 18 21:04:37 2012 +0200
+++ b/hedgewars/uLand.pas	Sat Aug 18 21:05:30 2012 +0200
@@ -713,7 +713,7 @@
     WriteLnToConsole('Generating preview...');
     case cMapGen of
         0: GenBlank(EdgeTemplates[SelectTemplate]);
-        1: GenMaze;
+        1: begin ResizeLand(4096,2048); GenMaze; end;
         2: GenDrawnMap;
     else
         OutError('Unknown mapgen', true);
diff -r 4e223b05be7c -r b9ec869e624a hedgewars/uLandObjects.pas
--- a/hedgewars/uLandObjects.pas	Sat Aug 18 21:04:37 2012 +0200
+++ b/hedgewars/uLandObjects.pas	Sat Aug 18 21:05:30 2012 +0200
@@ -501,7 +501,7 @@
             c2.g:= t;
             c2.b:= t
             end;
-        ExplosionBorderColor:= c2.r shl 24 or c2.g shl 16 or c2.b shl 8 or $FF; 
+        ExplosionBorderColor:= (c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift) or AMask; 
         end
     else if key = 'water-top' then
         begin
diff -r 4e223b05be7c -r b9ec869e624a hedgewars/uMobile.pas
--- a/hedgewars/uMobile.pas	Sat Aug 18 21:04:37 2012 +0200
+++ b/hedgewars/uMobile.pas	Sat Aug 18 21:05:30 2012 +0200
@@ -28,7 +28,7 @@
 interface
 
 function  isPhone: Boolean; inline;
-function  getScreenDPI: Single; inline;
+function  getScreenDPI: Double; inline;
 procedure performRumble; inline;
 
 procedure GameLoading; inline;
@@ -36,7 +36,7 @@
 procedure SaveLoadingEnded; inline;
 
 implementation
-uses uVariables, uConsole;
+uses uVariables, uConsole, SDLh;
 
 // add here any external call that you need
 {$IFDEF IPHONEOS}
@@ -48,10 +48,6 @@
 procedure AudioServicesPlaySystemSound(num: LongInt); cdecl; external;
 {$ENDIF}
 
-{$IFDEF ANDROID}
-function Android_JNI_getDensity(): Single; cdecl; external;
-{$ENDIF}
-
 // this function is just to determine whether we are running on a limited screen device
 function isPhone: Boolean; inline;
 begin
@@ -66,10 +62,11 @@
 {$ENDIF}
 end;
 
-function getScreenDPI: Single; inline;
+function getScreenDPI: Double; inline;
 begin
 {$IFDEF ANDROID}
-    getScreenDPI:= Android_JNI_getDensity();
+//    getScreenDPI:= Android_JNI_getDensity();
+    getScreenDPI:= 1;
 {$ELSE}
     getScreenDPI:= 1;
 {$ENDIF}