Cleanup the recent hud addition: remove unneeded function calls and includes and put hud initialization code in the same place.
This commit is contained in:
parent
1ba3351f6e
commit
2f1c14fe33
|
@ -54,8 +54,6 @@
|
||||||
#include "../saves.h"
|
#include "../saves.h"
|
||||||
#include "../mic.h"
|
#include "../mic.h"
|
||||||
#include "../GPU_osd.h"
|
#include "../GPU_osd.h"
|
||||||
#include "../aggdraw.h"
|
|
||||||
#include "../agg2d.h"
|
|
||||||
#ifdef GDB_STUB
|
#ifdef GDB_STUB
|
||||||
#include "../gdbstub.h"
|
#include "../gdbstub.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -810,7 +808,6 @@ int main(int argc, char ** argv) {
|
||||||
#else
|
#else
|
||||||
NDS_Init();
|
NDS_Init();
|
||||||
#endif
|
#endif
|
||||||
Desmume_InitOnce();
|
|
||||||
|
|
||||||
/* Create the dummy firmware */
|
/* Create the dummy firmware */
|
||||||
NDS_CreateDummyFirmware( &fw_config);
|
NDS_CreateDummyFirmware( &fw_config);
|
||||||
|
@ -948,12 +945,12 @@ int main(int argc, char ** argv) {
|
||||||
loadstate_slot(my_config.load_slot);
|
loadstate_slot(my_config.load_slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Desmume_InitOnce();
|
||||||
Hud.reset();
|
Hud.reset();
|
||||||
|
|
||||||
while(!sdl_quit) {
|
while(!sdl_quit) {
|
||||||
desmume_cycle(&sdl_quit, &boost, &my_config);
|
desmume_cycle(&sdl_quit, &boost, &my_config);
|
||||||
|
|
||||||
aggDraw.hud->attach(GPU_screen, 256, 384, 256*2);
|
|
||||||
osd->update();
|
osd->update();
|
||||||
DrawHUD();
|
DrawHUD();
|
||||||
#ifdef INCLUDE_OPENGL_2D
|
#ifdef INCLUDE_OPENGL_2D
|
||||||
|
|
Loading…
Reference in New Issue