# HG changeset patch
# User koda
# Date 1292983528 -3600
# Node ID d362ab6c7f53c0a1c377b04272c37619e790e8e4
# Parent  5a3b1dbdd4c9a9c216c9c2e207171b135c389a3c
damn. it.

diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas	Tue Dec 21 23:22:53 2010 +0100
+++ b/hedgewars/PascalExports.pas	Wed Dec 22 03:05:28 2010 +0100
@@ -25,7 +25,6 @@
      uCommands;
 
 {$INCLUDE "config.inc"}
-var dummy: boolean;  // avoid compiler hint
 
 implementation
 {$IFDEF HWLIBRARY}
@@ -33,7 +32,7 @@
     previousGameState: TGameState;
 
 // retrieve protocol information
-procedure HW_versionInfo(netProto: PShortInt; versionStr: PPChar); cdecl; export;
+procedure HW_versionInfo(netProto: PLongInt; versionStr: PPChar); cdecl; export;
 begin
     netProto^:= cNetProtoVersion;
     versionStr^:= cVersionString;
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 hedgewars/hwLibrary.pas
--- a/hedgewars/hwLibrary.pas	Tue Dec 21 23:22:53 2010 +0100
+++ b/hedgewars/hwLibrary.pas	Wed Dec 22 03:05:28 2010 +0100
@@ -16,6 +16,5 @@
 begin
     // avoid compiler warnings about units not being used
     isTerminated:= isTerminated;
-    dummy:= dummy;
 end.
 
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Tue Dec 21 23:22:53 2010 +0100
+++ b/hedgewars/uStore.pas	Wed Dec 22 03:05:28 2010 +0100
@@ -391,7 +391,7 @@
 var tmpsurf: PSDL_Surface;
     s: shortstring;
 begin
-    WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + ']');
+    WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + '] ');
 
     s:= filename + '.png';
     tmpsurf:= IMG_Load(Str2PChar(s));
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 project_files/HedgewarsMobile/Classes/AboutViewController.m
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m	Tue Dec 21 23:22:53 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m	Wed Dec 22 03:05:28 2010 +0100
@@ -98,7 +98,7 @@
 -(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger) section {
     NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
     char *fullver;
-    short int proto = 20;
+    int proto;
     HW_versionInfo(&proto, &fullver);
 
     NSString *footerString = [[NSString alloc] initWithFormat:
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m	Tue Dec 21 23:22:53 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m	Wed Dec 22 03:05:28 2010 +0100
@@ -194,7 +194,7 @@
     [self sendToEngine:turnTime];
     [turnTime release];
 
-    NSString *minesTime = [[NSString alloc] initWithFormat:@"e$turntime %d",[[basicArray objectAtIndex:i++] intValue] * 1000];
+    NSString *minesTime = [[NSString alloc] initWithFormat:@"e$minestime %d",[[basicArray objectAtIndex:i++] intValue] * 1000];
     [self sendToEngine:minesTime];
     [minesTime release];
 
@@ -345,14 +345,14 @@
                 [self dumpRawData:buffer ofSize:msgSize];
 
                 sscanf((char *)buffer, "%*s %d", &eProto);
-                short int netProto;
+                int netProto;
                 char *versionStr;
 
                 HW_versionInfo(&netProto, &versionStr);
                 if (netProto == eProto) {
                     DLog(@"Setting protocol version %d (%s)", eProto, versionStr);
                 } else {
-                    DLog(@"ERROR - wrong protocol number: [%s] - expecting %d", &buffer[1], eProto);
+                    DLog(@"ERROR - wrong protocol number: %d (expecting %d)", netProto, eProto);
                     clientQuit = YES;
                 }
                 break;
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 project_files/HedgewarsMobile/Classes/PascalImports.h
--- a/project_files/HedgewarsMobile/Classes/PascalImports.h	Tue Dec 21 23:22:53 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/PascalImports.h	Wed Dec 22 03:05:28 2010 +0100
@@ -34,7 +34,7 @@
     void GenLandPreview(void);
     void LoadLocaleWrapper(const char *filename);
 
-    void HW_versionInfo(short int *netProto, char **versionStr);
+    void HW_versionInfo(int *protoNum, char **versionStr);
 
     void HW_click(void);
     void HW_ammoMenu(void);
diff -r 5a3b1dbdd4c9 -r d362ab6c7f53 project_files/HedgewarsMobile/Classes/ServerSetup.m
--- a/project_files/HedgewarsMobile/Classes/ServerSetup.m	Tue Dec 21 23:22:53 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/ServerSetup.m	Wed Dec 22 03:05:28 2010 +0100
@@ -181,7 +181,7 @@
             [self sendToServer:@"PASSWORD" withArgument:pwd];
         }
         else if ([command isEqualToString:@"CONNECTED"]) {
-            short int netProto;
+            int netProto;
             char *versionStr;
             HW_versionInfo(&netProto, &versionStr);
             NSString *nick = [self.systemSettings objectForKey:@"username"];