The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-25 12:06:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do menu_init in sdlgfx

Browse Source
This commit is contained in:
simon.kagstrom 2009-05-12 16:03:59 +00:00
parent ca56facf7b
commit 4ba2064844
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gfx-sdl/sdlgfx.c
View File

@ -56,7 +56,9 @@
#endif #endif
static SDL_Surface *display; static SDL_Surface *display;
SDL_Surface *screen; static SDL_Surface *screen;
extern void menu_init(SDL_Surface *screen);
/* Standard P96 screen modes */ /* Standard P96 screen modes */
#define MAX_SCREEN_MODES 12 #define MAX_SCREEN_MODES 12
@ -939,6 +941,7 @@ static int graphics_subinit (void)
gui_message ("Unable to set video mode: %s\n", SDL_GetError ()); gui_message ("Unable to set video mode: %s\n", SDL_GetError ());
return 0; return 0;
} else { } else {
menu_init(screen);
/* Just in case we didn't get exactly what we asked for . . . */ /* Just in case we didn't get exactly what we asked for . . . */
fullscreen = ((screen->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN); fullscreen = ((screen->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN);
is_hwsurface = ((screen->flags & SDL_HWSURFACE) == SDL_HWSURFACE); is_hwsurface = ((screen->flags & SDL_HWSURFACE) == SDL_HWSURFACE);

13
src/gui-sdl/gui-sdl.c
View File

@ -14,8 +14,6 @@
#include "uae.h" #include "uae.h"
#include "menu.h" #include "menu.h"
extern SDL_Surface *screen;
static const char *main_menu_messages[] = { static const char *main_menu_messages[] = {
/*00*/ "Floppy", /*00*/ "Floppy",
/*01*/ "^|df0|df1|df2|df3", /*01*/ "^|df0|df1|df2|df3",
@ -120,19 +118,12 @@ static void insert_floppy(int which)
void gui_display(int shortcut) void gui_display(int shortcut)
{ {
static int is_inited = 0;
int submenus[3]; int submenus[3];
int opt; int opt;
memset(submenus, 0, sizeof(submenus)); memset(submenus, 0, sizeof(submenus));
printf("Initing gui with %d\n", shortcut); printf("gui_display: %d\n", shortcut);
printf("Al-mibb: Gui is display!\n");
if (!is_inited)
{
menu_init(screen);
is_inited = 1;
}
opt = menu_select_title("Main menu", main_menu_messages, submenus); opt = menu_select_title("Main menu", main_menu_messages, submenus);
switch(opt) switch(opt)
{ {
@ -156,7 +147,7 @@ void gui_message (const char *format,...)
char msg[2048]; char msg[2048];
va_list parms; va_list parms;
printf("Al-mibb: Gui is al-message!\n"); printf("Al-mibb: Gui message!\n");
va_start (parms,format); va_start (parms,format);
vsprintf ( msg, format, parms); vsprintf ( msg, format, parms);