API tools faq
paste
Advertisement
Guest User

Super Jamie

a guest
Sep 28th, 2009
206
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.61 KB | None | 0 0
raw download clone embed print report
  1. superjamie@one:~/Desktop/src$ diff -r prboom-2.5.0 prboom-2.5.0b-gp2x
  2. Only in prboom-2.5.0b-gp2x: COMPILE.GP2X
  3. diff -r prboom-2.5.0/config.h prboom-2.5.0b-gp2x/config.h
  4. 12c12
  5. < #define DOOMWADDIR "/usr/local/share/games/doom"
  6. ---
  7. > #define DOOMWADDIR "./wads"
  8. 15c15
  9. < #define GL_DOOM 1
  10. ---
  11. > /* #undef GL_DOOM */
  12. 37c37
  13. < #define HAVE_INTTYPES_H 1
  14. ---
  15. > /* #undef HAVE_INTTYPES_H */
  16. 40c40
  17. < #define HAVE_IPv6 1
  18. ---
  19. > /* #undef HAVE_IPv6 */
  20. 46c46
  21. < #define HAVE_LIBPNG 1
  22. ---
  23. > // #define HAVE_LIBPNG
  24. 49c49
  25. < /* #undef HAVE_LIBSDL_MIXER */
  26. ---
  27. > #define HAVE_LIBSDL_MIXER
  28. 55c55
  29. < #define HAVE_MEMORY_H 1
  30. ---
  31. > /* #undef HAVE_MEMORY_H */
  32. 76c76
  33. < #define HAVE_STDINT_H 1
  34. ---
  35. > /* #undef HAVE_STDINT_H */
  36. 79c79
  37. < #define HAVE_STDLIB_H 1
  38. ---
  39. > /* #undef HAVE_STDLIB_H */
  40. 82c82
  41. < #define HAVE_STRINGS_H 1
  42. ---
  43. > /* #undef HAVE_STRINGS_H */
  44. 85c85
  45. < #define HAVE_STRING_H 1
  46. ---
  47. > /* #undef HAVE_STRING_H */
  48. 88c88
  49. < #define HAVE_SYS_STAT_H 1
  50. ---
  51. > /* #undef HAVE_SYS_STAT_H */
  52. 91c91
  53. < #define HAVE_SYS_TYPES_H 1
  54. ---
  55. > /* #undef HAVE_SYS_TYPES_H */
  56. 94c94
  57. < #define HAVE_SYS_WAIT_H 1
  58. ---
  59. > /* #undef HAVE_SYS_WAIT_H */
  60. 113c113
  61. < #define I386_ASM 1
  62. ---
  63. > /* #undef I386_ASM */
  64. 158c158
  65. < #define STDC_HEADERS 1
  66. ---
  67. > /* #undef STDC_HEADERS */
  68. 165c165
  69. < #define USE_GLU_IMAGESCALE 1
  70. ---
  71. > /* #undef USE_GLU_IMAGESCALE */
  72. 168c168
  73. < #define USE_GLU_MIPMAP 1
  74. ---
  75. > /* #undef USE_GLU_MIPMAP */
  76. 191c191
  77. < /* #undef gid_t */
  78. ---
  79. > //#define gid_t int
  80. 209c209
  81. < /* #undef uid_t */
  82. ---
  83. > //#define uid_t int
  84. Only in prboom-2.5.0b-gp2x: config.log
  85. Only in prboom-2.5.0b-gp2x: config.status
  86. Only in prboom-2.5.0b-gp2x/data: Makefile
  87. Only in prboom-2.5.0b-gp2x/doc: Makefile
  88. Only in prboom-2.5.0b-gp2x/ICONS: Makefile
  89. Only in prboom-2.5.0b-gp2x: Makefile
  90. Only in prboom-2.5.0b-gp2x: pr_config.sh
  91. Only in prboom-2.5.0b-gp2x: pr_make.sh
  92. Only in prboom-2.5.0b-gp2x: README-GP2X.txt
  93. Only in prboom-2.5.0b-gp2x/src: .deps
  94. Only in prboom-2.5.0b-gp2x/src/MAC: Makefile
  95. Only in prboom-2.5.0b-gp2x/src: Makefile
  96. Only in prboom-2.5.0b-gp2x/src/POSIX: .deps
  97. Only in prboom-2.5.0b-gp2x/src/POSIX: Makefile
  98. Only in prboom-2.5.0b-gp2x/src/SDL: .deps
  99. Only in prboom-2.5.0b-gp2x/src/SDL: gp2x.h
  100. diff -r prboom-2.5.0/src/SDL/i_joy.c prboom-2.5.0b-gp2x/src/SDL/i_joy.c
  101. 48a49,50
  102. > #include "gp2x.h"
  103. >
  104. 64a67,70
  105. > // Gp2X 0 UP 1 LEFT 2 DOWN 3 RIGHT
  106. > int directionsCurrentState[4];
  107. > int directionsPastState[4];
  108. >
  109. 71a78,130
  110. >
  111. > // GP2X Start
  112. > int i;
  113. > for (i = 0; i < 4; i++)
  114. > {
  115. > directionsPastState[i] = directionsCurrentState[i];
  116. > }
  117. >
  118. > directionsCurrentState[0] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_UP) |
  119. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPLEFT) |
  120. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPRIGHT));
  121. > directionsCurrentState[1] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_LEFT) |
  122. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPLEFT) |
  123. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNLEFT));
  124. > directionsCurrentState[2] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWN) |
  125. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNLEFT) |
  126. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNRIGHT));
  127. > directionsCurrentState[3] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_RIGHT) |
  128. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPRIGHT) |
  129. > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNRIGHT));
  130. >
  131. >
  132. > for (i = 0; i < 4; i++)
  133. > {
  134. > if(directionsCurrentState[i]!=directionsPastState[i])
  135. > {
  136. > event_t ev;
  137. > if(directionsCurrentState[i]) ev.type = ev_keydown;
  138. > else ev.type = ev_keyup;
  139. > switch(i)
  140. > {
  141. > case 0: ev.data1 = KEYD_UPARROW; break;
  142. > case 1: ev.data1 = KEYD_LEFTARROW; break;
  143. > case 2: ev.data1 = KEYD_DOWNARROW; break;
  144. > case 3: ev.data1 = KEYD_RIGHTARROW; break;
  145. > }
  146. > D_PostEvent(&ev);
  147. > }
  148. > }
  149. >
  150. > if(SDL_JoystickGetButton(joystick, GP2X_BUTTON_CLICK))
  151. > {
  152. > event_t ev;
  153. > ev.type = ev_joystick;
  154. > ev.data1 = (SDL_JoystickGetButton(joystick, 18)<<0);
  155. > ev.data2 = 0;
  156. > ev.data3 = 0;
  157. > D_PostEvent(&ev);
  158. > }
  159. > //END GP2X
  160. >
  161. > //COMMENT OUT GP2X
  162. > /*
  163. 85a145
  164. > */
  165. 114a175,183
  166. >
  167. > // GP2X START
  168. > int i;
  169. > for (i = 0; i < 4; i++)
  170. > {
  171. > directionsCurrentState[i] = 0;
  172. > directionsPastState[i] = 0;
  173. > }
  174. > // GP2X END
  175. diff -r prboom-2.5.0/src/SDL/i_sound.c prboom-2.5.0b-gp2x/src/SDL/i_sound.c
  176. 517c517,519
  177. < audio_buffers = SAMPLECOUNT*snd_samplerate/11025;
  178. ---
  179. > //audio_buffers = SAMPLECOUNT*snd_samplerate/11025;
  180. >
  181. > audio_buffers = 512; // GP2X Requirement
  182. 602,603c604,606
  183. < music_tmp = strdup("/tmp/prboom-music-XXXXXX");
  184. < {
  185. ---
  186. > // Edit for GP2X
  187. > music_tmp = strdup("./prboom-music");
  188. > /*{
  189. 606c609
  190. < lprintf(LO_ERROR, "I_InitMusic: failed to create music temp file %s", music_tmp);
  191. ---
  192. > lprintf(LO_ERROR, "I_InitMusic: failed to create music temp file %s\n", music_tmp);
  193. 610c613
  194. < }
  195. ---
  196. > }*/
  197. diff -r prboom-2.5.0/src/SDL/i_system.c prboom-2.5.0b-gp2x/src/SDL/i_system.c
  198. 285c285
  199. < static const char prboom_dir[] = {"/.prboom"}; // Mead rem extra slash 8/21/03
  200. ---
  201. > static const char prboom_dir[] = {"."}; // Mead rem extra slash 8/21/03
  202. 348,351c348,351
  203. < {"/usr/local/share/games/doom"},
  204. < {"/usr/share/games/doom"},
  205. < {"/usr/local/share/doom"},
  206. < {"/usr/share/doom"},
  207. ---
  208. > {"./"},
  209. > {"./"},
  210. > {"./"},
  211. > {"./"},
  212. Only in prboom-2.5.0b-gp2x/src/SDL: i_system.c~
  213. diff -r prboom-2.5.0/src/SDL/i_video.c prboom-2.5.0b-gp2x/src/SDL/i_video.c
  214. 46a47,50
  215. > // GP2X needed includes
  216. > #include "gp2x.h"
  217. > #include "g_game.h"
  218. >
  219. 170a175,281
  220. > // GP2X START
  221. > static int currentWeaponKey;
  222. >
  223. > static int getWeaponKey(weapontype_t weapon)
  224. > {
  225. > switch(weapon)
  226. > {
  227. > case wp_fist: return key_weapon1; break;
  228. > case wp_pistol: return key_weapon2; break;
  229. > case wp_shotgun: return key_weapon3; break;
  230. > case wp_chaingun: return key_weapon4; break;
  231. > case wp_missile: return key_weapon5; break;
  232. > case wp_plasma: return key_weapon6; break;
  233. > case wp_bfg: return key_weapon7; break;
  234. > case wp_chainsaw: return key_weapon8; break;
  235. > case wp_supershotgun: return key_weapon9; break;
  236. > default: return wp_pistol; break;
  237. > }
  238. > }
  239. >
  240. > static boolean canSwitchToWeapon(weapontype_t weapon)
  241. > {
  242. > player_t *player = &players[consoleplayer];
  243. > switch(weapon)
  244. > {
  245. > case wp_fist:
  246. > break;
  247. > case wp_pistol:
  248. > return player->ammo[am_clip];
  249. > break;
  250. > case wp_shotgun:
  251. > return player->weaponowned[wp_shotgun] && player->ammo[am_shell];
  252. > break;
  253. > case wp_chaingun:
  254. > return player->weaponowned[wp_chaingun] && player->ammo[am_clip];
  255. > break;
  256. > case wp_missile:
  257. > return player->weaponowned[wp_missile] && player->ammo[am_misl];
  258. > break;
  259. > case wp_plasma:
  260. > return player->weaponowned[wp_plasma] && player->ammo[am_cell];
  261. > break;
  262. > case wp_bfg:
  263. > return player->weaponowned[wp_bfg] && gamemode != shareware &&
  264. > player->ammo[am_cell] >= (demo_compatibility ? 41 : 40);
  265. > break;
  266. > case wp_chainsaw:
  267. > return player->weaponowned[wp_chainsaw];
  268. > break;
  269. > case wp_supershotgun:
  270. > return player->weaponowned[wp_supershotgun] && gamemode == commercial &&
  271. > player->ammo[am_shell] >= (demo_compatibility ? 3 : 2);
  272. > break;
  273. > default:
  274. > return 1;
  275. > break;
  276. > }
  277. > return 1;
  278. > }
  279. >
  280. > static weapontype_t getNextWeapon(weapontype_t weapon)
  281. > {
  282. > boolean finish = 0;
  283. > while(!finish)
  284. > {
  285. > switch(weapon)
  286. > {
  287. > case wp_fist: weapon = wp_chainsaw; break;
  288. > case wp_chainsaw: weapon = wp_pistol; break;
  289. > case wp_pistol: weapon = wp_shotgun; break;
  290. > case wp_shotgun: weapon = wp_supershotgun; break;
  291. > case wp_supershotgun: weapon = wp_chaingun; break;
  292. > case wp_chaingun: weapon = wp_missile; break;
  293. > case wp_missile: weapon = wp_plasma; break;
  294. > case wp_plasma: weapon = wp_bfg; break;
  295. > case wp_bfg: weapon = wp_fist; break;
  296. > default: weapon = wp_pistol; break;
  297. > }
  298. > finish = canSwitchToWeapon(weapon);
  299. > }
  300. > return weapon;
  301. > }
  302. >
  303. > static weapontype_t getPrevWeapon(weapontype_t weapon)
  304. > {
  305. > boolean finish = 0;
  306. > while(!finish)
  307. > {
  308. > switch(weapon)
  309. > {
  310. > case wp_fist: weapon = wp_bfg; break;
  311. > case wp_chainsaw: weapon = wp_fist; break;
  312. > case wp_pistol: weapon = wp_chainsaw; break;
  313. > case wp_shotgun: weapon = wp_pistol; break;
  314. > case wp_supershotgun: weapon = wp_shotgun; break;
  315. > case wp_chaingun: weapon = wp_supershotgun; break;
  316. > case wp_missile: weapon = wp_chaingun; break;
  317. > case wp_plasma: weapon = wp_missile; break;
  318. > case wp_bfg: weapon = wp_plasma; break;
  319. > default: weapon = wp_pistol; break;
  320. > }
  321. > finish = canSwitchToWeapon(weapon);
  322. > }
  323. > return weapon;
  324. > }
  325. > // GP2X END
  326. >
  327. 210a322,366
  328. > // START GP2X
  329. > case SDL_JOYBUTTONDOWN:
  330. > {
  331. > int rc;
  332. > player_t *player;
  333. > weapontype_t weapon;
  334. > switch (Event->jbutton.button)
  335. > {
  336. > case GP2X_BUTTON_L: rc = 'l'; break;
  337. > case GP2X_BUTTON_R: rc = 'r'; break;
  338. > case GP2X_BUTTON_A: rc = 'a'; break;
  339. > case GP2X_BUTTON_B: rc = 'b'; break;
  340. > case GP2X_BUTTON_X: rc = 'x'; break;
  341. > case GP2X_BUTTON_Y: rc = 'y'; break;
  342. > case GP2X_BUTTON_START: rc = KEYD_ENTER; break;
  343. > case GP2X_BUTTON_SELECT: rc = KEYD_ESCAPE; break;
  344. > case GP2X_BUTTON_VOLUP:
  345. > case GP2X_BUTTON_VOLDOWN:
  346. >
  347. > player = &players[consoleplayer];
  348. > if(player->pendingweapon==wp_nochange)
  349. > {
  350. > weapon = player->readyweapon;
  351. > if(Event->jbutton.button==GP2X_BUTTON_VOLUP)
  352. > {
  353. > weapon = getNextWeapon(weapon);
  354. > } else {
  355. > weapon = getPrevWeapon(weapon);
  356. > }
  357. > currentWeaponKey = getWeaponKey(weapon);
  358. > rc = currentWeaponKey;
  359. > } else {
  360. > rc = 0;
  361. > }
  362. > break;
  363. > default: rc = 0; break;
  364. > }
  365. > if(rc!=0)
  366. > {
  367. > event.type = ev_keydown;
  368. > event.data1 = rc;
  369. > D_PostEvent(&event);
  370. > }
  371. > }
  372. > break;
  373. 211a368,394
  374. > case SDL_JOYBUTTONUP:
  375. > {
  376. > int rc;
  377. > switch (Event->jbutton.button)
  378. > {
  379. > case GP2X_BUTTON_L: rc = 'l'; break;
  380. > case GP2X_BUTTON_R: rc = 'r'; break;
  381. > case GP2X_BUTTON_A: rc = 'a'; break;
  382. > case GP2X_BUTTON_B: rc = 'b'; break;
  383. > case GP2X_BUTTON_X: rc = 'x'; break;
  384. > case GP2X_BUTTON_Y: rc = 'y'; break;
  385. > case GP2X_BUTTON_START: rc = KEYD_ENTER; break;
  386. > case GP2X_BUTTON_SELECT: rc = KEYD_ESCAPE; break;
  387. > case GP2X_BUTTON_VOLUP:
  388. > case GP2X_BUTTON_VOLDOWN: rc = currentWeaponKey; break;
  389. > default: rc = 0; break;
  390. > }
  391. > if(rc!=0)
  392. > {
  393. > event.type = ev_keyup;
  394. > event.data1 = rc;
  395. > D_PostEvent(&event);
  396. > }
  397. > }
  398. > break;
  399. > //END GP2X
  400. >
  401. Only in prboom-2.5.0b-gp2x/src/SDL: Makefile
  402. Only in prboom-2.5.0b-gp2x: stamp-h1
  403. Only in prboom-2.5.0b-gp2x/VisualC6: Makefile
  404. Only in prboom-2.5.0b-gp2x/VisualC8: Makefile
  405.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!