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

Updated docs; Removed GP2X support since I won't support this device anymore

Browse source
This commit is contained in:
zicodxx 2007-09-28 22:44:04 +00:00
parent 190ed46530
commit e955dff203
16 changed files with 12 additions and 343 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
20070929
--------
INSTALL.txt, README.txt, SConstruct, arch/sdl/digi_audio.c, arch/sdl/event.c, arch/sdl/gr.c, arch/sdl/joy.c, arch/sdl/key.c, include/physfsx.h, main/gamecntl.c, main/kconfig.c, main/menu.c, main/newmenu.c, main/scores.c: Updated docs; Removed GP2X support since I won't support this device anymore
20070928
--------
main/gameseq.c, main/inferno.c, main/playsave.c: Removed some strlwr calls for -use_players_dir since it uses Uppercase letters

3
INSTALL.txt
View file

@ -29,13 +29,12 @@ Currently, the following variables are supported:
'sharepath=DIR' (*NIX only) use DIR for shared game data. (default: /usr/local/share/games/d2x-rebirth)
'sdl_only=1' don't include OpenGL, use SDL-only instead
'sdlmixer=1' (*NIX only) use SDL_Mixer for sound (includes external music support)
'no_asm=1' don't use ASSEMBLER (only with sdl_only=1)
'asm=1' use ASSEMBLER code (only with sdl_only=1, requires NASM and x86)
'debug=1' build DEBUG binary which includes asserts, debugging output, cheats and more output
'profiler=1' do profiler build
'console=1' build with console support !EXPERIMENTAL!
'editor=1' build editor !EXPERIMENTAL!
'arm=1' compile for ARM architecture
'gp2x=1' compile for GP2X handheld
‘sdlmixer’ as well as ‘editor’ are currently *not* supported and may not work.

4
README.txt
View file

@ -13,7 +13,7 @@ I spend much time to improve the Sourcecode, tried to fix bugs in there and adde
I hope you enjoy the game as you did when you played it the first time.
If you have something to say about my release, feel free to contact me at zico [at] unixboard [dot] de
If you have something to say about my release, feel free to contact me at zicodxx [at] yahoo [dot] de
- zico 20070407
@ -57,4 +57,4 @@ See COPYING.txt
4. Contact
http://www.dxx-rebirth.de/
zico [at] unixboard [dot] de
zicodxx [at] yahoo [dot] de

21
SConstruct
View file

@ -40,7 +40,6 @@ editor = int(ARGUMENTS.get('editor', 0))
console = int(ARGUMENTS.get('console',0))
sdlmixer = int(ARGUMENTS.get('sdlmixer', 0))
arm = int(ARGUMENTS.get('arm', 0))
gp2x = int(ARGUMENTS.get('gp2x', 0))
# general source files
common_sources = [
@ -397,23 +396,6 @@ else:
libs = generic_libs
lflags = '-L/usr/X11R6/lib'
# GP2X test env
if (gp2x == 1):
sdl_only = 1
arm = 1
sharepath = ''
env.Replace(CC = '/gp2xsdk/Tools/bin/arm-gp2x-linux-gcc')
env.Replace(CXX = '/gp2xsdk/Tools/bin/arm-gp2x-linux-g++')
env.Append(CPPDEFINES = ['GP2X', 'NATIVE_IPX'])
env.Append(CPPPATH = ['/gp2xdev/Tools/arm-gp2x-linux/include'])
#env.Append(CPPFLAGS = ' -ffast-math -fPIC -funroll-all-loops -fomit-frame-pointer -march=armv4t') # left for further optimisation/debugging
common_sources += ['main/clock.c']
libs += ['pthread']
lflags = '-static'
lpath = '/gp2xdev/Tools/arm-gp2x-linux/lib'
else:
lpath = ''
# arm architecture?
if (arm == 1):
asm = 0
@ -480,7 +462,7 @@ print '\n'
env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(sharepath) + '\\"')])
# finally building program...
env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags), LIBPATH = str(lpath))
env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags))
if (sys.platform != 'darwin'):
env.Install(BIN_DIR, str(target))
env.Alias('install', BIN_DIR)
@ -512,7 +494,6 @@ Help(PROGRAM_NAME + ', SConstruct file help:' +
'console=1' build with console support !EXPERIMENTAL!
'editor=1' build editor !EXPERIMENTAL!
'arm=1' compile for ARM architecture
'gp2x=1' compile for GP2X handheld
Default values:
""" + ' sharepath = ' + DATA_DIR + """

75
arch/include/gp2x.h
View file

@ -1,75 +0,0 @@
#ifndef _GP2X_H_
#define _GP2X_H_
#include <SDL/SDL.h>
extern SDL_Joystick *gp2xJoystick;
extern int gp2xJoyButtons;
#define GP2X_BUTTON_UP (0)
#define GP2X_BUTTON_DOWN (4)
#define GP2X_BUTTON_LEFT (2)
#define GP2X_BUTTON_RIGHT (6)
#define GP2X_BUTTON_UPLEFT (1)
#define GP2X_BUTTON_UPRIGHT (7)
#define GP2X_BUTTON_DOWNLEFT (3)
#define GP2X_BUTTON_DOWNRIGHT (5)
#define GP2X_BUTTON_A (12)
#define GP2X_BUTTON_B (13)
#define GP2X_BUTTON_X (14)
#define GP2X_BUTTON_Y (15)
#define GP2X_BUTTON_L (10)
#define GP2X_BUTTON_R (11)
#define GP2X_BUTTON_CLICK (18)
#define GP2X_BUTTON_START (8)
#define GP2X_BUTTON_SELECT (9)
#define GP2X_BUTTON_VOLUP (16)
#define GP2X_BUTTON_VOLDOWN (17)
/* map gp2x joy buttons by redefining sdl keys.
reference to key_properties in arch/sdl/key.c.
these buttons should be configured in a player file.
mapped assuning X/Y and L/R buttons are swapped. */
#undef SDLK_ESCAPE
#undef SDLK_LALT
#undef SDLK_MINUS
#undef SDLK_EQUALS
#undef SDLK_a
#undef SDLK_KP_MULTIPLY
#undef SDLK_l
#undef SDLK_r
#undef SDLK_x
#undef SDLK_y
#undef SDLK_UP
#undef SDLK_DOWN
#undef SDLK_LEFT
#undef SDLK_RIGHT
#undef SDLK_KP1
#undef SDLK_KP3
#undef SDLK_KP7
#undef SDLK_KP9
#define SDLK_ESCAPE GP2X_BUTTON_START
#define SDLK_LALT GP2X_BUTTON_SELECT
#define SDLK_MINUS GP2X_BUTTON_VOLDOWN
#define SDLK_EQUALS GP2X_BUTTON_VOLUP
#define SDLK_a GP2X_BUTTON_A
#define SDLK_KP_ENTER GP2X_BUTTON_B
#define SDLK_l GP2X_BUTTON_R
#define SDLK_r GP2X_BUTTON_L
#define SDLK_x GP2X_BUTTON_Y
#define SDLK_y GP2X_BUTTON_X
#define SDLK_UP GP2X_BUTTON_UP
#define SDLK_DOWN GP2X_BUTTON_DOWN
#define SDLK_LEFT GP2X_BUTTON_LEFT
#define SDLK_RIGHT GP2X_BUTTON_RIGHT
#define SDLK_KP1 GP2X_BUTTON_DOWNLEFT
#define SDLK_KP3 GP2X_BUTTON_DOWNRIGHT
#define SDLK_KP7 GP2X_BUTTON_UPLEFT
#define SDLK_KP9 GP2X_BUTTON_UPRIGHT
#endif

4
arch/sdl/digi_audio.c
View file

@ -51,11 +51,7 @@ extern inline fix fixmul(fix x, fix y) { return do_fixmul(x,y); }
//changed on 980905 by adb to increase number of concurrent sounds
#define MAX_SOUND_SLOTS 32
//end changes by adb
#ifdef GP2X
#define SOUND_BUFFER_SIZE 64
#else
#define SOUND_BUFFER_SIZE 512
#endif
#define MIN_VOLUME 10

53
arch/sdl/event.c
View file

@ -15,12 +15,7 @@
#include <SDL/SDL.h>
#ifdef GP2X
#include "gp2x.h"
extern void key_handler(SDL_JoyButtonEvent *event);
#else
extern void key_handler(SDL_KeyboardEvent *event);
#endif
extern void mouse_button_handler(SDL_MouseButtonEvent *mbe);
extern void mouse_motion_handler(SDL_MouseMotionEvent *mme);
#ifndef USE_LINUX_JOY // stpohle - so we can choose at compile time..
@ -31,7 +26,6 @@ extern void joy_axis_handler(SDL_JoyAxisEvent *jae);
static int initialised=0;
#ifndef GP2X
void event_poll()
{
SDL_Event event;
@ -70,53 +64,6 @@ void event_poll()
}
}
}
#else
void event_poll()
{
SDL_Event event;
while(SDL_PollEvent(&event))
{
switch(event.type)
{
case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP:
switch(event.jbutton.button)
{
case GP2X_BUTTON_X:
case GP2X_BUTTON_Y:
case GP2X_BUTTON_A:
case GP2X_BUTTON_B:
case GP2X_BUTTON_UP:
case GP2X_BUTTON_DOWN:
case GP2X_BUTTON_LEFT:
case GP2X_BUTTON_RIGHT:
case GP2X_BUTTON_UPLEFT:
case GP2X_BUTTON_UPRIGHT:
case GP2X_BUTTON_DOWNLEFT:
case GP2X_BUTTON_DOWNRIGHT:
case GP2X_BUTTON_L:
case GP2X_BUTTON_R:
case GP2X_BUTTON_CLICK:
case GP2X_BUTTON_START:
case GP2X_BUTTON_VOLUP:
case GP2X_BUTTON_VOLDOWN:
case GP2X_BUTTON_SELECT:
key_handler((SDL_JoyButtonEvent *)&event);
break;
}
break;
case SDL_QUIT:
{
void quit_request();
quit_request();
}
break;
}
}
}
#endif
int event_init()
{

4
arch/sdl/gr.c
View file

@ -206,12 +206,8 @@ int gr_set_mode(u_int32_t mode)
#ifdef LANDSCAPE
real_screen = SDL_SetVideoMode(h, w, 0, sdl_video_flags);
screen = CreateRotatedSurface(real_screen);
#else
#ifdef GP2X
screen = SDL_SetVideoMode(w, 240, 8, sdl_video_flags);
#else
screen = SDL_SetVideoMode(w, h, 8, sdl_video_flags);
#endif
#endif
// end changes by someone
// end changes by adb

12
arch/sdl/joy.c
View file

@ -21,12 +21,6 @@
#include "text.h"
#include "u_mem.h"
#ifdef GP2X
#include "gp2x.h"
SDL_Joystick *gp2xJoystick;
int gp2xJoyButtons;
#endif
extern char *joybutton_text[]; //from kconfig.c
extern char *joyaxis_text[]; //from kconfig.c
@ -157,17 +151,11 @@ int joy_init()
for (i = 0; i < n; i++) {
con_printf(CON_NORMAL, "sdl-joystick %d: %s\n", i, SDL_JoystickName(i));
SDL_Joysticks[num_joysticks].handle = SDL_JoystickOpen(i);
#ifdef GP2X
gp2xJoystick=SDL_Joysticks[num_joysticks].handle;
#endif
if (SDL_Joysticks[num_joysticks].handle) {
joy_present = 1;
SDL_Joysticks[num_joysticks].n_axes
= SDL_JoystickNumAxes(SDL_Joysticks[num_joysticks].handle);
#ifdef GP2X
gp2xJoyButtons=SDL_Joysticks[num_joysticks].n_buttons;
#endif
if(SDL_Joysticks[num_joysticks].n_axes > MAX_AXES_PER_JOYSTICK)
{
Warning("sdl-joystick: found %d axes, only %d supported. Game may be unstable.\n", SDL_Joysticks[num_joysticks].n_axes, MAX_AXES_PER_JOYSTICK);

20
arch/sdl/key.c
View file

@ -23,10 +23,6 @@
#define KEY_BUFFER_SIZE 16
#ifdef GP2X
#include "gp2x.h"
#endif
static unsigned char Installed = 0;
//-------- Variable accessed by outside functions ---------
@ -366,22 +362,14 @@ unsigned char key_to_ascii(int keycode )
return key_properties[keycode].ascii_value;
}
#ifdef GP2X
void key_handler(SDL_JoyButtonEvent *event)
#else
void key_handler(SDL_KeyboardEvent *event)
#endif
{
ubyte state;
int i, keycode, event_key, key_state;
Key_info *key;
unsigned char temp;
#ifndef GP2X
event_key = event->keysym.sym;
#else
event_key = event->button;
#endif
key_state = (event->state == SDL_PRESSED); // !(wInfo & KF_UP);
//=====================================================
@ -571,9 +559,6 @@ int key_getch()
unsigned int key_get_shift_status()
{
unsigned int shift_status = 0;
#ifdef GP2X
int i, state;
#endif
if ( keyd_pressed[KEY_LSHIFT] || keyd_pressed[KEY_RSHIFT] )
shift_status |= KEY_SHIFTED;
@ -589,11 +574,6 @@ unsigned int key_get_shift_status()
shift_status |=KEY_DEBUGGED;
#endif
#ifdef GP2X
for (i=0;i<gp2xJoyButtons;i++)
state=SDL_JoystickGetButton(gp2xJoystick,i);
#endif
return shift_status;
}

4
include/physfsx.h
View file

@ -50,7 +50,7 @@ static inline void PHYSFSX_init(int argc, char *argv[])
InitArgs( argc,argv );
if (GameArg.SysUserDir
#if defined(__unix__) && !defined(GP2X)
#if defined(__unix__)
|| 1 // or if it's a unix platform
#endif
)
@ -60,7 +60,7 @@ static inline void PHYSFSX_init(int argc, char *argv[])
char *path = GameArg.SysUserDir;
char fullPath[PATH_MAX + 5];
#if defined(__unix__) && !defined(GP2X)
#if defined(__unix__)
if (!GameArg.SysUserDir)
path = "~/.d2x-rebirth";
#endif

10
main/gamecntl.c
View file

@ -204,10 +204,6 @@ void play_test_sound(void);
extern void macintosh_quit(void); // dialog-style quit function
#endif
#ifdef GP2X
extern int digi_volume;
#endif
#define key_isfunc(k) (((k&0xff)>=KEY_F1 && (k&0xff)<=KEY_F10) || (k&0xff)==KEY_F11 || (k&0xff)==KEY_F12)
#define key_ismod(k) ((k&0xff)==KEY_LALT || (k&0xff)==KEY_RALT || (k&0xff)==KEY_LSHIFT || (k&0xff)==KEY_RSHIFT || (k&0xff)==KEY_LCTRL || (k&0xff)==KEY_RCTRL)
@ -1026,9 +1022,6 @@ int HandleSystemKey(int key)
// fleshed these out because F1 and F2 aren't sequenctial keycodes on mac -- MWA
MAC(case KEY_COMMAND+KEY_SHIFTED+KEY_1:)
#ifdef GP2X
case KEY_LALT+KEY_DOWN:
#endif
case KEY_SHIFTED+KEY_F1:
screen_changed = select_next_window_function(0);
break;
@ -1170,9 +1163,6 @@ int HandleSystemKey(int key)
MAC(case KEY_COMMAND+KEY_S:)
MAC(case KEY_COMMAND+KEY_ALTED+KEY_2:)
#ifdef GP2X
case KEY_ALTED + KEY_ESC:
#endif
case KEY_ALTED+KEY_F2:
if (!Player_is_dead && !((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))) {
int rsave, gsave, bsave;

65
main/kconfig.c
View file

@ -64,10 +64,6 @@ static char rcsid[] = "$Id: kconfig.c,v 1.1.1.1 2006/03/17 19:57:17 zicodxx Exp
#include "cntrlcen.h"
#include "collide.h"
#ifdef GP2X
#include "gp2x.h"
#endif
#ifdef OGL
#include "ogl_init.h"
#endif
@ -2087,10 +2083,6 @@ void controls_read_all()
if ((use_joystick) && (Players[Player_num].flags & PLAYER_FLAGS_CONVERTER) && (kc_joystick[53].value < 255) && joy_get_button_state(kc_joystick[53].value))
transfer_energy_to_shield(joy_get_button_down_time(kc_joystick[53].value));
//----------- Read fire_primary_down_count
#ifdef GP2X // deny these controls for GP2X combo actions with SELECT
if (!keyd_pressed[ KEY_LALT ])
#endif
{
if (kc_keyboard[24].value < 255 ) Controls.fire_primary_down_count += key_down_count(kc_keyboard[24].value);
if (kc_keyboard[25].value < 255 ) Controls.fire_primary_down_count += key_down_count(kc_keyboard[25].value);
if ((use_joystick)&&(kc_joystick[0].value < 255 )) Controls.fire_primary_down_count += joy_get_button_down_cnt(kc_joystick[0].value);
@ -2119,7 +2111,7 @@ void controls_read_all()
if ((use_joystick)&&(kc_joystick[1].value < 255 )) Controls.fire_secondary_state |= joy_get_button_state(kc_joystick[1].value);
if ((use_joystick)&&(kc_joystick[32].value < 255 )) Controls.fire_secondary_state |= joy_get_button_state(kc_joystick[32].value);
if ((use_mouse)&&(kc_mouse[1].value < 255) ) Controls.fire_secondary_state |= mouse_button_state(kc_mouse[1].value);
}
//----------- Read fire_flare_down_count
if (kc_keyboard[28].value < 255 ) Controls.fire_flare_down_count += key_down_count(kc_keyboard[28].value);
if (kc_keyboard[29].value < 255 ) Controls.fire_flare_down_count += key_down_count(kc_keyboard[29].value);
@ -2207,61 +2199,6 @@ void controls_read_all()
memset( &Controls, 0, sizeof(control_info) );
}
#endif
#ifdef GP2X
if (keyd_pressed[ KEY_LALT ] && key_down_count( KEY_R )) // SELECT + R = cycle primary
Controls.cycle_primary_count = 1;
if (keyd_pressed[ KEY_LALT ] && key_down_count( KEY_L )) // SELECT + L = cycle seconday
Controls.cycle_secondary_count = 1;
if (keyd_pressed[ KEY_A ] && keyd_pressed[ KEY_R ]) // A + R = fire flare
Controls.fire_flare_down_count = 1;
if (keyd_pressed[ KEY_A ] && keyd_pressed[ KEY_X ]) // A + X = automap
Controls.automap_down_count = 1;
if (keyd_pressed[ KEY_LALT ] && keyd_pressed[ KEY_LEFT ]) // SELECT + STICK LEFT = headlight
Controls.headlight_count = 1;
if ((Players[Player_num].flags & PLAYER_FLAGS_CONVERTER) && keyd_pressed[ KEY_LALT ] && keyd_pressed[ KEY_RIGHT ]) // SELECT + STICK RIGHT = energy->shield
transfer_energy_to_shield(keyd_pressed[ KEY_LALT ] && keyd_pressed[ KEY_RIGHT ]);
if (keyd_pressed[ KEY_PADENTER ] && keyd_pressed[ KEY_Y ]) // B + Y = afterburner
Controls.afterburner_state = 1;
if (keyd_pressed[ KEY_PADENTER ] && keyd_pressed[ KEY_A ]) // B + A = drop bomb
Controls.drop_bomb_down_count = 1;
if (!slide_on) {
if (keyd_pressed[ KEY_PAD1 ]) {
Controls.pitch_time = -FrameTime/2;
Controls.heading_time = -FrameTime/2;
}
if (keyd_pressed[ KEY_PAD3 ]) {
Controls.pitch_time = -FrameTime/2;
Controls.heading_time = FrameTime/2;
}
if (keyd_pressed[ KEY_PAD7 ]) {
Controls.pitch_time = FrameTime/2;
Controls.heading_time = -FrameTime/2;
}
if (keyd_pressed[ KEY_PAD9 ]) {
Controls.pitch_time = FrameTime/2;
Controls.heading_time = FrameTime/2;
}
} else {
if (keyd_pressed[ KEY_PAD1 ]) {
Controls.vertical_thrust_time = -FrameTime/2;
Controls.sideways_thrust_time = -FrameTime/2;
}
if (keyd_pressed[ KEY_PAD3 ]) {
Controls.vertical_thrust_time = -FrameTime/2;
Controls.sideways_thrust_time = FrameTime/2;
}
if (keyd_pressed[ KEY_PAD7 ]) {
Controls.vertical_thrust_time = FrameTime/2;
Controls.sideways_thrust_time = -FrameTime/2;
}
if (keyd_pressed[ KEY_PAD9 ]) {
Controls.vertical_thrust_time = FrameTime/2;
Controls.sideways_thrust_time = FrameTime/2;
}
}
#endif
}
void reset_cruise(void)

57
main/menu.c
View file

@ -224,7 +224,6 @@ void create_main_menu(newmenu_item *m, int *menu_choice, int *callers_num_option
ADD_ITEM(TXT_NEW_GAME,MENU_NEW_GAME,KEY_N);
ADD_ITEM(TXT_LOAD_GAME,MENU_LOAD_GAME,KEY_L);
#ifndef GP2X
#ifdef NETWORK
ADD_ITEM(TXT_MULTIPLAYER_,MENU_MULTIPLAYER,-1);
#endif
@ -232,9 +231,6 @@ void create_main_menu(newmenu_item *m, int *menu_choice, int *callers_num_option
ADD_ITEM(TXT_OPTIONS_, MENU_CONFIG, -1 );
ADD_ITEM(TXT_CHANGE_PILOTS,MENU_NEW_PLAYER,unused);
ADD_ITEM(TXT_VIEW_DEMO,MENU_DEMO_PLAY,0);
#else
ADD_ITEM("CPU SPEED",99,0);
#endif
ADD_ITEM(TXT_VIEW_SCORES,MENU_VIEW_SCORES,KEY_V);
if (cfexist("orderd2.pcx")) /* SHAREWARE */
ADD_ITEM(TXT_ORDERING_INFO,MENU_ORDER_INFO,-1);
@ -430,11 +426,6 @@ void do_option ( int select)
songs_stop_all();
credits_show(NULL);
break;
#ifdef GP2X
case 99:
do_cpu_menu();
break;
#endif
default:
Error("Unknown option %d in do_option",select);
break;
@ -652,7 +643,6 @@ void do_new_game_menu()
if (player_highest_level > Last_level)
player_highest_level = Last_level;
#ifndef GP2X
if (player_highest_level > 1) {
newmenu_item m[4];
char info_text[80];
@ -667,12 +657,6 @@ try_again:
m[1].type=NM_TYPE_INPUT; m[1].text_len = 10; m[1].text = num_text;
n_items = 2;
#ifdef WINDOWS
m[2].type = NM_TYPE_TEXT; m[2].text = "";
m[3].type = NM_TYPE_MENU; m[3].text = " Ok";
n_items = 4;
#endif
strcpy(num_text,"1");
choice = newmenu_do( NULL, TXT_SELECT_START_LEV, n_items, m, NULL );
@ -688,7 +672,7 @@ try_again:
goto try_again;
}
}
#endif
Difficulty_level = Player_default_difficulty;
if (!do_difficulty_menu())
@ -1036,42 +1020,3 @@ void do_ip_manual_join_menu()
} while( choice > -1 );
}
#endif // NETWORK
#ifdef GP2X
extern void SetClock(unsigned int MHZ);
void change_cpu_poll()
{
}
void do_cpu_menu()
{
// edited 05/27/99 Matt Mueller - ingame fullscreen changing
newmenu_item m[12];
u_int32_t modes[12];
int i = 0, mc = 0, num_presets = 0;
//end edit -MM
unsigned int cpu_speed = 200;
m[mc].type = NM_TYPE_RADIO; m[mc].text = "200 Mhz"; m[mc].value = (cpu_speed == 200); m[mc].group = 0; modes[mc] = 200; mc++;
m[mc].type = NM_TYPE_RADIO; m[mc].text = "233 Mhz"; m[mc].value = (cpu_speed == 233); m[mc].group = 0; modes[mc] = 233; mc++;
m[mc].type = NM_TYPE_RADIO; m[mc].text = "250 Mhz"; m[mc].value = (cpu_speed == 250); m[mc].group = 0; modes[mc] = 250; mc++;
m[mc].type = NM_TYPE_RADIO; m[mc].text = "266 Mhz"; m[mc].value = (cpu_speed == 266); m[mc].group = 0; modes[mc] = 266; mc++;
m[mc].type = NM_TYPE_RADIO; m[mc].text = "275 Mhz"; m[mc].value = (cpu_speed == 275); m[mc].group = 0; modes[mc] = 275; mc++;
num_presets = mc;
m[mc].value=0; // make sure we count and reach the right selection
for (i = 0; i < mc; i++)
if (m[mc].value)
break;
i = newmenu_do1(NULL, "CPU SPEED", mc, m, &change_cpu_poll, 0);
cpu_speed = modes[i];
if (cpu_speed >= 200 && cpu_speed <= 275) {
printf("Set CPU Clock...(%i)\n",cpu_speed);
SetClock(cpu_speed);
}
}
#endif

13
main/newmenu.c
View file

@ -81,10 +81,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "ogl_init.h"
#endif
#ifdef GP2X
#include "gp2x.h"
#endif
#define MAXDISPLAYABLEITEMS 15
#define LHX(x) (FONTSCALE_X((x)*(HiresGFX?2:1)))
@ -1305,9 +1301,6 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item,
break;
case KEY_ENTER:
case KEY_PADENTER:
#ifdef GP2X
case GP2X_BUTTON_B:
#endif
if ( (choice>-1) && (item[choice].type==NM_TYPE_INPUT_MENU) && (item[choice].group==0)) {
item[choice].group = 1;
item[choice].redraw = 1;
@ -2215,9 +2208,6 @@ ReadFileNames:
break;
case KEY_ENTER:
case KEY_PADENTER:
#ifdef GP2X
case GP2X_BUTTON_B:
#endif
done = 1;
break;
@ -2614,9 +2604,6 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
break;
case KEY_ENTER:
case KEY_PADENTER:
#ifdef GP2X
case GP2X_BUTTON_B:
#endif
done = 1;
break;

6
main/scores.c
View file

@ -234,10 +234,8 @@ void scores_fill_struct(stats_info * stats)
void scores_maybe_add_player(int abort_flag)
{
#ifndef GP2X
char text1[COOL_MESSAGE_LEN+10];
newmenu_item m[10];
#endif
int i,position;
#ifdef APPLE_DEMO // no high scores in apple oem version
@ -263,7 +261,6 @@ void scores_maybe_add_player(int abort_flag)
scores_fill_struct( &Last_game );
} else {
if ( position==0 ) {
#ifndef GP2X
strcpy( text1, "" );
m[0].type = NM_TYPE_TEXT; m[0].text = TXT_COOL_SAYING;
m[1].type = NM_TYPE_INPUT; m[1].text = text1; m[1].text_len = COOL_MESSAGE_LEN-5;
@ -271,9 +268,6 @@ void scores_maybe_add_player(int abort_flag)
strncpy( Scores.cool_saying, text1, COOL_MESSAGE_LEN );
if (strlen(Scores.cool_saying)<1)
sprintf( Scores.cool_saying, "No Comment" );
#else
sprintf( Scores.cool_saying, " " );
#endif
} else {
nm_messagebox( TXT_HIGH_SCORE, 1, TXT_OK, "%s %s!", TXT_YOU_PLACED, *(&TXT_1ST + position) );
}