X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=21cdea5cc6fe5bbde0cb3f9585307d7510b9685e;hp=3f4dff95dfd9cfefacf6a57e05c00c20304fe0b4;hb=9b4514550544ca3d0a451ba0a08eeb502961ec1c;hpb=2a6855a31daf79cad83545b1eeee646e10481e5e

diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c
index 3f4dff9..21cdea5 100644
--- a/drivers/gp2x/main.c
+++ b/drivers/gp2x/main.c
@@ -39,6 +39,7 @@
 #include "../common/cheat.h"
 
 #include "../../fce.h"
+#include "../../cart.h"
 
 #include "dface.h"
 
@@ -91,8 +92,8 @@ void FCEUD_PrintError(char *s)
  puts(s);
 }
 
-static char *cpalette=0;
-static void LoadCPalette(void)
+char *cpalette=0;
+void LoadCPalette(void)
 {
  char tmpp[192];
  FILE *fp;
@@ -100,6 +101,8 @@ static void LoadCPalette(void)
  if(!(fp=fopen(cpalette,"rb")))
  {
   printf(" Error loading custom palette from file: %s\n",cpalette);
+  free(cpalette);
+  cpalette=0;
   return;
  }
  fread(tmpp,1,192,fp);
@@ -181,7 +184,7 @@ static void SaveLLGN(void)
 
 static void CreateDirs(void)
 {
- char *subs[]={"fcs","snaps","gameinfo","sav","cheats","cfg"};
+ char *subs[]={"fcs","snaps","gameinfo","sav","cheats","cfg","pal"};
  char tdir[2048];
  int x;
 
@@ -212,12 +215,9 @@ static void CloseStuff(int signum)
          case SIGHUP:printf("Reach out and hang-up on someone.\n");break;
          case SIGPIPE:printf("The pipe has broken!  Better watch out for floods...\n");break;
          case SIGSEGV:printf("Iyeeeeeeeee!!!  A segmentation fault has occurred.  Have a fluffy day.\n");break;
-	 /* So much SIGBUS evil. */
-	 #ifdef SIGBUS
 	 #if(SIGBUS!=SIGSEGV)
          case SIGBUS:printf("I told you to be nice to the driver.\n");break;
 	 #endif
-	 #endif
          case SIGFPE:printf("Those darn floating points.  Ne'er know when they'll bite!\n");break;
          case SIGALRM:printf("Don't throw your clock at the meowing cats!\n");break;
          case SIGABRT:printf("Abort, Retry, Ignore, Fail?\n");break;
@@ -250,9 +250,8 @@ static int DoArgs(int argc, char *argv[])
          {"-input1",0,&inputa[0],0x4001},{"-input2",0,&inputa[1],0x4001},
          {"-fcexp",0,&fcexp,0x4001},
 
-         {"-gg",&docheckie[1],0,0},
-         {"-no8lim",0,&eoptions,0x8001},
-         {"-subase",0,&eoptions,0x8002},
+         {"-gg",0,&eoptions,0x8000|EO_GG},
+         {"-no8lim",0,&eoptions,0x8000|EO_NO8LIM},
          {"-snapname",0,&eoptions,0x8000|EO_SNAPNAME},
 	 {"-nofs",0,&eoptions,0x8000|EO_NOFOURSCORE},
          {"-clipsides",0,&eoptions,0x8000|EO_CLIPSIDES},
@@ -276,10 +275,8 @@ static int DoArgs(int argc, char *argv[])
 	}
 	if(docheckie[0])
 	 Settings.region_force=2;
-	if(docheckie[1])
-	 FCEUI_SetGameGenie(1);
-        FCEUI_DisableSpriteLimitation(1);
-        FCEUI_SaveExtraDataUnderBase(eoptions&2);
+	FCEUI_SetGameGenie(eoptions&EO_GG);
+        FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM);
 	FCEUI_SetSnapName(eoptions&EO_SNAPNAME);
 
 	for(x=0;x<2;x++)
@@ -288,8 +285,6 @@ static int DoArgs(int argc, char *argv[])
          if(erendlinev[x]<srendlinev[x] || erendlinev[x]>239) erendlinev[x]=239;
 	}
 
-	printf("FCEUI_SetRenderedLines: %d, %d, %d, %d\n",srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);
-        printf("clip sides: %d\n", eoptions&EO_CLIPSIDES);
         FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);
         FCEUI_SetSoundVolume(soundvol);
 	DoDriverArgs();
@@ -362,7 +357,7 @@ int CLImain(int argc, char *argv[])
 	LoadLLGN();
 	FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
 	if(cpalette)
-	 LoadCPalette(); // TODO
+	 LoadCPalette();
 	if(InitSound())
 	 inited|=1;
 
@@ -393,7 +388,12 @@ int CLImain(int argc, char *argv[])
 	   ParseGI(fceugi);
 	   InitOtherInput();
 
-	   GameInterface(GI_INFOSTRING, infostring);
+	   if ((eoptions&EO_GG) && geniestage == 0) {
+	    strcpy(infostring, "gg.rom is missing, GG disabled");
+	    eoptions&=~EO_GG;
+	    FCEUI_SetGameGenie(0);
+	   } else
+	    GameInterface(GI_INFOSTRING, infostring);
 	   FCEU_DispMessage("%s", infostring);
 	  }
 	  else
@@ -454,6 +454,9 @@ static void DriverKill(void)
  // SaveConfig(NULL); // done explicitly in menu now
  SetSignals(SIG_IGN);
 
+ if(cpalette) free(cpalette);
+ cpalette=0;
+
  if(inited&4)
   KillVideo();
  if(inited&1)