Patch 10767 (Durandal_1707).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97

19 files changed, 181 insertions, 172 deletions

diff --git a/plugins/dfinput/analog.c b/plugins/dfinput/analog.c
index 8d14b00b..7d70e24a 100644
--- a/plugins/dfinput/analog.c
+++ b/plugins/dfinput/analog.c
@@ -28,8 +28,8 @@ void InitAnalog() {
 	g.PadState[1].AnalogStatus[ANALOG_RIGHT][0] = 127;
 	g.PadState[1].AnalogStatus[ANALOG_RIGHT][1] = 127;
 
-	memset(g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus));
-	memset(g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus));
+	memset((void *)g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus));
+	memset((void *)g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus));
 }
 
 void CheckAnalog() {
diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c
index 7111d90b..4351d8a4 100644
--- a/plugins/dfinput/sdljoy.c
+++ b/plugins/dfinput/sdljoy.c
@@ -19,14 +19,14 @@
 #include "pad.h"
 
 #if SDL_VERSION_ATLEAST(1,3,0)
-static SDL_HapticEffect haptic_rumbleEffect;
+//static SDL_HapticEffect haptic_rumbleEffect;
 #endif
 
 void JoyInitHaptic()
 {
 #if SDL_VERSION_ATLEAST(1,3,0)
   uint8_t i;
-  unsigned int haptic_query = 0;
+    //unsigned int haptic_query = 0;
   for (i = 0; i < 2; i++)
   {
     if (g.PadState[i].JoyDev && SDL_JoystickIsHaptic(g.PadState[i].JoyDev))
diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index f75a5127..4eb3748c 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -142,7 +142,7 @@ void InitADSR(void)                                    // INIT ADSR
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void StartADSR(int ch)                          // MIX ADSR

+void StartADSR(int ch)                          // MIX ADSR

 {

  s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars

  s_chan[ch].ADSRX.State=0;

@@ -152,7 +152,7 @@ INLINE void StartADSR(int ch)                          // MIX ADSR
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE int MixADSR(int ch)                             // MIX ADSR

+int MixADSR(int ch)                             // MIX ADSR

 {    

  int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;

  int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;

diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h
index ff2af1ff..a99fc90c 100644
--- a/plugins/dfsound/adsr.h
+++ b/plugins/dfsound/adsr.h
@@ -15,5 +15,5 @@
  *                                                                         *

  ***************************************************************************/

 

-INLINE void StartADSR(int ch);

-INLINE int  MixADSR(int ch);

+void StartADSR(int ch);

+int  MixADSR(int ch);

diff --git a/plugins/dfsound/cfg.h b/plugins/dfsound/cfg.h
index b052b2d9..d26c116e 100644
--- a/plugins/dfsound/cfg.h
+++ b/plugins/dfsound/cfg.h
@@ -20,6 +20,8 @@ void ReadConfig(void);
 #ifdef _WINDOWS

 BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);

 BOOL CALLBACK DSoundDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);

+#elif defined (_MACOSX)

+#include "maccfg.h"

 #else

 void StartCfgTool(char * pCmdLine);

 #endif

diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index ce119621..bd20f3e5 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -63,7 +63,7 @@ void SetREVERB(unsigned short val)
 // START REVERB

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void StartREVERB(int ch)

+void StartREVERB(int ch)

 {

  if(s_chan[ch].bReverb && (spuCtrl&0x80))              // reverb possible?

   {

@@ -84,7 +84,7 @@ INLINE void StartREVERB(int ch)
 // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void InitREVERB(void)

+static INLINE void InitREVERB(void)

 {

  if(iUseReverb==2)

   {memset(sRVBStart,0,NSSIZE*2*4);}

@@ -94,7 +94,7 @@ INLINE void InitREVERB(void)
 // STORE REVERB

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void StoreREVERB_CD(int left, int right,int ns)

+static INLINE void StoreREVERB_CD(int left, int right,int ns)

 {

  if(iUseReverb==0) return;

  else

@@ -112,7 +112,7 @@ INLINE void StoreREVERB_CD(int left, int right,int ns)
 }

  

 

-INLINE void StoreREVERB(int ch,int ns)

+void StoreREVERB(int ch,int ns)

 {

  if(iUseReverb==0) return;

  else

@@ -149,7 +149,7 @@ INLINE void StoreREVERB(int ch,int ns)
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE int g_buffer(int iOff)                          // get_buffer content helper: takes care about wraps

+static INLINE int g_buffer(int iOff)                          // get_buffer content helper: takes care about wraps

 {

  short * p=(short *)spuMem;

  iOff=(iOff*4)+rvb.CurrAddr;

@@ -160,7 +160,7 @@ INLINE int g_buffer(int iOff)                          // get_buffer content hel
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void s_buffer(int iOff,int iVal)                // set_buffer content helper: takes care about wraps and clipping

+static INLINE void s_buffer(int iOff,int iVal)                // set_buffer content helper: takes care about wraps and clipping

 {

  short * p=(short *)spuMem;

  iOff=(iOff*4)+rvb.CurrAddr;

@@ -172,7 +172,7 @@ INLINE void s_buffer(int iOff,int iVal)                // set_buffer content hel
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping

+static INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping

 {

  short * p=(short *)spuMem;

  iOff=(iOff*4)+rvb.CurrAddr+1;

@@ -184,7 +184,7 @@ INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1 sample
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE int MixREVERBLeft(int ns)

+static INLINE int MixREVERBLeft(int ns)

 {

  if(iUseReverb==0) return 0;

  else

@@ -291,7 +291,7 @@ INLINE int MixREVERBLeft(int ns)
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE int MixREVERBRight(void)

+static INLINE int MixREVERBRight(void)

 {

  if(iUseReverb==0) return 0;

  else

diff --git a/plugins/dfsound/reverb.h b/plugins/dfsound/reverb.h
index ce618187..ea0a1a2d 100644
--- a/plugins/dfsound/reverb.h
+++ b/plugins/dfsound/reverb.h
@@ -16,6 +16,6 @@
  ***************************************************************************/

 

 void SetREVERB(unsigned short val);

-INLINE void StartREVERB(int ch);

-INLINE void StoreREVERB(int ch,int ns);

+void StartREVERB(int ch);

+void StoreREVERB(int ch,int ns);

 

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index e646e226..304297db 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -188,7 +188,7 @@ static int iSecureStart=0; // secure start counter
 //

 

 

-INLINE void InterpolateUp(int ch)

+static INLINE void InterpolateUp(int ch)

 {

  if(s_chan[ch].SB[32]==1)                              // flag == 1? calc step and set flag... and don't change the value in this pass

   {

@@ -236,7 +236,7 @@ INLINE void InterpolateUp(int ch)
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm

 //

 

-INLINE void InterpolateDown(int ch)

+static INLINE void InterpolateDown(int ch)

 {

  if(s_chan[ch].sinc>=0x20000L)                                 // we would skip at least one val?

   {

@@ -262,7 +262,7 @@ INLINE void InterpolateDown(int ch)
 // START SOUND... called by main thread to setup a new sound on a channel

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void StartSound(int ch)

+static INLINE void StartSound(int ch)

 {

  StartADSR(ch);

  StartREVERB(ch);

@@ -292,7 +292,7 @@ INLINE void StartSound(int ch)
 // ALL KIND OF HELPERS

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void VoiceChangeFrequency(int ch)

+static INLINE void VoiceChangeFrequency(int ch)

 {

  s_chan[ch].iUsedFreq=s_chan[ch].iActFreq;             // -> take it and calc steps

  s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;

@@ -302,7 +302,7 @@ INLINE void VoiceChangeFrequency(int ch)
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void FModChangeFrequency(int ch,int ns)

+static INLINE void FModChangeFrequency(int ch,int ns)

 {

  int NP=s_chan[ch].iRawPitch;

 

@@ -366,7 +366,7 @@ unsigned short NoiseFreqAdd[5] = {
 	0, 84, 140, 180, 210

 };

 

-INLINE void NoiseClock()

+static INLINE void NoiseClock()

 {

 	unsigned int level;

 

@@ -392,7 +392,7 @@ INLINE void NoiseClock()
 	}

 }

 

-INLINE int iGetNoiseVal(int ch)

+static INLINE int iGetNoiseVal(int ch)

 {

  int fa;

 

@@ -413,7 +413,7 @@ INLINE int iGetNoiseVal(int ch)
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void StoreInterpolationVal(int ch,int fa)

+static INLINE void StoreInterpolationVal(int ch,int fa)

 {

 	/*

 	// fmod channel = sound output

@@ -451,7 +451,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE int iGetInterpolationVal(int ch)

+static INLINE int iGetInterpolationVal(int ch)

 {

  int fa;

 

diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 20b6802a..4f78eb00 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -45,6 +45,7 @@ uint32_t * CDDAEnd   = NULL;
 int             iLeftXAVol  = 0x8000;

 int             iRightXAVol = 0x8000;

 

+#if 0

 static int gauss_ptr = 0;

 static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};

 

@@ -52,6 +53,7 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 #define gvall(x) gauss_window[(gauss_ptr+x)&3]

 #define gvalr0 gauss_window[4+gauss_ptr]

 #define gvalr(x) gauss_window[4+((gauss_ptr+x)&3)]

+#endif

 

 long cdxa_dbuf_ptr;

 

@@ -62,7 +64,7 @@ long cdxa_dbuf_ptr;
 static int lastxa_lc, lastxa_rc;

 static int lastcd_lc, lastcd_rc;

 

-INLINE void MixXA(void)

+void MixXA(void)

 {

  int ns;

  int lc,rc;

@@ -260,7 +262,7 @@ unsigned long timeGetTime_spu()
 // FEED XA 

 ////////////////////////////////////////////////////////////////////////

 

-INLINE void FeedXA(xa_decode_t *xap)

+void FeedXA(xa_decode_t *xap)

 {

  int sinc,spos,i,iSize,iPlace;

 

@@ -451,7 +453,7 @@ INLINE void FeedXA(xa_decode_t *xap)
 

 unsigned int cdda_ptr;

 

-INLINE void FeedCDDA(unsigned char *pcm, int nBytes)

+void FeedCDDA(unsigned char *pcm, int nBytes)

 {

  while(nBytes>0)

   {

diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h
index 0928eba2..90b89f41 100644
--- a/plugins/dfsound/xa.h
+++ b/plugins/dfsound/xa.h
@@ -15,6 +15,6 @@
  *                                                                         *

  ***************************************************************************/

 

-INLINE void MixXA(void);

-INLINE void FeedXA(xa_decode_t *xap);

-INLINE void FeedCDDA(unsigned char *pcm, int nBytes);
+void MixXA(void);

+void FeedXA(xa_decode_t *xap);

+void FeedCDDA(unsigned char *pcm, int nBytes);

diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index ef06be1a..1ff9939a 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -1240,7 +1240,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata)      // WRITE STATUS
 // vram read/write helpers, needed by LEWPY's optimized vram read/write :)

 ////////////////////////////////////////////////////////////////////////

 

-__inline void FinishedVRAMWrite(void)

+static __inline void FinishedVRAMWrite(void)

 {

 /*

 // NEWX

@@ -1267,7 +1267,7 @@ __inline void FinishedVRAMWrite(void)
  VRAMWrite.RowsRemaining = 0;

 }

 

-__inline void FinishedVRAMRead(void)

+static __inline void FinishedVRAMRead(void)

 {

  // Set register to NORMAL operation

  DataReadMode = DR_NORMAL;

@@ -1629,7 +1629,7 @@ void SetFixes(void)
 

 unsigned long lUsedAddr[3];

 

-__inline BOOL CheckForEndlessLoop(unsigned long laddr)

+static __inline BOOL CheckForEndlessLoop(unsigned long laddr)

 {

  if(laddr==lUsedAddr[1]) return TRUE;

  if(laddr==lUsedAddr[2]) return TRUE;

diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c
index e797dbec..ed9474c1 100644
--- a/plugins/dfxvideo/prim.c
+++ b/plugins/dfxvideo/prim.c
@@ -50,11 +50,11 @@ BOOL           bDoVSyncUpdate=FALSE;
 #ifdef USE_NASM

 

 #define BGR24to16 i386_BGR24to16

-__inline unsigned short BGR24to16 (uint32_t BGR);

+static __inline unsigned short BGR24to16 (uint32_t BGR);

 

 #else

 

-__inline unsigned short BGR24to16 (uint32_t BGR)

+static __inline unsigned short BGR24to16 (uint32_t BGR)

 {

  return (unsigned short)(((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6));

 }

@@ -65,7 +65,7 @@ __inline unsigned short BGR24to16 (uint32_t BGR)
 // Update global TP infos

 ////////////////////////////////////////////////////////////////////////

 

-__inline void UpdateGlobalTP(unsigned short gdata)

+static __inline void UpdateGlobalTP(unsigned short gdata)

 {

  GlobalTextAddrX = (gdata << 6) & 0x3c0;               // texture addr

 

@@ -119,7 +119,7 @@ __inline void UpdateGlobalTP(unsigned short gdata)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void SetRenderMode(uint32_t DrawAttributes)

+static __inline void SetRenderMode(uint32_t DrawAttributes)

 {

  DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;

 

@@ -211,7 +211,7 @@ void AdjustCoord1()
 //  \ / \ 

 //   2___3

 

-__inline BOOL CheckCoord4()

+static __inline BOOL CheckCoord4()

 {

  if(lx0<0)

   {

@@ -277,7 +277,7 @@ __inline BOOL CheckCoord4()
  return FALSE;

 }

 

-__inline BOOL CheckCoord3()

+static __inline BOOL CheckCoord3()

 {

  if(lx0<0)

   {

@@ -314,7 +314,7 @@ __inline BOOL CheckCoord3()
 }

 

 

-__inline BOOL CheckCoord2()

+static __inline BOOL CheckCoord2()

 {

  if(lx0<0)

   {

@@ -336,7 +336,7 @@ __inline BOOL CheckCoord2()
  return FALSE;

 }

 

-__inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)

+static __inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)

 {

  if(slx0<0)

   {

diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index b0cbc290..ebe02760 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -240,7 +240,7 @@ void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned s
 /////////////////////////////////////////////////////////////////

 /////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)

+static __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)

 {

  int32_t r,g,b;

 

@@ -304,7 +304,7 @@ __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

 {

  if(bCheckMask && (*pdest & HOST2LE16(0x8000))) return;

 

@@ -363,7 +363,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)

+static __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)

 {

  if(DrawSemiTrans)

   {

@@ -450,7 +450,7 @@ __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -523,7 +523,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -544,7 +544,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -617,7 +617,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)

+static __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)

 {

  int32_t r,g,b,l;

 

@@ -721,7 +721,7 @@ __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)

+static __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)

 {

  int32_t r,g,b;

 

@@ -746,7 +746,7 @@ __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)

+static __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)

 {

  int32_t r,g,b;

 

@@ -848,7 +848,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)

+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)

 {

  int32_t r,g,b;

 

@@ -919,7 +919,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -991,7 +991,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int32_t r,g,b;

 

@@ -1010,7 +1010,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)

 {

  int32_t r,g,b;

  

@@ -1205,11 +1205,11 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 // NASM version (external):

 #define shl10idiv i386_shl10idiv

 

-__inline int shl10idiv(int x, int y);

+static __inline int shl10idiv(int x, int y);

 

 #else

 

-__inline int shl10idiv(int x, int y)

+static __inline int shl10idiv(int x, int y)

 {

  __int64 bi=x;

  bi<<=10;

@@ -1222,7 +1222,7 @@ __inline int shl10idiv(int x, int y)
 

 // GNUC long long int version:

 

-__inline int shl10idiv(int x, int y) 

+static __inline int shl10idiv(int x, int y) 

 { 

  long long int bi=x; 

  bi<<=10; 

@@ -1235,7 +1235,7 @@ __inline int shl10idiv(int x, int y)
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

                         

-__inline int RightSection_F(void)

+static __inline int RightSection_F(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1251,7 +1251,7 @@ __inline int RightSection_F(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_F(void)

+static __inline int LeftSection_F(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1267,7 +1267,7 @@ __inline int LeftSection_F(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_F(void)

+static __inline BOOL NextRow_F(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1293,7 +1293,7 @@ __inline BOOL NextRow_F(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest;

@@ -1355,7 +1355,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_G(void)

+static __inline int RightSection_G(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1371,7 +1371,7 @@ __inline int RightSection_G(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_G(void)

+static __inline int LeftSection_G(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1394,7 +1394,7 @@ __inline int LeftSection_G(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_G(void)

+static __inline BOOL NextRow_G(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1423,7 +1423,7 @@ __inline BOOL NextRow_G(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)

+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1501,7 +1501,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_FT(void)

+static __inline int RightSection_FT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1517,7 +1517,7 @@ __inline int RightSection_FT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_FT(void)

+static __inline int LeftSection_FT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1538,7 +1538,7 @@ __inline int LeftSection_FT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_FT(void)

+static __inline BOOL NextRow_FT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1566,7 +1566,7 @@ __inline BOOL NextRow_FT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1654,7 +1654,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_GT(void)

+static __inline int RightSection_GT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1670,7 +1670,7 @@ __inline int RightSection_GT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_GT(void)

+static __inline int LeftSection_GT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1698,7 +1698,7 @@ __inline int LeftSection_GT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_GT(void)

+static __inline BOOL NextRow_GT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1729,7 +1729,7 @@ __inline BOOL NextRow_GT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)

+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1834,7 +1834,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_F4(void)

+static __inline int RightSection_F4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1853,7 +1853,7 @@ __inline int RightSection_F4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_F4(void)

+static __inline int LeftSection_F4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1872,7 +1872,7 @@ __inline int LeftSection_F4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_F4(void)

+static __inline BOOL NextRow_F4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1904,7 +1904,7 @@ __inline BOOL NextRow_F4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2046,7 +2046,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_FT4(void)

+static __inline int RightSection_FT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2069,7 +2069,7 @@ __inline int RightSection_FT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_FT4(void)

+static __inline int LeftSection_FT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2092,7 +2092,7 @@ __inline int LeftSection_FT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_FT4(void)

+static __inline BOOL NextRow_FT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2128,7 +2128,7 @@ __inline BOOL NextRow_FT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2277,7 +2277,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3
 ////////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////////

 

-__inline int RightSection_GT4(void)

+static __inline int RightSection_GT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2307,7 +2307,7 @@ __inline int RightSection_GT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline int LeftSection_GT4(void)

+static __inline int LeftSection_GT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2337,7 +2337,7 @@ __inline int LeftSection_GT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL NextRow_GT4(void)

+static __inline BOOL NextRow_GT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2379,7 +2379,7 @@ __inline BOOL NextRow_GT4(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)

+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2549,7 +2549,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3
 // POLY 3/4 FLAT SHADED

 ////////////////////////////////////////////////////////////////////////

 

-__inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)

+static __inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)

 {

  int i,j,xmin,xmax,ymin,ymax;

  unsigned short color;uint32_t lcolor;

@@ -5187,7 +5187,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3
 // POLY 3/4 G-SHADED

 ////////////////////////////////////////////////////////////////////////

  

-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)

+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)

 {

  int i,j,xmin,xmax,ymin,ymax;

  int32_t cR1,cG1,cB1;

@@ -7086,7 +7086,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 

 /*

 // no real rect test, but it does its job the way I need it

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  if(lx0==lx1 && lx2==lx3) return FALSE;

  if(lx0==lx2 && lx1==lx3) return FALSE;

@@ -7096,7 +7096,7 @@ __inline BOOL IsNoRect(void)
 */

 

 // real rect test

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  if(!(dwActFixes&0x200)) return FALSE;

 

diff --git a/plugins/dfxvideo/zn.c b/plugins/dfxvideo/zn.c
index 38b906ba..05ef3c8f 100644
--- a/plugins/dfxvideo/zn.c
+++ b/plugins/dfxvideo/zn.c
@@ -71,10 +71,10 @@ int           iTileCheat=0;
 

 typedef struct GPUOTAG

  {

-  uint32_t  Version;        // Version of structure - currently 1

-  long           hWnd;           // Window handle

-  uint32_t  ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW

-  uint32_t  GPUVersion;     // 0 = a, 1 = b, 2 = c

+  uint32_t       Version;        // Version of structure - currently 1

+  unsigned long  hWnd;           // Window handle

+  uint32_t       ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW

+  uint32_t       GPUVersion;     // 0 = a, 1 = b, 2 = c

   const char*    GameName;       // NULL terminated string

   const char*    CfgFile;        // NULL terminated string

  } GPUConfiguration_t;

diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index 5b64554f..bb8e8370 100644
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -33,6 +33,7 @@
 // if you use it, you must include it

 #include <OpenGL/gl.h>

 #include <OpenGL/glext.h>

+#include "drawgl.h"

 #endif

 ////////////////////////////////////////////////////////////////////////////////////

 // defines

@@ -751,7 +752,7 @@ void GLcleanup()
 //              real psx polygon coord mapping right... the following

 //              works not to bad with many games, though

 

-__inline BOOL CheckCoord4()

+static __inline BOOL CheckCoord4()

 {

  if(lx0<0)

   {

@@ -817,7 +818,7 @@ __inline BOOL CheckCoord4()
  return FALSE;

 }

 

-__inline BOOL CheckCoord3()

+static __inline BOOL CheckCoord3()

 {

  if(lx0<0)

   {

@@ -854,7 +855,7 @@ __inline BOOL CheckCoord3()
 }

 

 

-__inline BOOL CheckCoord2()

+static __inline BOOL CheckCoord2()

 {

  if(lx0<0)

   {

diff --git a/plugins/peopsxgl/draw.h b/plugins/peopsxgl/draw.h
index 82f920db..e05fddfe 100644
--- a/plugins/peopsxgl/draw.h
+++ b/plugins/peopsxgl/draw.h
@@ -51,6 +51,8 @@ void ReadConfig(void);
 void WriteConfig(void);

 void SetExtGLFuncs(void);

 

+void CreateScanLines(void);

+

 ///////////////////////////////////////////////////////////////////////

 

 #endif // _GL_DRAW_H_

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index 46e98198..de64252b 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -21,7 +21,9 @@
 

 #include "stdafx.h"

 

-#if !defined(_MACGL) && !defined(_WINDOWS)

+#if defined (_MACGL)

+#include "drawgl.h"

+#elif !defined(_MACGL) && !defined(_WINDOWS)

 

 #include "config.h"

 

@@ -1185,7 +1187,7 @@ void PaintBlackBorders(void)
 // helper to draw scanlines

 ////////////////////////////////////////////////////////////////////////

 

-__inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

                                     OGLVertex* vertex3, OGLVertex* vertex4) 

 {

 

@@ -2345,7 +2347,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata)
 

 BOOL bNeedWriteUpload=FALSE;

 

-__inline void FinishedVRAMWrite(void)

+static __inline void FinishedVRAMWrite(void)

 {

  if(bNeedWriteUpload)

   {

@@ -2361,7 +2363,7 @@ __inline void FinishedVRAMWrite(void)
  VRAMWrite.RowsRemaining = 0;

 }

 

-__inline void FinishedVRAMRead(void)

+static __inline void FinishedVRAMRead(void)

 {

  // set register to NORMAL operation

  iDataReadMode = DR_NORMAL;

@@ -3041,7 +3043,7 @@ void SetFixes(void)
 

 uint32_t lUsedAddr[3];

 

-__inline BOOL CheckForEndlessLoop(uint32_t laddr)

+static __inline BOOL CheckForEndlessLoop(uint32_t laddr)

 {

  if(laddr==lUsedAddr[1]) return TRUE;

  if(laddr==lUsedAddr[2]) return TRUE;

diff --git a/plugins/peopsxgl/prim.c b/plugins/peopsxgl/prim.c
index 2209a1ad..04b1c7af 100644
--- a/plugins/peopsxgl/prim.c
+++ b/plugins/peopsxgl/prim.c
@@ -146,7 +146,7 @@ unsigned short BGR24to16 (uint32_t BGR)
 // OpenGL primitive drawing commands

 ////////////////////////////////////////////////////////////////////////

 

-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

                                    OGLVertex* vertex3, OGLVertex* vertex4) 

 {

  glBegin(GL_TRIANGLE_STRIP);

@@ -166,7 +166,7 @@ __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 

                                   OGLVertex* vertex3) 

 {

  glBegin(GL_TRIANGLES);

@@ -183,7 +183,7 @@ __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 

                                          OGLVertex* vertex3) 

 {

  glBegin(GL_TRIANGLES);

@@ -204,7 +204,7 @@ __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

                                              OGLVertex* vertex3, OGLVertex* vertex4) 

 {

  glBegin(GL_TRIANGLE_STRIP);

@@ -228,7 +228,7 @@ __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vert
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 

+static __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 

 {

  glBegin(GL_TRIANGLES);

   glVertex3fv(&vertex1->x);

@@ -239,7 +239,7 @@ __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* ver
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 

                            OGLVertex* vertex3, OGLVertex* vertex4) 

 {

  glBegin(GL_TRIANGLE_STRIP);                           

@@ -252,7 +252,7 @@ __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 

                                       OGLVertex* vertex3) 

 {

  glBegin(GL_TRIANGLES);                           

@@ -269,7 +269,7 @@ __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 

                                        OGLVertex* vertex3, OGLVertex* vertex4) 

 {

  glBegin(GL_TRIANGLE_STRIP);                           

@@ -289,7 +289,7 @@ __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2,
 

 ///////////////////////////////////////////////////////// 

 

-__inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)

+static __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)

 {

  glBegin(GL_QUADS);

 

@@ -304,7 +304,7 @@ __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex*
 

 ///////////////////////////////////////////////////////// 

      

-__inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)

+static __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)

 {

  glBegin(GL_QUADS);

 

@@ -324,7 +324,7 @@ __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVert
 

 ///////////////////////////////////////////////////////// 

              

-__inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

+static __inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

                            OGLVertex* vertex3, OGLVertex* vertex4) 

 {

  glBegin(GL_QUADS);

@@ -525,7 +525,7 @@ void SetSemiTransMulti(int Pass)
 // Set several rendering stuff including blending 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void SetZMask3O(void)

+static __inline void SetZMask3O(void)

 {

  if(iUseMask && DrawSemiTrans && !iSetMask)

   {

@@ -534,7 +534,7 @@ __inline void SetZMask3O(void)
   }

 }

 

-__inline void SetZMask3(void)

+static __inline void SetZMask3(void)

 {

  if(iUseMask)

   {

@@ -548,7 +548,7 @@ __inline void SetZMask3(void)
   }

 }

 

-__inline void SetZMask3NT(void)

+static __inline void SetZMask3NT(void)

 {

  if(iUseMask)

   {

@@ -564,7 +564,7 @@ __inline void SetZMask3NT(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void SetZMask4O(void)

+static __inline void SetZMask4O(void)

 {

  if(iUseMask && DrawSemiTrans && !iSetMask)

   {

@@ -573,7 +573,7 @@ __inline void SetZMask4O(void)
   }

 }

 

-__inline void SetZMask4(void)

+static __inline void SetZMask4(void)

 {

  if(iUseMask)

   {

@@ -587,7 +587,7 @@ __inline void SetZMask4(void)
   }

 }

 

-__inline void SetZMask4NT(void)

+static __inline void SetZMask4NT(void)

 {

  if(iUseMask)

   {

@@ -601,7 +601,7 @@ __inline void SetZMask4NT(void)
   }

 }

 

-__inline void SetZMask4SP(void)

+static __inline void SetZMask4SP(void)

 {

  if(iUseMask)

   {

@@ -622,7 +622,7 @@ __inline void SetZMask4SP(void)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void SetRenderState(uint32_t DrawAttributes)

+static __inline void SetRenderState(uint32_t DrawAttributes)

 {

  bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;

  DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;

@@ -630,7 +630,7 @@ __inline void SetRenderState(uint32_t DrawAttributes)
 

 ////////////////////////////////////////////////////////////////////////                                          

 

-__inline void SetRenderColor(uint32_t DrawAttributes)

+static __inline void SetRenderColor(uint32_t DrawAttributes)

 {

  if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}

  else

diff --git a/plugins/peopsxgl/soft.c b/plugins/peopsxgl/soft.c
index 9f10a2a0..9f5a4012 100644
--- a/plugins/peopsxgl/soft.c
+++ b/plugins/peopsxgl/soft.c
@@ -232,7 +232,7 @@ void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigne
 

 /////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)

+static __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)

 {

  int r,g,b;

 

@@ -296,7 +296,7 @@ __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

 {

  if(bCheckMask && *pdest&0x8000) return;

 

@@ -355,7 +355,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)

+static __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)

 {

  if (DrawSemiTrans)

   {

@@ -442,7 +442,7 @@ __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -515,7 +515,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -537,7 +537,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -610,7 +610,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)

 {

  int r,g,b,l;

 

@@ -714,7 +714,7 @@ __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)

 {

  int r,g,b;

 

@@ -739,7 +739,7 @@ __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)

 {

  int r,g,b;

 

@@ -841,7 +841,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)

+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)

 {

  int r,g,b;

 

@@ -912,7 +912,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int r,g,b;unsigned short l;

 

@@ -984,7 +984,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int r,g,b;

 

@@ -1003,7 +1003,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)

+static __inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)

 {

  int r,g,b;

  

@@ -1192,7 +1192,7 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 

 #pragma warning  (disable : 4035)

 

-__inline int shl10idiv(int x, int y)

+static __inline int shl10idiv(int x, int y)

 {

  __asm

   {

@@ -1208,7 +1208,7 @@ __inline int shl10idiv(int x, int y)
 

 #else

 

-__inline int shl10idiv(int x, int y)

+static __inline int shl10idiv(int x, int y)

 {

  long long int bi=x;

  bi<<=10;

@@ -1217,7 +1217,7 @@ __inline int shl10idiv(int x, int y)
 

 #endif

 

-__inline int RightSection_F(void)

+static __inline int RightSection_F(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1231,7 +1231,7 @@ __inline int RightSection_F(void)
  return height;

 }

 

-__inline int LeftSection_F(void)

+static __inline int LeftSection_F(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1245,7 +1245,7 @@ __inline int LeftSection_F(void)
  return height;  

 }

 

-__inline BOOL NextRow_F(void)

+static __inline BOOL NextRow_F(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1269,7 +1269,7 @@ __inline BOOL NextRow_F(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest;

@@ -1328,7 +1328,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3,
  return TRUE;

 }

 

-__inline int RightSection_G(void)

+static __inline int RightSection_G(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1342,7 +1342,7 @@ __inline int RightSection_G(void)
  return height;

 }

 

-__inline int LeftSection_G(void)

+static __inline int LeftSection_G(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1363,7 +1363,7 @@ __inline int LeftSection_G(void)
  return height;  

 }

 

-__inline BOOL NextRow_G(void)

+static __inline BOOL NextRow_G(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1390,7 +1390,7 @@ __inline BOOL NextRow_G(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){

+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){

  soft_vertex *v1, *v2, *v3;

  int height, longest, temp;

 

@@ -1464,7 +1464,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short
  return TRUE;

 }

 

-__inline int RightSection_FT(void)

+static __inline int RightSection_FT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1478,7 +1478,7 @@ __inline int RightSection_FT(void)
  return height;

 }

 

-__inline int LeftSection_FT(void)

+static __inline int LeftSection_FT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1497,7 +1497,7 @@ __inline int LeftSection_FT(void)
  return height;  

 }

 

-__inline BOOL NextRow_FT(void)

+static __inline BOOL NextRow_FT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1523,7 +1523,7 @@ __inline BOOL NextRow_FT(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1608,7 +1608,7 @@ texture distortions
  return TRUE;

 }

 

-__inline int RightSection_GT(void)

+static __inline int RightSection_GT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1622,7 +1622,7 @@ __inline int RightSection_GT(void)
  return height;

 }

 

-__inline int LeftSection_GT(void)

+static __inline int LeftSection_GT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1648,7 +1648,7 @@ __inline int LeftSection_GT(void)
  return height;  

 }

 

-__inline BOOL NextRow_GT(void)

+static __inline BOOL NextRow_GT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1677,7 +1677,7 @@ __inline BOOL NextRow_GT(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)

+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1779,7 +1779,7 @@ texture distortions
  return TRUE;

 }

 

-__inline int RightSection_F4(void)

+static __inline int RightSection_F4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1796,7 +1796,7 @@ __inline int RightSection_F4(void)
  return height;

 }

 

-__inline int LeftSection_F4(void)

+static __inline int LeftSection_F4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1813,7 +1813,7 @@ __inline int LeftSection_F4(void)
  return height;  

 }

 

-__inline BOOL NextRow_F4(void)

+static __inline BOOL NextRow_F4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1843,7 +1843,7 @@ __inline BOOL NextRow_F4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -1982,7 +1982,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
  return TRUE;

 }

 

-__inline int RightSection_FT4(void)

+static __inline int RightSection_FT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2003,7 +2003,7 @@ __inline int RightSection_FT4(void)
  return height;

 }

 

-__inline int LeftSection_FT4(void)

+static __inline int LeftSection_FT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2024,7 +2024,7 @@ __inline int LeftSection_FT4(void)
  return height;  

 }

 

-__inline BOOL NextRow_FT4(void)

+static __inline BOOL NextRow_FT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2058,7 +2058,7 @@ __inline BOOL NextRow_FT4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2204,7 +2204,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3
  return TRUE;

 }

 

-__inline int RightSection_GT4(void)

+static __inline int RightSection_GT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2232,7 +2232,7 @@ __inline int RightSection_GT4(void)
  return height;

 }

 

-__inline int LeftSection_GT4(void)

+static __inline int LeftSection_GT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2260,7 +2260,7 @@ __inline int LeftSection_GT4(void)
  return height;  

 }

 

-__inline BOOL NextRow_GT4(void)

+static __inline BOOL NextRow_GT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2300,7 +2300,7 @@ __inline BOOL NextRow_GT4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)

+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2466,7 +2466,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3
 // POLY 3/4 FLAT SHADED

 ////////////////////////////////////////////////////////////////////////

 

-__inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)

+static __inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)

 {

  int i,j,xmin,xmax,ymin,ymax;

  unsigned short color;

@@ -5105,7 +5105,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3
 // POLY 3/4 G-SHADED

 ////////////////////////////////////////////////////////////////////////

  

-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)

+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)

 {

  int i,j,xmin,xmax,ymin,ymax;

  int cR1,cG1,cB1;

@@ -7004,7 +7004,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 

 /*

 // no real rect test, but it does its job the way I need it

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  if(lx0==lx1 && lx2==lx3) return FALSE;

  if(lx0==lx2 && lx1==lx3) return FALSE;

@@ -7014,7 +7014,7 @@ __inline BOOL IsNoRect(void)
 */

 

 // real rect test

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  //if(!(dwActFixes&0x200)) return FALSE;