diff options
Diffstat (limited to 'plugins/peopsxgl/externals.h')
| -rw-r--r-- | plugins/peopsxgl/externals.h | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/plugins/peopsxgl/externals.h b/plugins/peopsxgl/externals.h index 2a723354..8ce2b914 100644 --- a/plugins/peopsxgl/externals.h +++ b/plugins/peopsxgl/externals.h @@ -83,10 +83,10 @@ #define BOOL unsigned short
#define bool unsigned short
#define LOWORD(l) ((unsigned short)(l))
-#define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF))
+#define HIWORD(l) ((unsigned short)(((uint32_t)(l) >> 16) & 0xFFFF))
#define max(a,b) (((a) > (b)) ? (a) : (b))
#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define DWORD unsigned long
+#define DWORD uint32_t
typedef struct RECTTAG
{
@@ -109,8 +109,8 @@ typedef struct VRAMLOADTAG typedef struct PSXPOINTTAG
{
- long x;
- long y;
+ int x;
+ int y;
} PSXPoint_t;
typedef struct PSXSPOINTTAG
@@ -143,19 +143,19 @@ typedef struct PSXDISPLAYTAG PSXPoint_t DisplayPosition;
PSXPoint_t DisplayEnd;
- long Double;
- long Height;
- long PAL;
- long InterlacedNew;
- long Interlaced;
- long InterlacedTest;
- long RGB24New;
- long RGB24;
+ int Double;
+ int Height;
+ int PAL;
+ int InterlacedNew;
+ int Interlaced;
+ int InterlacedTest;
+ int RGB24New;
+ int RGB24;
PSXSPoint_t DrawOffset;
PSXRect_t DrawArea;
PSXPoint_t GDrawOffset;
PSXPoint_t CumulOffset;
- long Disabled;
+ int Disabled;
PSXRect_t Range;
} PSXDisplay_t;
@@ -168,13 +168,11 @@ typedef struct OGLVertexTag GLfloat sow;
GLfloat tow;
- union
-COLTAG
+ union COLTAG
{
unsigned char col[4];
- unsigned long lcol;
+ unsigned int lcol;
} c;
-
} OGLVertex;
typedef union EXShortTag
@@ -186,7 +184,7 @@ typedef union EXShortTag typedef union EXLongTag
{
unsigned char c[4];
- unsigned long l;
+ unsigned int l;
EXShort s[2];
} EXLong;
@@ -242,8 +240,8 @@ extern GLuint gTexScanName; #ifndef _IN_SOFT
-extern long GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
-extern long GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
+extern int GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
+extern int GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
extern short g_m1;
extern short g_m2;
@@ -278,22 +276,22 @@ extern GLubyte ubGloAlpha; extern short sSprite_ux2;
extern short sSprite_vy2;
extern BOOL bRenderFrontBuffer;
-extern unsigned long ulOLDCOL;
-extern unsigned long ulClutID;
+extern uint32_t ulOLDCOL;
+extern uint32_t ulClutID;
extern void (*primTableJ[256])(unsigned char *);
extern void (*primTableSkip[256])(unsigned char *);
extern unsigned short usMirror;
-extern unsigned long dwCfgFixes;
-extern unsigned long dwActFixes;
-extern unsigned long dwEmuFixes;
+extern uint32_t dwCfgFixes;
+extern uint32_t dwActFixes;
+extern uint32_t dwEmuFixes;
extern BOOL bUseFixes;
extern int iSpriteTex;
extern int iDrawnSomething;
-extern long drawX;
-extern long drawY;
-extern long drawW;
-extern long drawH;
+extern int drawX;
+extern int drawY;
+extern int drawW;
+extern int drawH;
extern short sxmin;
extern short sxmax;
extern short symin;
@@ -308,10 +306,10 @@ extern GLint giWantedRGBA; extern GLint giWantedFMT;
extern GLint giWantedTYPE;
extern void (*LoadSubTexFn) (int,int,short,short);
-extern long GlobalTexturePage;
-extern unsigned long (*TCF[]) (unsigned long);
+extern int GlobalTexturePage;
+extern uint32_t (*TCF[]) (uint32_t);
extern unsigned short (*PTCF[]) (unsigned short);
-extern unsigned long (*PalTexturedColourFn) (unsigned long);
+extern uint32_t (*PalTexturedColourFn) (uint32_t);
extern BOOL bUseFastMdec;
extern BOOL bUse15bitMdec;
extern int iFrameTexType;
@@ -343,32 +341,32 @@ extern char szDispBuf[]; extern char szGPUKeys[];
extern PSXDisplay_t PSXDisplay;
extern PSXDisplay_t PreviousPSXDisplay;
-extern unsigned long ulKeybits;
+extern uint32_t ulKeybits;
extern TWin_t TWin;
extern BOOL bDisplayNotSet;
-extern long lGPUstatusRet;
+extern int lGPUstatusRet;
extern short imageX0,imageX1;
extern short imageY0,imageY1;
-extern long lClearOnSwap,lClearOnSwapColor;
-extern unsigned char * psxVub;
-extern signed char * psxVsb;
-extern unsigned short * psxVuw;
-extern signed short * psxVsw;
-extern unsigned long * psxVul;
-extern signed long * psxVsl;
+extern int lClearOnSwap,lClearOnSwapColor;
+extern unsigned char *psxVub;
+extern signed char *psxVsb;
+extern unsigned short *psxVuw;
+extern signed short *psxVsw;
+extern uint32_t *psxVul;
+extern signed int *psxVsl;
extern GLfloat gl_z;
extern BOOL bNeedRGB24Update;
extern BOOL bChangeWinMode;
extern GLuint uiScanLine;
extern int iUseScanLines;
-extern long lSelectedSlot;
+extern int lSelectedSlot;
extern int iScanBlend;
extern BOOL bInitCap;
extern int iBlurBuffer;
extern int iLastRGB24;
extern int iRenderFVR;
extern int iNoScreenSaver;
-extern unsigned long ulGPUInfoVals[];
+extern uint32_t ulGPUInfoVals[];
extern BOOL bNeedInterlaceUpdate;
extern BOOL bNeedWriteUpload;
extern BOOL bSkipNextFrame;
@@ -379,7 +377,7 @@ extern int bFullScreen; #ifndef _IN_MENU
-extern unsigned long dwCoreFlags;
+extern uint32_t dwCoreFlags;
extern GLuint gTexPicName;
extern PSXPoint_t ptCursorPoint[];
extern unsigned short usCursorActive;
@@ -400,7 +398,7 @@ extern float fps_cur; #ifndef _IN_KEY
-extern unsigned long ulKeybits;
+extern uint32_t ulKeybits;
#endif
|