mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-26 13:34:22 +01:00
Rename
This commit is contained in:
parent
fb24e20c76
commit
32e422327c
5
Makefile
5
Makefile
@ -7,9 +7,8 @@ all: menu
|
|||||||
|
|
||||||
menu.oo: menu.cpp menu.hh utils.hh font.hh Makefile
|
menu.oo: menu.cpp menu.hh utils.hh font.hh Makefile
|
||||||
|
|
||||||
gui.oo: gui.cpp gui.hh font.hh menu.hh \
|
gui.oo: Makefile gui.cpp gui.hh font.hh menu.hh sdl_ttf_font.hh \
|
||||||
sdl_ttf_font.hh dialogue_box.hh help_box.hh main_menu.hh \
|
dialogue_box.hh help_box.hh main_menu.cpp
|
||||||
Makefile
|
|
||||||
|
|
||||||
utils.oo: utils.cpp utils.hh Makefile
|
utils.oo: utils.cpp utils.hh Makefile
|
||||||
|
|
||||||
|
7
gui.cpp
7
gui.cpp
@ -7,12 +7,13 @@
|
|||||||
#include "help_box.hh"
|
#include "help_box.hh"
|
||||||
#include "dialogue_box.hh"
|
#include "dialogue_box.hh"
|
||||||
#include "sdl_ttf_font.hh"
|
#include "sdl_ttf_font.hh"
|
||||||
#include "main_menu.hh"
|
|
||||||
#include "utils.hh"
|
#include "utils.hh"
|
||||||
|
|
||||||
extern SDL_Surface *screen;
|
extern SDL_Surface *screen;
|
||||||
|
|
||||||
class Gui;
|
class Gui;
|
||||||
|
class MainMenu;
|
||||||
|
class MainView;
|
||||||
|
|
||||||
static const char *get_theme_path(const char *dir, const char *what)
|
static const char *get_theme_path(const char *dir, const char *what)
|
||||||
{
|
{
|
||||||
@ -25,6 +26,9 @@ static const char *get_theme_path(const char *dir, const char *what)
|
|||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* These are a bit of special cases... */
|
||||||
|
#include "main_menu.cpp"
|
||||||
|
|
||||||
Gui::Gui()
|
Gui::Gui()
|
||||||
{
|
{
|
||||||
this->focus = NULL;
|
this->focus = NULL;
|
||||||
@ -112,7 +116,6 @@ void Gui::runLogic(void)
|
|||||||
cur_view->runLogic();
|
cur_view->runLogic();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Gui::pushView(GuiView *view)
|
void Gui::pushView(GuiView *view)
|
||||||
{
|
{
|
||||||
int cur = this->n_views;
|
int cur = this->n_views;
|
||||||
|
Loading…
Reference in New Issue
Block a user