| blob | 379698a21a36bd165df60cca2006c503e20382bd |
1 diff -Naur gnurobbo-0.68-orig/gnurobbo/controls.c gnurobbo-0.68/gnurobbo/controls.c
2 --- gnurobbo-0.68-orig/gnurobbo/controls.c 2017-08-02 17:52:10.133830065 +0200
3 +++ gnurobbo-0.68/gnurobbo/controls.c 2017-08-02 18:09:19.918861768 +0200
4 @@ -563,7 +563,7 @@
5 /* Set some defaults */
6 for (count = 0; count < USER_CONTROLS; count++)
7 {
8 - #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC)
9 + #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_AROS)
10 user_controls[count].device = DEVICE_KEYBOARD;
11 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
12 user_controls[count].device = DEVICE_JOYSTICK;
13 @@ -587,7 +587,7 @@
14 * you don't want to use a control then just set its device to UNDEFINED
15 * (id and mod are already set to UNDEFINED from the above code) otherwise
16 * within Options you'll see the device shown on its own which looks weird */
17 - #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC)
18 + #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_AROS)
19 user_controls[ACTION_UP].id = SDLK_UP;
20 user_controls[ACTION_UP_RIGHT].device = UNDEFINED;
21 user_controls[ACTION_RIGHT].id = SDLK_RIGHT;
22 @@ -872,7 +872,7 @@
23 {
24 /* WARNING: attempting to close joystick 0 on the GP2X
25 * using the GPH SDK causes a seg fault */
26 - #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC)
27 + #if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_AROS)
28 if (joystick)
29 {
30 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
31 diff -Naur gnurobbo-0.68-orig/gnurobbo/game.c gnurobbo-0.68/gnurobbo/game.c
32 --- gnurobbo-0.68-orig/gnurobbo/game.c 2017-08-02 17:52:10.129830092 +0200
33 +++ gnurobbo-0.68/gnurobbo/game.c 2017-08-02 18:13:27.453211540 +0200
34 @@ -180,7 +180,7 @@
35 pointer_controls.state = POINTER_CONTROLS_MODE_OFF;
36 pointer_controls.shoot_state = POINTER_CONTROLS_SHOOT_OFF;
37 pointer_controls.pad_type = POINTER_CONTROLS_PAD_TYPE_VIEWPORT; /* POINTER_CONTROLS_PAD_TYPE_SCREEN; */
38 -#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_CAANOO)
39 +#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_CAANOO) || defined(PLATFORM_AROS)
40 gnurobbo_op_env.systempointer = TRUE;
41 #elif defined(PLATFORM_GP2X)
42 gnurobbo_op_env.systempointer = FALSE;
43 @@ -357,6 +357,8 @@
44 #elif defined(PLATFORM_PC)
45 strcpy (path_resource_file, getenv ("HOME"));
46 strcat (path_resource_file, "/");
47 + #elif defined(PLATFORM_AROS)
48 + strcpy (path_resource_file, "PROGDIR:");
49 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
50 strcpy (path_resource_file, "./");
51 #elif defined(PLATFORM_ZAURUS)
52 @@ -468,7 +470,7 @@
53 initialise_joystick (UNDEFINED, default_joystick_name, TRUE);
54 }
56 -#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC)
57 +#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_AROS)
58 /* Load the window manager icon and set caption */
59 set_wm_icon();
60 SDL_WM_SetCaption ("GNU Robbo", "gnurobbo");
61 @@ -1608,7 +1610,7 @@
63 /* WARNING: attempting to close joystick 0 on the GP2X using the GPH
64 * SDK causes a seg fault and it may do the same on similar devices */
65 -#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC)
66 +#if defined(PLATFORM_WIN32) || defined(PLATFORM_PC) || defined(PLATFORM_AROS)
67 if (joystick)
68 SDL_JoystickClose (joystick);
69 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
70 diff -Naur gnurobbo-0.68-orig/gnurobbo/game.h gnurobbo-0.68/gnurobbo/game.h
71 --- gnurobbo-0.68-orig/gnurobbo/game.h 2017-08-02 17:52:10.133830065 +0200
72 +++ gnurobbo-0.68/gnurobbo/game.h 2017-08-02 18:15:49.036269136 +0200
73 @@ -84,8 +84,13 @@
74 */
77 +#ifndef TRUE
78 #define TRUE 1
79 +#endif
80 +#ifndef FALSE
81 #define FALSE 0
82 +#endif
83 +
85 #define UNDEFINED -1
87 diff -Naur gnurobbo-0.68-orig/gnurobbo/levels.c gnurobbo-0.68/gnurobbo/levels.c
88 --- gnurobbo-0.68-orig/gnurobbo/levels.c 2017-08-02 17:52:10.129830092 +0200
89 +++ gnurobbo-0.68/gnurobbo/levels.c 2017-08-02 18:37:51.976108821 +0200
90 @@ -192,7 +192,7 @@
91 FILE *fp;
92 char fullpath[256];
93 #if defined(PLATFORM_WIN32)
94 - #elif defined(PLATFORM_PC) || defined(PLATFORM_ZAURUS) || defined(PLATFORM_FREMANTLE)
95 + #elif defined(PLATFORM_PC) || defined(PLATFORM_ZAURUS) || defined(PLATFORM_FREMANTLE) || defined(PLATFORM_AROS)
96 char foldername[256];
97 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
98 #elif defined(PLATFORM_PSP)
99 @@ -204,6 +204,9 @@
100 #elif defined(PLATFORM_PC) || defined(PLATFORM_ZAURUS) || defined(PLATFORM_FREMANTLE)
101 strcpy (fullpath, getenv ("HOME"));
102 strcat (fullpath, "/" LOCAL_DATA_DIR "/" LEVELS_DIR "/" DEFAULT_USER_LEVEL_PACK);
103 + #elif defined(PLATFORM_AROS)
104 + strcpy (fullpath, "PROGDIR:");
105 + strcpy (fullpath, PACKAGE_DATA_DIR "/" LEVELS_DIR "/" DEFAULT_USER_LEVEL_PACK);
106 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_PSP) || defined(PLATFORM_CAANOO)
107 strcpy (fullpath, PACKAGE_DATA_DIR "/" LEVELS_DIR "/" DEFAULT_USER_LEVEL_PACK);
108 #endif
109 @@ -224,6 +227,12 @@
110 mkdir (foldername, 0755);
111 strcat (foldername, "/" LEVELS_DIR);
112 mkdir (foldername, 0755);
113 + #elif defined(PLATFORM_AROS)
114 + strcpy (foldername, "PROGDIR:");
115 + strcat (foldername, LOCAL_DATA_DIR);
116 + mkdir (foldername, 0755);
117 + strcat (foldername, "/" LEVELS_DIR);
118 + mkdir (foldername, 0755);
119 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
120 #elif defined(PLATFORM_PSP)
121 #endif
122 @@ -309,6 +318,8 @@
124 #if defined(PLATFORM_WIN32)
125 for (count = 0; count < 1; count++)
126 + #elif defined(PLATFORM_AROS)
127 + for (count = 0; count < 1; count++)
128 #elif defined(PLATFORM_PC) || defined(PLATFORM_ZAURUS) || defined(PLATFORM_FREMANTLE)
129 for (count = 0; count < 2; count++)
130 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_PSP) || defined(PLATFORM_CAANOO)
131 diff -Naur gnurobbo-0.68-orig/gnurobbo/locales.c gnurobbo-0.68/gnurobbo/locales.c
132 --- gnurobbo-0.68-orig/gnurobbo/locales.c 2017-08-02 17:52:10.133830065 +0200
133 +++ gnurobbo-0.68/gnurobbo/locales.c 2017-08-02 18:35:23.097057260 +0200
134 @@ -326,6 +326,10 @@
135 strcpy (config_items[++row].name, "[txt_intro_keys_PLATFORM_PC]");
136 config_items[row].destination = txt_intro_keys;
137 config_items[row].max_rows = TXT_INTRO_KEYS_ROWS;
138 + #elif defined(AROS)
139 + strcpy (config_items[++row].name, "[txt_intro_keys_PLATFORM_AROS]");
140 + config_items[row].destination = txt_intro_keys;
141 + config_items[row].max_rows = TXT_INTRO_KEYS_ROWS;
142 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
143 strcpy (config_items[++row].name, "[txt_intro_keys_PLATFORM_GP2X]");
144 config_items[row].destination = txt_intro_keys;
145 diff -Naur gnurobbo-0.68-orig/gnurobbo/rcfile.h gnurobbo-0.68/gnurobbo/rcfile.h
146 --- gnurobbo-0.68-orig/gnurobbo/rcfile.h 2017-08-02 17:52:10.133830065 +0200
147 +++ gnurobbo-0.68/gnurobbo/rcfile.h 2017-08-02 18:20:10.858675704 +0200
148 @@ -23,6 +23,8 @@
149 #define RESOURCE_FILE "gnurobborc"
150 #elif defined(PLATFORM_PC)
151 #define RESOURCE_FILE ".gnurobborc"
152 +#elif defined(PLATFORM_AROS)
153 + #define RESOURCE_FILE "gnurobborc"
154 #elif defined(PLATFORM_GP2X) || defined(PLATFORM_CAANOO)
155 #define RESOURCE_FILE "gnurobborc"
156 #elif defined(PLATFORM_ZAURUS)