From 45801a75d83bf397e28bb9f4002eeb5f0620cd47 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sun, 21 Dec 2008 08:54:03 +0000
Subject: [PATCH] Fix Mac OS 9 compile issues, update Xcode project

---
 CHANGELOG.txt                         | 4 ++++
 D2X.make                              | 3 +++
 d2x-rebirth.xcodeproj/project.pbxproj | 2 ++
 main/gamecntl.c                       | 4 ++--
 main/playsave.c                       | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c5d4b3878..26b27c7c8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20081221
+--------
+d2x-rebirth.xcodeproj/project.pbxproj, D2X.make, main/gamecntl.c, main/playsave.c: Fix Mac OS 9 compile issues, update Xcode project
+
 20081213
 --------
 main/game.c, main/game.h, main/gamecntl.c, main/menu.c: Seperated help screens for game, netgame and demo; Also show them in Controls menu; Small Menu UI fix for ScrollOffset when calling menus in a scrolled area of a menu
diff --git a/D2X.make b/D2X.make
index 40e7d7fbb..c8e48e9d3 100644
--- a/D2X.make
+++ b/D2X.make
@@ -62,6 +62,7 @@ SrcFiles        =  
 				  :arch:sdl:digi_mixer_music.c ¶
 				  :arch:sdl:event.c ¶
 				  :arch:sdl:gr.c ¶
+				  :arch:sdl:init.c ¶
 				  :arch:sdl:joy.c ¶
 				  :arch:sdl:jukebox.c ¶
 				  :arch:sdl:key.c ¶
@@ -208,6 +209,7 @@ GeneralObjects    =  
 				  {ObjDir}digi_mixer_music.c.x ¶
 				  {ObjDir}jukebox.c.x ¶
 				  "{ObjDir}event.c.x" ¶
+				  {ObjDir}init.c.x ¶
 				  "{ObjDir}joy.c.x" ¶
 				  "{ObjDir}key.c.x" ¶
 				  "{ObjDir}mouse.c.x" ¶
@@ -402,6 +404,7 @@ directories 
 "{ObjDir}digi_mixer_music.c.x"  Ä  :arch:sdl:digi_mixer_music.c
 "{ObjDir}event.c.x"  Ä  :arch:sdl:event.c
 "{ObjDir}SDL:gr.c.x"  Ä  :arch:sdl:gr.c
+"{ObjDir}init.c.x"	Ä	:arch:sdl:init.c
 "{ObjDir}joy.c.x"  Ä  :arch:sdl:joy.c
 "{ObjDir}jukebox.c.x"  Ä  :arch:sdl:jukebox.c
 "{ObjDir}key.c.x"  Ä  :arch:sdl:key.c
diff --git a/d2x-rebirth.xcodeproj/project.pbxproj b/d2x-rebirth.xcodeproj/project.pbxproj
index 6a7b06203..8e1b35f78 100755
--- a/d2x-rebirth.xcodeproj/project.pbxproj
+++ b/d2x-rebirth.xcodeproj/project.pbxproj
@@ -1641,9 +1641,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = EBBAD49E0B2D0F7E00080BBF /* Build configuration list for PBXProject "d2x-rebirth" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* d2x */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				676AC1BF0668A938007173EB /* d2x */,
 				676AC2710668A939007173EB /* d2xgl */,
diff --git a/main/gamecntl.c b/main/gamecntl.c
index c64664f71..5bc11396c 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -1054,7 +1054,7 @@ int HandleSystemKey(int key)
 			#endif
 			break;		// send taunt macros
 
-#if defined(__APPLE__) || defined(macintosh)
+#if defined(NETWORK) && (defined(__APPLE__) || defined(macintosh))
 		case KEY_9 + KEY_COMMAND:
 			multi_send_macro(KEY_F9);
 			break;
@@ -1078,7 +1078,7 @@ int HandleSystemKey(int key)
 			#endif
 			break;		// redefine taunt macros
 
-#if defined(__APPLE__) || defined(macintosh)
+#if defined(NETWORK) && (defined(__APPLE__) || defined(macintosh))
 		case KEY_9 + KEY_SHIFTED + KEY_COMMAND:
 			multi_define_macro(KEY_F9);
 			break;
diff --git a/main/playsave.c b/main/playsave.c
index 1deb78415..b8daa1326 100644
--- a/main/playsave.c
+++ b/main/playsave.c
@@ -658,8 +658,8 @@ int write_player_file()
 	//write kconfig info
 	{
 
-		control_type_dos = PlayerCfg.ControlType;
 		ubyte old_avg_joy_sensitivity = ((PlayerCfg.JoystickSensitivityX+PlayerCfg.JoystickSensitivityY+1)/2);
+		control_type_dos = PlayerCfg.ControlType;
 
 		if (PHYSFS_write(file, PlayerCfg.KeySettings, MAX_CONTROLS*CONTROL_MAX_TYPES, 1) != 1)
 			goto write_player_file_failed;