some warnings fixed, nsf fixed, palettes, more code backported

[fceu.git] / svga.h

diff --git a/svga.h b/svga.h
index cebd555..9d8cbf9 100644 (file)
--- a/svga.h
+++ b/svga.h
@@ -20,11 +20,6 @@
  */
 
 #include "driver.h"
-typedef struct __pal {
-       uint8 r;
-       uint8 g;
-       uint8 b;
-} pal;
 
 typedef struct {
            int PAL;
@@ -39,7 +34,7 @@ typedef struct {
           int FirstSLine;
           int LastSLine;
 
-          /* Driver code(user)-specified first and last rendered scanlines. 
+          /* Driver code(user)-specified first and last rendered scanlines.
              Usr*SLine[0] is for NTSC, Usr*SLine[1] is for PAL.
            */
           int UsrFirstSLine[2];
@@ -52,6 +47,7 @@ extern FCEUS FSettings;
 
 void FCEU_PrintError(char *format, ...);
 void FCEU_DispMessage(char *format, ...);
+#define FCEU_printf printf
 
 void SetNESDeemph(uint8 d, int force);
 void DrawTextTrans(uint8 *dest, uint32 width, uint8 *textmsg, uint8 fgcolor);
@@ -74,10 +70,7 @@ void SetNESPalette(void);
 #define JOY_LEFT        0x40
 #define JOY_RIGHT       0x80
 
-extern pal *palo;
-
 void DoCommand(uint8 c);
 extern uint8 CommandQueue;
-void FCEU_ResetPalette(void);
-void LoadGamePalette(void);
+
 void FlushCommandQueue(void);