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

Move */main/newmenu.c -> similar/main/newmenu.c

Browse source
This commit is contained in:
Kp 2013-03-03 01:03:33 +00:00
parent 15f569d5b1
commit 5cf2b5873b
3 changed files with 11 additions and 2198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -380,6 +380,7 @@ class DXXProgram(DXXCommon):
'main/kmatrix.c',
'main/mglobal.c',
'main/morph.c',
'main/newmenu.c',
'mem/mem.c',
'misc/hash.c',
'misc/physfsx.c',
@ -622,7 +623,6 @@ class D1XProgram(DXXProgram):
'main/multi.c',
'main/multibot.c',
'main/newdemo.c',
'main/newmenu.c',
'main/object.c',
'main/paging.c',
'main/physics.c',
@ -747,7 +747,6 @@ class D2XProgram(DXXProgram):
'main/multi.c',
'main/multibot.c',
'main/newdemo.c',
'main/newmenu.c',
'main/object.c',
'main/paging.c',
'main/physics.c',

2194
d1x-rebirth/main/newmenu.c
View file

File diff suppressed because it is too large Load diff

12
d2x-rebirth/main/newmenu.c → similar/main/newmenu.c
View file

@ -57,8 +57,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "playsave.h"
#include "automap.h"
#include "rbaudio.h"
#if defined(DXX_BUILD_DESCENT_II)
#include "args.h"
#include "gamepal.h"
#endif
#ifdef OGL
#include "ogl_init.h"
@ -130,8 +132,9 @@ void nm_draw_background1(char * filename)
gr_palette_load( gr_palette );
show_fullscr(&nm_background1);
}
#if defined(DXX_BUILD_DESCENT_II)
strcpy(last_palette_loaded,""); //force palette load next time
#endif
}
#define MENU_BACKGROUND_BITMAP_HIRES (PHYSFSX_exists("scoresb.pcx",1)?"scoresb.pcx":"scores.pcx")
@ -1512,7 +1515,12 @@ int newmenu_handler(window *wind, d_event *event, newmenu *menu)
case EVENT_WINDOW_DEACTIVATED:
//event_toggle_focus(1); // No cursor recentering
key_toggle_repeat(1);
#if defined(DXX_BUILD_DESCENT_I)
#define DXX_KEY_TOGGLE_REPEAT_VALUE 0
#elif defined(DXX_BUILD_DESCENT_II)
#define DXX_KEY_TOGGLE_REPEAT_VALUE 1
#endif
key_toggle_repeat(DXX_KEY_TOGGLE_REPEAT_VALUE);
menu->mouse_state = 0;
break;