# HG changeset patch
# User koda
# Date 1356408949 -3600
# Node ID 9333216f2054eafed1b1eb7ba9005ccfc642302e
# Parent  aaefa587e2771fd504099d0c3ec0428d85d68866
fix hwc install and pas2c preprocessing (but not total conversion)

diff -r aaefa587e277 -r 9333216f2054 hedgewars/ArgParsers.inc
--- a/hedgewars/ArgParsers.inc	Tue Dec 25 04:45:22 2012 +0100
+++ b/hedgewars/ArgParsers.inc	Tue Dec 25 05:15:49 2012 +0100
@@ -155,15 +155,14 @@
     getStringParameter:= str;
 end;
 
-
-procedure parseClassicParameter(cmdArray: Array of String; size:LongInt; var paramIndex:LongInt); Forward;
+procedure parseClassicParameter(cmdArray: array of String; size:LongInt; var paramIndex:LongInt); forward;
 
 function parseParameter(cmd:String; arg:String; var paramIndex:LongInt): Boolean;
-const videoArray: Array [1..3] of String = ('--width','--height','--depth');
-      audioArray: Array [1..3] of String = ('--volume','--nomusic','--nosound');
-      otherArray: Array [1..3] of String = ('--locale','--fullscreen','--showfps');
-      mediaArray: Array [1..8] of String = ('--width','--height','--depth','--volume','--nomusic','--nosound','--locale','--fullscreen');
-      allArray: Array [1..12] of String = ('--width','--height','--depth','--volume','--nomusic','--nosound','--locale','--fullscreen','--showfps','--altdmg','--frame-interval','--low-quality');
+const videoArray: array [1..3] of String = ('--width','--height','--depth');
+      audioArray: array [1..3] of String = ('--volume','--nomusic','--nosound');
+      otherArray: array [1..3] of String = ('--locale','--fullscreen','--showfps');
+      mediaArray: array [1..8] of String = ('--width','--height','--depth','--volume','--nomusic','--nosound','--locale','--fullscreen');
+      allArray: array [1..12] of String = ('--width','--height','--depth','--volume','--nomusic','--nosound','--locale','--fullscreen','--showfps','--altdmg','--frame-interval','--low-quality');
       reallyAll: array[0..28] of shortstring = (
                 '--prefix', '--user-prefix', '--locale', '--width', '--height', '--frame-interval', '--volume','--nomusic', '--nosound',
                 '--fullscreen', '--showfps', '--altdmg', '--low-quality', '--raw-quality', '--stereo', '--nick',
@@ -226,7 +225,7 @@
     end;
 end;
 
-procedure parseClassicParameter(cmdArray: Array of String; size:LongInt; var paramIndex:LongInt);
+procedure parseClassicParameter(cmdArray: array of String; size:LongInt; var paramIndex:LongInt);
 var index, tmpInt: LongInt;
     isBool, isValid: Boolean;
     cmd, arg, newSyntax: String;
@@ -255,9 +254,9 @@
         if isValid then
             begin
             parseParameter(cmd, arg, tmpInt);
-            newSyntax += cmd + ' ';
+            newSyntax:= newSyntax + cmd + ' ';
             if not isBool then
-                newSyntax += arg + ' ';
+                newSyntax:= newSyntax + arg + ' ';
             end;
         inc(index);
         end;
diff -r aaefa587e277 -r 9333216f2054 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Tue Dec 25 04:45:22 2012 +0100
+++ b/hedgewars/uTypes.pas	Tue Dec 25 05:15:49 2012 +0100
@@ -404,10 +404,10 @@
 
      cdeclPtr = procedure; cdecl;
      cdeclIntPtr = procedure(num: LongInt); cdecl;
-     functionDoublePtr = function: Double;
+     funcDoublePtr = function: Double;
 
      TMobileRecord = record
-                     getScreenDPI: functionDoublePtr;
+                     getScreenDPI: funcDoublePtr;
                      PerformRumble: cdeclIntPtr;
                      GameLoading: cdeclPtr;
                      GameLoaded: cdeclPtr;
diff -r aaefa587e277 -r 9333216f2054 project_files/hwc/CMakeLists.txt
--- a/project_files/hwc/CMakeLists.txt	Tue Dec 25 04:45:22 2012 +0100
+++ b/project_files/hwc/CMakeLists.txt	Tue Dec 25 05:15:49 2012 +0100
@@ -76,5 +76,5 @@
 endif(APPLE)
 
 
-install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
+install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_binary_install_dir})