X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=svga.c;h=fb086bf1b2dea7ff0e59d3443c6803a2b39d36e8;hp=1133a2835803ff764a45dc320412821d2116de08;hb=0d6a66c2a80f50ae51327cd406f9df14d99ad02e;hpb=d97315ac0bca825d2d50a44453bc5652946e2c67

diff --git a/svga.c b/svga.c
index 1133a28..fb086bf 100644
--- a/svga.c
+++ b/svga.c
@@ -49,6 +49,8 @@
 #include "cart.h"
 #include "input.h"
 
+#include "vsuni.h"
+
 FCEUS FSettings;
 
 static int howlong;
@@ -76,7 +78,13 @@ void FCEU_DispMessage(char *format, ...)
  va_end(ap);
 
  howlong=180;
- printf("%s\n", errmsg);
+ if (errmsg[0] != '|')
+  printf("%s\n", errmsg);
+}
+
+void FCEU_CancelDispMessage(void)
+{
+ howlong=0;
 }
 
 void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall)
@@ -126,43 +134,16 @@ void FCEUI_SetGameGenie(int a)
  FSettings.GameGenie=a?1:0;
 }
 
-static void CalculatePalette(void);
-static void ChoosePalette(void);
-static void WritePalette(void);
-
 #ifndef NETWORK
 #define netplay 0
 #endif
 
-static uint8 StateShow=0;
-
 uint8 Exit=0;
 
 uint8 DIPS=0;
-//uint8 vsdip=0;
-//int coinon=0;
 
-uint8 pale=0;
 uint8 CommandQueue=0;
 
-static int controlselect=0;
-static int ntsccol=0;
-static int ntsctint=46+10;
-static int ntschue=72;
-static int controllength=0;
-
-pal *palo;
-static pal *palpoint[8]=
-     {
-     palette,
-     palettevscv,
-     palettevssmb,
-     palettevsmar,
-     palettevsgoon,
-     palettevsslalom,
-     palettevseb,
-     rp2c04001
-     };
 
 void FCEUI_SetSnapName(int a)
 {
@@ -174,40 +155,28 @@ void FCEUI_SaveExtraDataUnderBase(int a)
  FSettings.SUnderBase=a;
 }
 
-void FCEUI_SetPaletteArray(uint8 *pal)
-{
- if(!pal)
-  palpoint[0]=palette;
- else
- {
-  int x;
-  palpoint[0]=palettec;
-  for(x=0;x<64;x++)
-  {
-   palpoint[0][x].r=*((uint8 *)pal+x+x+x);
-   palpoint[0][x].g=*((uint8 *)pal+x+x+x+1);
-   palpoint[0][x].b=*((uint8 *)pal+x+x+x+2);
-  }
- }
- FCEU_ResetPalette();
-}
 
 void FCEUI_SelectState(int w)
 {
- if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
-  CommandQueue=42+w;
+ // if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
+ //  CommandQueue=42+w;
 }
 
 void FCEUI_SaveState(void)
 {
- if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
-  CommandQueue=40;
+ // if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
+ //  CommandQueue=40;
+
+ //CheckStates();
+ SaveState();
 }
 
 void FCEUI_LoadState(void)
 {
- if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
-  CommandQueue=41;
+ // if(netplay!=2 && FCEUGameInfo.type!=GIT_NSF)
+ //  CommandQueue=41;
+ //CheckStates();
+ LoadState();
 }
 
 int32 FCEUI_GetDesiredFPS(void)
@@ -238,28 +207,13 @@ void DriverInterface(int w, void *d)
 {
  switch(w)
  {
-  case DES_NTSCCOL:ntsccol=*(int *)d;FCEU_ResetPalette();break;
   case DES_RESET:if(netplay!=2) CommandQueue=30;break;
   case DES_POWER:if(netplay!=2) CommandQueue=31;break;
-  case DES_GETNTSCTINT:*(int*)d=ntsctint;break;
-  case DES_GETNTSCHUE:*(int*)d=ntschue;break;
-  case DES_SETNTSCTINT:ntsctint=*(int*)d;if(ntsccol)FCEU_ResetPalette();break;
-  case DES_SETNTSCHUE:ntschue=*(int*)d;if(ntsccol)FCEU_ResetPalette();break;
-
-  case DES_FDSINSERT:if(netplay!=2) CommandQueue=2;break;
-  case DES_FDSEJECT:if(netplay!=2) CommandQueue=3;break;
-  case DES_FDSSELECT:if(netplay!=2) CommandQueue=1;break;
-/*
-  case DES_NSFINC:NSFControl(1);break;
-  case DES_NSFDEC:NSFControl(2);break;
-  case DES_NSFRES:NSFControl(0);break;
-*/
-  case DES_VSUNIDIPSET:CommandQueue=10+(int)d;break;
+
+  case DES_VSUNIDIPSET:CommandQueue=10+(long)d;break;
   case DES_VSUNITOGGLEDIPVIEW:CommandQueue=10;break;
   case DES_VSUNICOIN:CommandQueue=19;break;
-  case DES_NTSCSELHUE:if(ntsccol && FCEUGameInfo.type!=GIT_VSUNI && !PAL && FCEUGameInfo.type!=GIT_NSF){controlselect=1;controllength=360;}break;
-  case DES_NTSCSELTINT:if(ntsccol && FCEUGameInfo.type!=GIT_VSUNI && !PAL && FCEUGameInfo.type!=GIT_NSF){controlselect=2;controllength=360;}break;
-
+#if 0
   case DES_NTSCDEC:
 		  if(ntsccol && FCEUGameInfo.type!=GIT_VSUNI && !PAL && FCEUGameInfo.type!=GIT_NSF)
 		  {
@@ -301,133 +255,15 @@ void DriverInterface(int w, void *d)
 		      controllength=360;
 		     }
           	    break;
+#endif
   }
 }
 
-static uint8 lastd=0;
-void SetNESDeemph(uint8 d, int force)
-{
- static uint16 rtmul[7]={32768*1.239,32768*.794,32768*1.019,32768*.905,32768*1.023,32768*.741,32768*.75};
- static uint16 gtmul[7]={32768*.915,32768*1.086,32768*.98,32768*1.026,32768*.908,32768*.987,32768*.75};
- static uint16 btmul[7]={32768*.743,32768*.882,32768*.653,32768*1.277,32768*.979,32768*.101,32768*.75};
- uint32 r,g,b;
- int x;
-
- /* If it's not forced(only forced when the palette changes),
-    don't waste cpu time if the same deemphasis bits are set as the last call.
- */
- if(!force)
- {
-  if(d==lastd)
-   return;
- }
- else	/* Only set this when palette has changed. */
- {
-  r=rtmul[6];
-  g=rtmul[6];
-  b=rtmul[6];
-
-  for(x=0;x<0x40;x++)
-  {
-   uint32 m,n,o;
-   m=palo[x].r;
-   n=palo[x].g;
-   o=palo[x].b;
-   m=(m*r)>>15;
-   n=(n*g)>>15;
-   o=(o*b)>>15;
-   if(m>0xff) m=0xff;
-   if(n>0xff) n=0xff;
-   if(o>0xff) o=0xff;
-   FCEUD_SetPalette(x|0x40,m,n,o);
-
-
-  }
- }
- if(!d) return;	/* No deemphasis, so return. */
-
-  r=rtmul[d-1];
-  g=gtmul[d-1];
-  b=btmul[d-1];
-
-    for(x=0;x<0x40;x++)
-    {
-     uint32 m,n,o;
-
-     m=palo[x].r;
-     n=palo[x].g;
-     o=palo[x].b;
-     m=(m*r)>>15;
-     n=(n*g)>>15;
-     o=(o*b)>>15;
-     if(m>0xff) m=0xff;
-     if(n>0xff) n=0xff;
-     if(o>0xff) o=0xff;
-
-     FCEUD_SetPalette(x|0xC0,m,n,o);
-
-    }
-
- lastd=d;
-}
-
-#define HUEVAL  ((double)((double)ntschue/(double)2)+(double)300)
-#define TINTVAL ((double)((double)ntsctint/(double)128))
-
-static void CalculatePalette(void)
-{
- int x,z;
- int r,g,b;
- double s,y,theta;
- static uint8 cols[16]={0,24,21,18,15,12,9,6,3,0,33,30,27,0,0,0};
- static uint8 br1[4]={6,9,12,12};
- static double br2[4]={.29,.45,.73,.9};
- static double br3[4]={0,.24,.47,.77};
-
- for(x=0;x<=3;x++)
-  for(z=0;z<16;z++)
-  {
-   s=(double)TINTVAL;
-   y=(double)br2[x];
-   if(z==0)  {s=0;y=((double)br1[x])/12;}
-
-   if(z>=13)
-   {
-    s=y=0;
-    if(z==13)
-     y=(double)br3[x];
-   }
-
-   theta=(double)M_PI*(double)(((double)cols[z]*10+HUEVAL)/(double)180);
-   r=(int)(((double)y+(double)s*(double)sin(theta))*(double)256);
-   g=(int)(((double)y-(double)((double)27/(double)53)*s*(double)sin(theta)+(double)((double)10/(double)53)*s*cos(theta))*(double)256);
-   b=(int)(((double)y-(double)s*(double)cos(theta))*(double)256);
-
-   // TODO:  Fix RGB to compensate for phosphor changes(add to red??).
-
-   if(r>255) r=255;
-   if(g>255) g=255;
-   if(b>255) b=255;
-   if(r<0) r=0;
-   if(g<0) g=0;
-   if(b<0) b=0;
-
-   paletten[(x<<4)+z].r=r;
-   paletten[(x<<4)+z].g=g;
-   paletten[(x<<4)+z].b=b;
-  }
- WritePalette();
-}
 
 #include "drawing.h"
 #ifdef FRAMESKIP
 void FCEU_PutImageDummy(void)
 {
- if(FCEUGameInfo.type!=GIT_NSF)
- {
-  if(controllength) controllength--;
- }
- if(StateShow) StateShow--; /* DrawState() */
  if(howlong) howlong--;	/* DrawMessage() */
  #ifdef FPS
  {
@@ -461,10 +297,15 @@ void FCEU_PutImage(void)
           ReallySnap();
           dosnapsave=0;
          }
-	 if(FCEUGameInfo.type==GIT_VSUNI && DIPS&2)
-	  DrawDips();
-         if(StateShow) DrawState();
-         if(controllength) {controllength--;DrawBars();}
+	 if(FCEUGameInfo.type==GIT_VSUNI)
+		 FCEU_VSUniDraw(XBuf);
+
+	 //FCEU_DrawSaveStates(XBuf);
+	 //FCEU_DrawMovies(XBuf);
+	 //FCEU_DrawNTSCControlBars(XBuf);
+	 //FCEU_DrawRecordingStatus(XBuf);
+
+         //if(controllength) {controllength--;DrawBars();}
         }
 	DrawMessage();
 	#ifdef FPS
@@ -476,74 +317,7 @@ void FCEU_PutImage(void)
 	DrawInput(XBuf+8);
 }
 
-static int ipalette=0;
-
-void LoadGamePalette(void)
-{
-  uint8 ptmp[192];
-  FILE *fp;
-  ipalette=0;
-  if((fp=fopen(FCEU_MakeFName(FCEUMKF_PALETTE,0,0),"rb")))
-  {
-   int x;
-   fread(ptmp,1,192,fp);
-   fclose(fp);
-   for(x=0;x<64;x++)
-   {
-    palettei[x].r=ptmp[x+x+x];
-    palettei[x].g=ptmp[x+x+x+1];
-    palettei[x].b=ptmp[x+x+x+2];
-   }
-   ipalette=1;
-  }
-}
-
-void FCEU_ResetPalette(void)
-{
-   ChoosePalette();
-   WritePalette();
-}
-
-static void ChoosePalette(void)
-{
-    if(FCEUGameInfo.type==GIT_NSF)
-     palo=NSFPalette;
-    else if(ipalette)
-     palo=palettei;
-    else if(ntsccol && !PAL && FCEUGameInfo.type!=GIT_VSUNI)
-     {
-      palo=paletten;
-      CalculatePalette();
-     }
-    else
-     palo=palpoint[pale];
-}
-
-void WritePalette(void)
-{
-    int x;
-
-    for(x=0;x<6;x++)
-     FCEUD_SetPalette(x+128,unvpalette[x].r,unvpalette[x].g,unvpalette[x].b);
-    if(FCEUGameInfo.type==GIT_NSF)
-    {
-     for(x=0;x<39;x++)
-      FCEUD_SetPalette(x,palo[x].r,palo[x].g,palo[x].b);
-    }
-    else
-    {
-     for(x=0;x<64;x++)
-      FCEUD_SetPalette(x,palo[x].r,palo[x].g,palo[x].b);
-     SetNESDeemph(lastd,1);
-    }
-}
-
 #if 0
-void FlushCommandQueue(void)
-{
-  if(!netplay && CommandQueue) {DoCommand(CommandQueue);CommandQueue=0;}
-}
-
 void DoCommand(uint8 c)
 {
  switch(c)