X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=4eaf3f6be00e307a2e1cf4978178412032241e74;hb=c4980f9edd806014286d57aee1cbe5e73b803e46;hp=f700e4f96940f20c821b45da18a75770a74663d6;hpb=971a1d07d2f5b5a6f991ed5712275c04b933734f;p=fceu.git

diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c
index f700e4f..4eaf3f6 100644
--- a/drivers/gp2x/main.c
+++ b/drivers/gp2x/main.c
@@ -389,6 +389,7 @@ int CLImain(int argc, char *argv[])
           fceugi=FCEUI_LoadGame(lastLoadedGameName);
 	  if (fceugi)
 	  {
+	   char infostring[32];
 	   LoadConfig(lastLoadedGameName);
 	   if (Settings.region_force)
 	    FCEUI_SetVidSystem(Settings.region_force - 1);
@@ -396,15 +397,8 @@ int CLImain(int argc, char *argv[])
 	   //RefreshThrottleFPS();
 	   InitOtherInput();
 
-	   // additional print for gpfce
-	   // TODO: handlers for other formats then iNES
-	   {
-	  int MapperNo;
-	  iNES_HEADER *head = iNESGetHead();
-          MapperNo = (head->ROM_type>>4);
-          MapperNo|=(head->ROM_type2&0xF0);
-	  FCEU_DispMessage("%s, Mapper: %d%s%s", PAL?"PAL":"NTSC", MapperNo, (head->ROM_type&2)?", BB":"", (head->ROM_type&4)?", T":"");
-	   }
+	   GameInterface(GI_INFOSTRING, infostring);
+	   FCEU_DispMessage("%s", infostring);
 	  }
 	  else
 	  {
@@ -451,8 +445,6 @@ static int DriverInitialize(void)
 {
    SetSignals((void *)CloseStuff);
 
-   if(InitJoysticks())
-    inited|=2;
    if(!InitVideo()) return 0;
    inited|=4;
    return 1;
@@ -463,8 +455,6 @@ static void DriverKill(void)
  // SaveConfig(NULL); // done explicitly in menu now
  SetSignals(SIG_IGN);
 
- if(inited&2)
-  KillJoysticks();
  if(inited&4)
   KillVideo();
  if(inited&1)