Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- superjamie@one:~/Desktop/src$ diff -r prboom-2.5.0 prboom-2.5.0b-gp2x
- Only in prboom-2.5.0b-gp2x: COMPILE.GP2X
- diff -r prboom-2.5.0/config.h prboom-2.5.0b-gp2x/config.h
- 12c12
- < #define DOOMWADDIR "/usr/local/share/games/doom"
- ---
- > #define DOOMWADDIR "./wads"
- 15c15
- < #define GL_DOOM 1
- ---
- > /* #undef GL_DOOM */
- 37c37
- < #define HAVE_INTTYPES_H 1
- ---
- > /* #undef HAVE_INTTYPES_H */
- 40c40
- < #define HAVE_IPv6 1
- ---
- > /* #undef HAVE_IPv6 */
- 46c46
- < #define HAVE_LIBPNG 1
- ---
- > // #define HAVE_LIBPNG
- 49c49
- < /* #undef HAVE_LIBSDL_MIXER */
- ---
- > #define HAVE_LIBSDL_MIXER
- 55c55
- < #define HAVE_MEMORY_H 1
- ---
- > /* #undef HAVE_MEMORY_H */
- 76c76
- < #define HAVE_STDINT_H 1
- ---
- > /* #undef HAVE_STDINT_H */
- 79c79
- < #define HAVE_STDLIB_H 1
- ---
- > /* #undef HAVE_STDLIB_H */
- 82c82
- < #define HAVE_STRINGS_H 1
- ---
- > /* #undef HAVE_STRINGS_H */
- 85c85
- < #define HAVE_STRING_H 1
- ---
- > /* #undef HAVE_STRING_H */
- 88c88
- < #define HAVE_SYS_STAT_H 1
- ---
- > /* #undef HAVE_SYS_STAT_H */
- 91c91
- < #define HAVE_SYS_TYPES_H 1
- ---
- > /* #undef HAVE_SYS_TYPES_H */
- 94c94
- < #define HAVE_SYS_WAIT_H 1
- ---
- > /* #undef HAVE_SYS_WAIT_H */
- 113c113
- < #define I386_ASM 1
- ---
- > /* #undef I386_ASM */
- 158c158
- < #define STDC_HEADERS 1
- ---
- > /* #undef STDC_HEADERS */
- 165c165
- < #define USE_GLU_IMAGESCALE 1
- ---
- > /* #undef USE_GLU_IMAGESCALE */
- 168c168
- < #define USE_GLU_MIPMAP 1
- ---
- > /* #undef USE_GLU_MIPMAP */
- 191c191
- < /* #undef gid_t */
- ---
- > //#define gid_t int
- 209c209
- < /* #undef uid_t */
- ---
- > //#define uid_t int
- Only in prboom-2.5.0b-gp2x: config.log
- Only in prboom-2.5.0b-gp2x: config.status
- Only in prboom-2.5.0b-gp2x/data: Makefile
- Only in prboom-2.5.0b-gp2x/doc: Makefile
- Only in prboom-2.5.0b-gp2x/ICONS: Makefile
- Only in prboom-2.5.0b-gp2x: Makefile
- Only in prboom-2.5.0b-gp2x: pr_config.sh
- Only in prboom-2.5.0b-gp2x: pr_make.sh
- Only in prboom-2.5.0b-gp2x: README-GP2X.txt
- Only in prboom-2.5.0b-gp2x/src: .deps
- Only in prboom-2.5.0b-gp2x/src/MAC: Makefile
- Only in prboom-2.5.0b-gp2x/src: Makefile
- Only in prboom-2.5.0b-gp2x/src/POSIX: .deps
- Only in prboom-2.5.0b-gp2x/src/POSIX: Makefile
- Only in prboom-2.5.0b-gp2x/src/SDL: .deps
- Only in prboom-2.5.0b-gp2x/src/SDL: gp2x.h
- diff -r prboom-2.5.0/src/SDL/i_joy.c prboom-2.5.0b-gp2x/src/SDL/i_joy.c
- 48a49,50
- > #include "gp2x.h"
- >
- 64a67,70
- > // Gp2X 0 UP 1 LEFT 2 DOWN 3 RIGHT
- > int directionsCurrentState[4];
- > int directionsPastState[4];
- >
- 71a78,130
- >
- > // GP2X Start
- > int i;
- > for (i = 0; i < 4; i++)
- > {
- > directionsPastState[i] = directionsCurrentState[i];
- > }
- >
- > directionsCurrentState[0] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_UP) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPLEFT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPRIGHT));
- > directionsCurrentState[1] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_LEFT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPLEFT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNLEFT));
- > directionsCurrentState[2] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWN) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNLEFT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNRIGHT));
- > directionsCurrentState[3] = (SDL_JoystickGetButton(joystick, GP2X_BUTTON_RIGHT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_UPRIGHT) |
- > SDL_JoystickGetButton(joystick, GP2X_BUTTON_DOWNRIGHT));
- >
- >
- > for (i = 0; i < 4; i++)
- > {
- > if(directionsCurrentState[i]!=directionsPastState[i])
- > {
- > event_t ev;
- > if(directionsCurrentState[i]) ev.type = ev_keydown;
- > else ev.type = ev_keyup;
- > switch(i)
- > {
- > case 0: ev.data1 = KEYD_UPARROW; break;
- > case 1: ev.data1 = KEYD_LEFTARROW; break;
- > case 2: ev.data1 = KEYD_DOWNARROW; break;
- > case 3: ev.data1 = KEYD_RIGHTARROW; break;
- > }
- > D_PostEvent(&ev);
- > }
- > }
- >
- > if(SDL_JoystickGetButton(joystick, GP2X_BUTTON_CLICK))
- > {
- > event_t ev;
- > ev.type = ev_joystick;
- > ev.data1 = (SDL_JoystickGetButton(joystick, 18)<<0);
- > ev.data2 = 0;
- > ev.data3 = 0;
- > D_PostEvent(&ev);
- > }
- > //END GP2X
- >
- > //COMMENT OUT GP2X
- > /*
- 85a145
- > */
- 114a175,183
- >
- > // GP2X START
- > int i;
- > for (i = 0; i < 4; i++)
- > {
- > directionsCurrentState[i] = 0;
- > directionsPastState[i] = 0;
- > }
- > // GP2X END
- diff -r prboom-2.5.0/src/SDL/i_sound.c prboom-2.5.0b-gp2x/src/SDL/i_sound.c
- 517c517,519
- < audio_buffers = SAMPLECOUNT*snd_samplerate/11025;
- ---
- > //audio_buffers = SAMPLECOUNT*snd_samplerate/11025;
- >
- > audio_buffers = 512; // GP2X Requirement
- 602,603c604,606
- < music_tmp = strdup("/tmp/prboom-music-XXXXXX");
- < {
- ---
- > // Edit for GP2X
- > music_tmp = strdup("./prboom-music");
- > /*{
- 606c609
- < lprintf(LO_ERROR, "I_InitMusic: failed to create music temp file %s", music_tmp);
- ---
- > lprintf(LO_ERROR, "I_InitMusic: failed to create music temp file %s\n", music_tmp);
- 610c613
- < }
- ---
- > }*/
- diff -r prboom-2.5.0/src/SDL/i_system.c prboom-2.5.0b-gp2x/src/SDL/i_system.c
- 285c285
- < static const char prboom_dir[] = {"/.prboom"}; // Mead rem extra slash 8/21/03
- ---
- > static const char prboom_dir[] = {"."}; // Mead rem extra slash 8/21/03
- 348,351c348,351
- < {"/usr/local/share/games/doom"},
- < {"/usr/share/games/doom"},
- < {"/usr/local/share/doom"},
- < {"/usr/share/doom"},
- ---
- > {"./"},
- > {"./"},
- > {"./"},
- > {"./"},
- Only in prboom-2.5.0b-gp2x/src/SDL: i_system.c~
- diff -r prboom-2.5.0/src/SDL/i_video.c prboom-2.5.0b-gp2x/src/SDL/i_video.c
- 46a47,50
- > // GP2X needed includes
- > #include "gp2x.h"
- > #include "g_game.h"
- >
- 170a175,281
- > // GP2X START
- > static int currentWeaponKey;
- >
- > static int getWeaponKey(weapontype_t weapon)
- > {
- > switch(weapon)
- > {
- > case wp_fist: return key_weapon1; break;
- > case wp_pistol: return key_weapon2; break;
- > case wp_shotgun: return key_weapon3; break;
- > case wp_chaingun: return key_weapon4; break;
- > case wp_missile: return key_weapon5; break;
- > case wp_plasma: return key_weapon6; break;
- > case wp_bfg: return key_weapon7; break;
- > case wp_chainsaw: return key_weapon8; break;
- > case wp_supershotgun: return key_weapon9; break;
- > default: return wp_pistol; break;
- > }
- > }
- >
- > static boolean canSwitchToWeapon(weapontype_t weapon)
- > {
- > player_t *player = &players[consoleplayer];
- > switch(weapon)
- > {
- > case wp_fist:
- > break;
- > case wp_pistol:
- > return player->ammo[am_clip];
- > break;
- > case wp_shotgun:
- > return player->weaponowned[wp_shotgun] && player->ammo[am_shell];
- > break;
- > case wp_chaingun:
- > return player->weaponowned[wp_chaingun] && player->ammo[am_clip];
- > break;
- > case wp_missile:
- > return player->weaponowned[wp_missile] && player->ammo[am_misl];
- > break;
- > case wp_plasma:
- > return player->weaponowned[wp_plasma] && player->ammo[am_cell];
- > break;
- > case wp_bfg:
- > return player->weaponowned[wp_bfg] && gamemode != shareware &&
- > player->ammo[am_cell] >= (demo_compatibility ? 41 : 40);
- > break;
- > case wp_chainsaw:
- > return player->weaponowned[wp_chainsaw];
- > break;
- > case wp_supershotgun:
- > return player->weaponowned[wp_supershotgun] && gamemode == commercial &&
- > player->ammo[am_shell] >= (demo_compatibility ? 3 : 2);
- > break;
- > default:
- > return 1;
- > break;
- > }
- > return 1;
- > }
- >
- > static weapontype_t getNextWeapon(weapontype_t weapon)
- > {
- > boolean finish = 0;
- > while(!finish)
- > {
- > switch(weapon)
- > {
- > case wp_fist: weapon = wp_chainsaw; break;
- > case wp_chainsaw: weapon = wp_pistol; break;
- > case wp_pistol: weapon = wp_shotgun; break;
- > case wp_shotgun: weapon = wp_supershotgun; break;
- > case wp_supershotgun: weapon = wp_chaingun; break;
- > case wp_chaingun: weapon = wp_missile; break;
- > case wp_missile: weapon = wp_plasma; break;
- > case wp_plasma: weapon = wp_bfg; break;
- > case wp_bfg: weapon = wp_fist; break;
- > default: weapon = wp_pistol; break;
- > }
- > finish = canSwitchToWeapon(weapon);
- > }
- > return weapon;
- > }
- >
- > static weapontype_t getPrevWeapon(weapontype_t weapon)
- > {
- > boolean finish = 0;
- > while(!finish)
- > {
- > switch(weapon)
- > {
- > case wp_fist: weapon = wp_bfg; break;
- > case wp_chainsaw: weapon = wp_fist; break;
- > case wp_pistol: weapon = wp_chainsaw; break;
- > case wp_shotgun: weapon = wp_pistol; break;
- > case wp_supershotgun: weapon = wp_shotgun; break;
- > case wp_chaingun: weapon = wp_supershotgun; break;
- > case wp_missile: weapon = wp_chaingun; break;
- > case wp_plasma: weapon = wp_missile; break;
- > case wp_bfg: weapon = wp_plasma; break;
- > default: weapon = wp_pistol; break;
- > }
- > finish = canSwitchToWeapon(weapon);
- > }
- > return weapon;
- > }
- > // GP2X END
- >
- 210a322,366
- > // START GP2X
- > case SDL_JOYBUTTONDOWN:
- > {
- > int rc;
- > player_t *player;
- > weapontype_t weapon;
- > switch (Event->jbutton.button)
- > {
- > case GP2X_BUTTON_L: rc = 'l'; break;
- > case GP2X_BUTTON_R: rc = 'r'; break;
- > case GP2X_BUTTON_A: rc = 'a'; break;
- > case GP2X_BUTTON_B: rc = 'b'; break;
- > case GP2X_BUTTON_X: rc = 'x'; break;
- > case GP2X_BUTTON_Y: rc = 'y'; break;
- > case GP2X_BUTTON_START: rc = KEYD_ENTER; break;
- > case GP2X_BUTTON_SELECT: rc = KEYD_ESCAPE; break;
- > case GP2X_BUTTON_VOLUP:
- > case GP2X_BUTTON_VOLDOWN:
- >
- > player = &players[consoleplayer];
- > if(player->pendingweapon==wp_nochange)
- > {
- > weapon = player->readyweapon;
- > if(Event->jbutton.button==GP2X_BUTTON_VOLUP)
- > {
- > weapon = getNextWeapon(weapon);
- > } else {
- > weapon = getPrevWeapon(weapon);
- > }
- > currentWeaponKey = getWeaponKey(weapon);
- > rc = currentWeaponKey;
- > } else {
- > rc = 0;
- > }
- > break;
- > default: rc = 0; break;
- > }
- > if(rc!=0)
- > {
- > event.type = ev_keydown;
- > event.data1 = rc;
- > D_PostEvent(&event);
- > }
- > }
- > break;
- 211a368,394
- > case SDL_JOYBUTTONUP:
- > {
- > int rc;
- > switch (Event->jbutton.button)
- > {
- > case GP2X_BUTTON_L: rc = 'l'; break;
- > case GP2X_BUTTON_R: rc = 'r'; break;
- > case GP2X_BUTTON_A: rc = 'a'; break;
- > case GP2X_BUTTON_B: rc = 'b'; break;
- > case GP2X_BUTTON_X: rc = 'x'; break;
- > case GP2X_BUTTON_Y: rc = 'y'; break;
- > case GP2X_BUTTON_START: rc = KEYD_ENTER; break;
- > case GP2X_BUTTON_SELECT: rc = KEYD_ESCAPE; break;
- > case GP2X_BUTTON_VOLUP:
- > case GP2X_BUTTON_VOLDOWN: rc = currentWeaponKey; break;
- > default: rc = 0; break;
- > }
- > if(rc!=0)
- > {
- > event.type = ev_keyup;
- > event.data1 = rc;
- > D_PostEvent(&event);
- > }
- > }
- > break;
- > //END GP2X
- >
- Only in prboom-2.5.0b-gp2x/src/SDL: Makefile
- Only in prboom-2.5.0b-gp2x: stamp-h1
- Only in prboom-2.5.0b-gp2x/VisualC6: Makefile
- Only in prboom-2.5.0b-gp2x/VisualC8: Makefile
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement