ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

msgbox now warns if 3D is used (one time per game / reset)

This commit is contained in:
damdoum 2007-02-24 08:49:23 +00:00
parent 485b27690f
commit 7414276a4b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/gtk-glade/desmume.c
View File

@ -26,6 +26,7 @@ gboolean EmuLoop(gpointer data);
static BOOL regMainLoop = FALSE; static BOOL regMainLoop = FALSE;
static BOOL noticed_3D=FALSE;
volatile BOOL execute = FALSE; volatile BOOL execute = FALSE;
BOOL click = FALSE; BOOL click = FALSE;
BOOL fini = FALSE; BOOL fini = FALSE;
@ -54,6 +55,7 @@ void desmume_free()
int desmume_open(const char *filename) int desmume_open(const char *filename)
{ {
int i; int i;
noticed_3D=attempted_3D_op=FALSE;
clear_savestates(); clear_savestates();
i = NDS_LoadROM(filename, savetype, savesize); i = NDS_LoadROM(filename, savetype, savesize);
return i; return i;
@ -81,6 +83,7 @@ void desmume_resume()
void desmume_reset() void desmume_reset()
{ {
noticed_3D=attempted_3D_op=FALSE;
NDS_Reset(); NDS_Reset();
desmume_resume(); desmume_resume();
} }
@ -118,7 +121,12 @@ static void Draw()
gboolean EmuLoop(gpointer data) gboolean EmuLoop(gpointer data)
{ {
int i; int i;
if (!noticed_3D && attempted_3D_op) {
GtkWidget * dlg = glade_xml_get_widget(xml, "w3Dop");
gtk_widget_show(dlg);
noticed_3D=TRUE;
}
if(desmume_running()) /* Si on est en train d'executer le programme ... */ if(desmume_running()) /* Si on est en train d'executer le programme ... */
{ {
fps_FrameCount += Frameskip + 1; fps_FrameCount += Frameskip + 1;

7
desmume/src/gtk-glade/gdk_gl.c
View File

@ -232,13 +232,6 @@ gboolean screen (GtkWidget * widget, int viewportscreen) {
float bright_color = 0.0f; // blend with black float bright_color = 0.0f; // blend with black
float bright_alpha = 0.0f; // don't blend float bright_alpha = 0.0f; // don't blend
struct _MASTER_BRIGHT * mBright; struct _MASTER_BRIGHT * mBright;
static BOOL noticed_3D=FALSE;
if (!noticed_3D && attempted_3D_op) {
GtkWidget * dlg = glade_xml_get_widget(xml, "w3Dop");
gtk_widget_show(dlg);
noticed_3D=TRUE;
}
// we take care to draw the right thing the right place // we take care to draw the right thing the right place
// we need to rearrange widgets not to use this trick // we need to rearrange widgets not to use this trick