fixed: broken fs0, sram saves

[fceu.git] / drivers / cli / main.c

diff --git a/drivers/cli/main.c b/drivers/cli/main.c
index 15a2b5b..168916e 100644 (file)
--- a/drivers/cli/main.c
+++ b/drivers/cli/main.c
@@ -19,7 +19,7 @@
  */
 
 /*  This file contains or coordinates all of the code necessary to compile
-    on a UNIX system that can use svgalib, such as FreeBSD and Linux.  
+    on a UNIX system that can use svgalib, such as FreeBSD and Linux.
     This code is not guaranteed to compile on FreeBSD, though.
 */
 
@@ -46,15 +46,11 @@
 #include "dface.h"
 
 static int ntsccol=0,ntschue=-1,ntsctint=-1;
-int soundvol=70;
-int inited=0; 
-int swapbuttons=0;
-int showfps=0;
+/*static*/ int soundvol=100;
+static int inited=0;
 
-int srendlinev[2]={0,0};
-//int srendlinev[2]={0,0};
+int srendlinev[2]={8,0};
 int erendlinev[2]={239,239};
-//int erendlinev[2]={231,239};
 int srendline,erendline;
 
 
@@ -93,7 +89,7 @@ void FCEUD_PrintError(char *s)
 static char *cpalette=0;
 static void LoadCPalette(void)
 {
- char tmpp[192];
+ uint8 tmpp[192];
  FILE *fp;
 
  if(!(fp=fopen(cpalette,"rb")))
@@ -102,7 +98,7 @@ static void LoadCPalette(void)
   return;
  }
  fread(tmpp,1,192,fp);
- FCEUI_SetPaletteArray((uint8 *)tmpp);
+ FCEUI_SetPaletteArray(tmpp);
  fclose(fp);
 }
 
@@ -124,7 +120,7 @@ static CFGSTRUCT fceuconfig[]={
 };
 
 static void SaveConfig(void)
-{      
+{
        char tdir[2048];
        sprintf(tdir,"%s"PSS"fceu.cfg",BaseDirectory);
         DriverInterface(DES_GETNTSCTINT,&ntsctint);
@@ -193,7 +189,7 @@ static void DoArgs(int argc, char *argv[])
 {
         static char *cortab[5]={"none","gamepad","zapper","powerpad","arkanoid"};
         static int cortabi[5]={SI_NONE,SI_GAMEPAD,
-                               SI_ZAPPER,SI_POWERPAD,SI_ARKANOID};
+                               SI_ZAPPER,SI_POWERPADA,SI_ARKANOID};
        static char *fccortab[5]={"none","arkanoid","shadow","4player","fkb"};
        static int fccortabi[5]={SIFC_NONE,SIFC_ARKANOID,SIFC_SHADOW,
                                 SIFC_4PLAYER,SIFC_FKB};
@@ -221,8 +217,6 @@ static void DoArgs(int argc, char *argv[])
         {"-nothrottle",0,&eoptions,0x8000|EO_NOTHROTTLE},
          {"-slstart",0,&srendlinev[0],0},{"-slend",0,&erendlinev[0],0},
          {"-slstartp",0,&srendlinev[1],0},{"-slendp",0,&erendlinev[1],0},
-            {"-swapbuttons",&swapbuttons, 0, 0},
-            {"-showfps",&showfps, 0, 0},
         {0,(void *)DriverArgs,0,0},
         {0,0,0,0}
         };
@@ -242,7 +236,8 @@ static void DoArgs(int argc, char *argv[])
         FCEUI_SetVidSystem(1);
        if(docheckie[1])
         FCEUI_SetGameGenie(1);
-        FCEUI_DisableSpriteLimitation(1);
+
+        FCEUI_DisableSpriteLimitation(eoptions&1);
         FCEUI_SaveExtraDataUnderBase(eoptions&2);
        FCEUI_SetSnapName(eoptions&EO_SNAPNAME);
 
@@ -252,13 +247,9 @@ static void DoArgs(int argc, char *argv[])
          if(erendlinev[x]<srendlinev[x] || erendlinev[x]>239) erendlinev[x]=239;
        }
 
-       printf("main() setrendered lines: %d, %d, %d, %d\n",srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);
-        printf("main() clip sides %d\n", eoptions&EO_CLIPSIDES);
-        srendlinev[0]=0;
         FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);
-        FCEUI_SetRenderedLines(0,erendlinev[0],srendlinev[1],erendlinev[1]);
         FCEUI_SetSoundVolume(soundvol);
-       DriverInterface(DES_NTSCCOL,&ntsccol);
+       //DriverInterface(DES_NTSCCOL,&ntsccol);
        DoDriverArgs();
 
        if(fcexp)
@@ -281,7 +272,7 @@ static void DoArgs(int argc, char *argv[])
          if(!inputa[x])
          continue;
 
-        for(y=0;y<5;y++)        
+        for(y=0;y<5;y++)
         {
          if(!strncmp(cortab[y],inputa[x],8))
          {
@@ -294,7 +285,7 @@ static void DoArgs(int argc, char *argv[])
           free(inputa[x]);
          }
         }
-       }       
+       }
 }
 
 #include "usage.h"
@@ -310,13 +301,14 @@ int CLImain(int argc, char *argv[])
        FCEUI_SetBaseDirectory(BaseDirectory);
 
        CreateDirs();
-        if(argc<=1) 
+        if(argc<=1)
         {
          ShowUsage(argv[0]);
          return 1;
         }
         LoadConfig();
         DoArgs(argc-2,&argv[1]);
+       FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
        if(cpalette)
         LoadCPalette();
        if(InitSound())
@@ -373,7 +365,7 @@ static void DriverKill(void)
  inited=0;
 }
 
-void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
+void FCEUD_Update(uint8 *XBuf, int16 *Buffer, int Count)
 {
  if(!Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE))
   SpeedThrottle();