--- a/hedgewars/hwengine.pas	Tue Jan 04 12:53:46 2011 +0100
+++ b/hedgewars/hwengine.pas	Tue Jan 04 13:05:30 2011 +0100
@@ -226,7 +226,7 @@
     cAltDamage:= gameArgs[8] = '1';
     val(gameArgs[9], rotationQt);
     recordFileName:= gameArgs[10];
-    cStereoMode:= smNone; // TODO: Enable anaglyph rendering on iPhone?
+    cStereoMode:= smNone;
 {$ENDIF}
 
     cLogfileBase:= 'game';

--- a/hedgewars/uChat.pas	Tue Jan 04 12:53:46 2011 +0100
+++ b/hedgewars/uChat.pas	Tue Jan 04 13:05:30 2011 +0100
@@ -29,10 +29,6 @@
 procedure DrawChat;
 procedure KeyPressChat(Key: Longword);
 
-var UserNick: shortstring = '';
-    ChatReady: boolean;
-    showAll: boolean;
-
 implementation
 uses SDLh, uKeys, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO;
 
@@ -52,6 +48,8 @@
     visibleCount: LongWord;
     InputStr: TChatLine;
     InputStrL: array[0..260] of char; // for full str + 4-byte utf-8 char
+    ChatReady: boolean;
+    showAll: boolean;
 
 const colors: array[#1..#5] of TSDL_Color = (
     (r:$FF; g:$FF; b:$FF; unused:$FF), // chat message [White]
@@ -373,7 +371,6 @@
 
 procedure freeModule;
 begin
-    UserNick:= '';
 end;
 
 end.

--- a/hedgewars/uIO.pas	Tue Jan 04 12:53:46 2011 +0100
+++ b/hedgewars/uIO.pas	Tue Jan 04 13:05:30 2011 +0100
@@ -22,9 +22,6 @@
 interface
 uses SDLh, uTypes;
 
-var ipcPort: Word = 0;
-    hiTicks: Word;
-
 procedure initModule;
 procedure freeModule;
 
@@ -431,7 +428,6 @@
 
 procedure freeModule;
 begin
-    ipcPort:= 0;
 end;
 
 end.

--- a/hedgewars/uVariables.pas	Tue Jan 04 12:53:46 2011 +0100
+++ b/hedgewars/uVariables.pas	Tue Jan 04 13:05:30 2011 +0100
@@ -10,7 +10,7 @@
     cScreenWidth    : LongInt     = 1024;
     cScreenHeight   : LongInt     = 768;
     cBits           : LongInt     = 32;
-    //ipcPort is in uIO
+    ipcPort         : Word        = 0;
     cFullScreen     : boolean     = false;
     isSoundEnabled  : boolean     = true;
     isMusicEnabled  : boolean     = false;
@@ -21,7 +21,7 @@
     cShowFPS        : boolean     = false;
     cAltDamage      : boolean     = true;
     cReducedQuality : LongWord    = rqNone;
-    //userNick is in uChat
+    UserNick        : shortstring = '';
     recordFileName  : shortstring = '';
     cReadyDelay     : Longword    = 5000;
     cLogfileBase    : shortstring = 'debug';
@@ -145,6 +145,8 @@
     WorldDx: LongInt;
     WorldDy: LongInt;
 
+    hiTicks: Word;
+
 const
     cHHFileName = 'Hedgehog';
     cCHFileName = 'Crosshair';
@@ -2302,18 +2304,18 @@
     cScreenWidth    := 1024;
     cScreenHeight   := 768;
     cBits           := 32;
-    //ipcPort is in uIO
+    ipcPort         := 0;
     cFullScreen     := false;
     isSoundEnabled  := true;
     isMusicEnabled  := false;
     cLocaleFName    := 'en.txt';
     cInitVolume     := 100;
     cTimerInterval  := 8;
-    PathPrefix := './';
+    PathPrefix      := './';
     cShowFPS        := false;
     cAltDamage      := true;
     cReducedQuality := rqNone;
-    //userNick is in uChat
+    UserNick        := '';
     recordFileName  := '';
     cReadyDelay     := 5000;
     cStereoMode     := smNone;