From e9ebd7df1812af28e9a5e240963b94e55dd55895 Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Mon, 22 Jun 2009 07:53:38 +0000
Subject: [PATCH] Fix compilation with EXPERIMENTAL_GBASLOT defined.

---
 desmume/src/cli/main.cpp          | 8 +++++++-
 desmume/src/gtk-glade/desmume.cpp | 4 ++++
 desmume/src/gtk/main.cpp          | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp
index 2748a4b02..739bbf052 100644
--- a/desmume/src/cli/main.cpp
+++ b/desmume/src/cli/main.cpp
@@ -732,6 +732,7 @@ int main(int argc, char ** argv) {
   SDL_TimerID limiter_timer = NULL;
   int sdl_quit = 0;
   int boost = 0;
+  int error;
 
 #ifdef DISPLAY_FPS
   u32 fps_timing = 0;
@@ -806,7 +807,12 @@ int main(int argc, char ** argv) {
 
   backup_setManualBackupType(my_config.savetype);
 
-  if (NDS_LoadROM( my_config.nds_file, my_config.cflash_disk_image_file) < 0) {
+#ifdef EXPERIMENTAL_GBASLOT
+  error = NDS_LoadROM( my_config.nds_file );
+#else
+  error = NDS_LoadROM( my_config.nds_file, my_config.cflash_disk_image_file );
+#endif
+  if (error < 0) {
     fprintf(stderr, "error while loading %s\n", my_config.nds_file);
     exit(-1);
   }
diff --git a/desmume/src/gtk-glade/desmume.cpp b/desmume/src/gtk-glade/desmume.cpp
index 8fa3dda36..be83830e9 100755
--- a/desmume/src/gtk-glade/desmume.cpp
+++ b/desmume/src/gtk-glade/desmume.cpp
@@ -63,7 +63,11 @@ int desmume_open(const char *filename)
   int i;
   noticed_3D=FALSE;
   clear_savestates();
+#ifdef EXPERIMENTAL_GBASLOT
+  i = NDS_LoadROM(filename);
+#else
   i = NDS_LoadROM(filename, NULL);
+#endif
   return i;
 }
 
diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index 2f1b780b0..1da1a0a19 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -577,7 +577,11 @@ static void ToggleStatusbarVisible(GtkToggleAction *action)
 static int Open(const char *filename, const char *cflash_disk_image)
 {
     int res;
+#ifdef EXPERIMENTAL_GBASLOT
+    res = NDS_LoadROM( filename );
+#else
     res = NDS_LoadROM( filename, cflash_disk_image );
+#endif
     if(res > 0)
         gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "cheatlist"), TRUE);
     return res;