Archived News
Search News Discussion Forum
Old Forum Install Programs More Downloads...
Troubleshooting Source Code
Format Specs.
Misc. Information
Non-SF Stuff
Links
Small banner for links to this site:
diff --git a/grpapi/grpapi.cpp b/grpapi/grpapi.cpp
--- a/grpapi/grpapi.cpp
+++ b/grpapi/grpapi.cpp
#include "grpapi.h"\r
-#include "..\\LoadStorm\\storm.h"\r
+#include "../LoadStorm/storm.h"\r
#include <malloc.h>\r
\r
#ifdef GRPAPI_STATIC\r
DWORD Offset;\r
} FRAMEHEADER;\r
\r
+GETPIXELPROC MyGetPixel = GetPixel;\r
+SETPIXELPROC MySetPixel = (SETPIXELPROC)SetPixelV;\r
+\r
void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha);\r
\r
extern HINSTANCE hStorm;\r
\r
BOOL GRPAPI WINAPI LoadGrpApi()\r
{\r
- if (hStorm==0) return FALSE;\r
+ if (!hStorm) return FALSE;\r
else return TRUE;\r
}\r
\r
{\r
}\r
\r
+BOOL GRPAPI WINAPI SetMpqDll(LPCSTR lpDllFileName)\r
+{\r
+ if (LoadStorm((char *)lpDllFileName)) return TRUE;\r
+ else return FALSE;\r
+}\r
+\r
BOOL GRPAPI WINAPI LoadPalette(LPCSTR lpFileName, DWORD *dwPaletteBuffer)\r
{\r
- if (lpFileName==0 || dwPaletteBuffer==0) return FALSE;\r
+ if (!lpFileName || !dwPaletteBuffer) return FALSE;\r
HANDLE hFile;\r
- if (SFileOpenFileEx!=0 && SFileGetFileSize!=0\r
- && SFileSetFilePointer!=0 && SFileReadFile!=0\r
- && SFileCloseFile!=0) {\r
- if (SFileOpenFileEx(0,lpFileName,1,&hFile)==0) return FALSE;\r
+ if (SFileOpenFileEx && SFileGetFileSize\r
+ && SFileSetFilePointer && SFileReadFile\r
+ && SFileCloseFile) {\r
+ if (!SFileOpenFileEx(0,lpFileName,1,&hFile)) return FALSE;\r
DWORD fsz = SFileGetFileSize(hFile,0);\r
SFileSetFilePointer(hFile,0,0,FILE_BEGIN);\r
if (fsz>=1024) {\r
\r
HANDLE GRPAPI WINAPI LoadGrp(LPCSTR lpFileName)\r
{\r
- if (lpFileName==0) return (HANDLE)-1;\r
+ if (!lpFileName) return (HANDLE)-1;\r
HANDLE hFile;\r
char *GrpFile;\r
- if (SFileOpenFileEx!=0 && SFileGetFileSize!=0\r
- && SFileSetFilePointer!=0 && SFileReadFile!=0\r
- && SFileCloseFile!=0) {\r
- if (SFileOpenFileEx(0,lpFileName,1,&hFile)==0) return (HANDLE)-1;\r
+ if (SFileOpenFileEx && SFileGetFileSize\r
+ && SFileSetFilePointer && SFileReadFile\r
+ && SFileCloseFile) {\r
+ if (!SFileOpenFileEx(0,lpFileName,1,&hFile)) return (HANDLE)-1;\r
DWORD fsz = SFileGetFileSize(hFile,0);\r
if (fsz<6) {\r
SFileCloseFile(hFile);\r
return (HANDLE)-1;\r
}\r
GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);\r
- if (GrpFile!=0) {\r
+ if (GrpFile) {\r
SFileSetFilePointer(hFile,0,0,FILE_BEGIN);\r
SFileReadFile(hFile,GrpFile,fsz,0,0);\r
}\r
return (HANDLE)-1;\r
}\r
GrpFile = (char *)VirtualAlloc(0,fsz,MEM_COMMIT,PAGE_READWRITE);\r
- if (GrpFile!=0) {\r
+ if (GrpFile) {\r
SetFilePointer(hFile,0,0,FILE_BEGIN);\r
ReadFile(hFile,GrpFile,fsz,&tsz,0);\r
}\r
\r
BOOL GRPAPI WINAPI DestroyGrp(HANDLE hGrp)\r
{\r
- if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE) return FALSE;\r
+ if (!hGrp || hGrp==INVALID_HANDLE_VALUE) return FALSE;\r
VirtualFree(hGrp,0,MEM_RELEASE);\r
return TRUE;\r
}\r
\r
BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WORD nFrame, DWORD *dwPalette, DWORD dwFlags, DWORD dwAlpha)\r
{\r
- if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE || hdcDest==0 || dwPalette==0) return FALSE;\r
+ if (!hGrp || hGrp==INVALID_HANDLE_VALUE || hdcDest==0 || !dwPalette) return FALSE;\r
GRPHEADER *GrpFile = (GRPHEADER *)hGrp;\r
nFrame %= GrpFile->nFrames;\r
FRAMEHEADER *GrpFrame = &((FRAMEHEADER *)(((char *)GrpFile)+6))[nFrame];\r
@@ -184,67 +193,119 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
nXDest += GrpFrame->Left;\r
nYDest += GrpFrame->Top;\r
WORD *GrpOffsets = ((WORD *)(((char *)GrpFile)+GrpFrame->Offset));\r
- for (DWORD y=0;y<GrpFrame->Height;y++) {\r
- BYTE *RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
- WORD x=0,ofs=0;\r
- while (x<GrpFrame->Width) {\r
- if (RowData[ofs]<=64) {\r
- if ((dwFlags&HORIZONTAL_FLIP)==0 && (dwFlags&VERTICAL_FLIP)==0) {\r
- for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ BYTE *RowData;\r
+ WORD x,ofs;\r
+ DWORD y;\r
+ WORD i;\r
+ if (!(dwFlags&HORIZONTAL_FLIP) && !(dwFlags&VERTICAL_FLIP)) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
}\r
- }\r
- else if (dwFlags&HORIZONTAL_FLIP && (dwFlags&VERTICAL_FLIP)==0) {\r
- for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
}\r
- else if ((dwFlags&HORIZONTAL_FLIP)==0 && dwFlags&VERTICAL_FLIP) {\r
- for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
+ else {\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ else if (dwFlags&HORIZONTAL_FLIP && !(dwFlags&VERTICAL_FLIP)) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
}\r
else {\r
- for (WORD i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
- ofs+=RowData[ofs]+1;\r
}\r
- else if (RowData[ofs]<=128) {\r
- if ((dwFlags&HORIZONTAL_FLIP)==0 && (dwFlags&VERTICAL_FLIP)==0) {\r
- for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
+ }\r
+ }\r
+ else if (!(dwFlags&HORIZONTAL_FLIP) && dwFlags&VERTICAL_FLIP) {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
}\r
- }\r
- else if (dwFlags&HORIZONTAL_FLIP && (dwFlags&VERTICAL_FLIP)==0) {\r
- for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,nYDest+y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
}\r
- else if ((dwFlags&HORIZONTAL_FLIP)==0 && dwFlags&VERTICAL_FLIP) {\r
- for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,nXDest+x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
+ else {\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ else {\r
+ for (y=0;y<GrpFrame->Height;y++) {\r
+ RowData = ((BYTE *)(((char *)GrpOffsets)+GrpOffsets[y]));\r
+ x=0; ofs=0;\r
+ while (x<GrpFrame->Width) {\r
+ if (!(RowData[ofs] & 0x80)) {\r
+ if (!(RowData[ofs] & 0x40)) {\r
+ for (i=1;i<=RowData[ofs] && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+i]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=RowData[ofs]+1;\r
+ }\r
+ else {\r
+ for (i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
+ SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
+ x++;\r
+ }\r
+ ofs+=2;\r
}\r
}\r
else {\r
- for (WORD i=0;i<RowData[ofs]-64 && x<GrpFrame->Width;i++) {\r
- SetPix(hdcDest,Right-x,Bottom-y,dwPalette[RowData[ofs+1]],dwFlags,dwAlpha);\r
- x++;\r
- }\r
+ x+=RowData[ofs]-128;\r
+ ofs++;\r
}\r
- ofs+=2;\r
- }\r
- else {\r
- x+=RowData[ofs]-128;\r
- ofs++;\r
}\r
}\r
}\r
@@ -253,21 +314,28 @@ BOOL GRPAPI WINAPI DrawGrp(HANDLE hGrp, HDC hdcDest, int nXDest, int nYDest, WOR
\r
BOOL GRPAPI WINAPI GetGrpInfo(HANDLE hGrp, GRPHEADER *GrpInfo)\r
{\r
- if (hGrp==0 || hGrp==INVALID_HANDLE_VALUE || GrpInfo==0) return FALSE;\r
+ if (!hGrp || hGrp==INVALID_HANDLE_VALUE || !GrpInfo) return FALSE;\r
memcpy(GrpInfo,hGrp,6);\r
return TRUE;\r
}\r
\r
+void GRPAPI WINAPI SetFunctionGetPixel(GETPIXELPROC lpGetPixelProc)\r
+{\r
+ MyGetPixel = lpGetPixelProc;\r
+}\r
+\r
+void GRPAPI WINAPI SetFunctionSetPixel(SETPIXELPROC lpSetPixelProc)\r
+{\r
+ MySetPixel = lpSetPixelProc;\r
+}\r
+\r
void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DWORD dwAlpha)\r
{\r
if (dwFlags&SHADOW_COLOR) {\r
- ((BYTE *)&clrColor)[0] = ((BYTE *)&dwFlags)[1];\r
- ((BYTE *)&clrColor)[1] = ((BYTE *)&dwFlags)[2];\r
- ((BYTE *)&clrColor)[2] = ((BYTE *)&dwFlags)[3];\r
- ((BYTE *)&clrColor)[3] = 0;\r
+ clrColor = (dwFlags >> 8) & 0x00FFFFFF;\r
}\r
if (dwFlags&ALPHA_BLEND) {\r
- DWORD dwColor = GetPixel(hDC,X,Y);\r
+ DWORD dwColor = MyGetPixel(hDC,X,Y);\r
\r
// Old alpha\r
/*((BYTE *)&dwColor)[0]*=1-((float)((BYTE *)&dwAlpha)[0]/256);\r
@@ -293,6 +361,5 @@ void __inline SetPix(HDC hDC, int X, int Y, COLORREF clrColor, DWORD dwFlags, DW
( ( ((BYTE *)&clrColor)[2] * ( ((BYTE *)&dwAlpha)[2] + 1 ) ) >> 8 )\r
+ ( ( ((BYTE *)&dwColor)[2] * ( 256 - ((BYTE *)&dwAlpha)[2] ) ) >> 8 );\r
}\r
- SetPixelV(hDC,X,Y,clrColor);\r
+ MySetPixel(hDC,X,Y,clrColor);\r
}\r
-\r