TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Mac OS 9 compile issues, update Xcode project

Browse source
This commit is contained in:
kreatordxx 2008-12-21 08:54:03 +00:00
parent f92ded953a
commit 45801a75d8
5 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -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

3
D2X.make
View file

@ -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

2
d2x-rebirth.xcodeproj/project.pbxproj
View file

@ -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 */,

4
main/gamecntl.c
View file

@ -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;

2
main/playsave.c
View file

@ -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;