tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-10-15 16:03:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

all declarations using ddraw7 instead of ddraw4 . (#127)

Browse source
This commit is contained in:
Zero Fanker 2024-12-16 21:28:01 -05:00 • committed by GitHub
parent 8960096b3b
commit 70d1cd038b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 60 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MissionEditorPackLib/MissionEditorPackLib.cpp
View file

@ -315,7 +315,7 @@ namespace FSunPackLib
return DP;
}
std::int32_t GetFirstPixelColor(IDirectDrawSurface4* pDDS)
std::int32_t GetFirstPixelColor(IDirectDrawSurface7* pDDS)
{
std::int32_t color = 0;
@ -337,7 +337,7 @@ namespace FSunPackLib
}
HRESULT SetColorKey(IDirectDrawSurface4* pDDS, COLORREF rgb)
HRESULT SetColorKey(IDirectDrawSurface7* pDDS, COLORREF rgb)
{
DDPIXELFORMAT pf = { 0 };
pf.dwSize = sizeof(DDPIXELFORMAT);
@ -714,7 +714,7 @@ namespace FSunPackLib
}
BOOL LoadSHPImageInSurface(IDirectDraw4* pdd, HTSPALETTE hPalette, int iImageIndex, int iCount, LPDIRECTDRAWSURFACE4* pdds)
BOOL LoadSHPImageInSurface(IDirectDraw7* pdd, HTSPALETTE hPalette, int iImageIndex, int iCount, LPDIRECTDRAWSURFACE7* pdds)
{
RGBTRIPLE rgb_transp;
t_shp_ts_image_header imghead;
@ -1082,7 +1082,7 @@ namespace FSunPackLib
}
BOOL LoadTMPImageInSurface(IDirectDraw4* pdd, int iStart, int iCount, LPDIRECTDRAWSURFACE4* pdds, HTSPALETTE hPalette)
BOOL LoadTMPImageInSurface(IDirectDraw7* pdd, int iStart, int iCount, LPDIRECTDRAWSURFACE7* pdds, HTSPALETTE hPalette)
{
last_succeeded_operation = 2100;
@ -1636,7 +1636,7 @@ namespace FSunPackLib
VoxelNormalTable emptyNormalTable;
#if defined(XCC_VXL_DRAW)
BOOL LoadVXLImageInSurface(const VoxelNormalTables& normalTables, Vec3f lightDirection, IDirectDraw4* pdd, int iStart, int iCount, const Vec3f rotation, const Vec3f postHVAOffset, LPDIRECTDRAWSURFACE4* pdds, HTSPALETTE hPalette, int* lpXCenter, int* lpYCenter, int ZAdjust, int* lpXCenterZMax, int* lpYCenterZMax, int i3dCenterX, int i3dCenterY)
BOOL LoadVXLImageInSurface(const VoxelNormalTables& normalTables, Vec3f lightDirection, IDirectDraw4* pdd, int iStart, int iCount, const Vec3f rotation, const Vec3f postHVAOffset, LPDIRECTDRAWSURFACE7* pdds, HTSPALETTE hPalette, int* lpXCenter, int* lpYCenter, int ZAdjust, int* lpXCenterZMax, int* lpYCenterZMax, int i3dCenterX, int i3dCenterY)
{
if (hPalette == NULL || hPalette > dwPalCount) return NULL;

8
MissionEditorPackLib/MissionEditorPackLib.h
View file

@ -205,10 +205,10 @@ namespace FSunPackLib
BOOL LoadTMPImageInSurface(IDirectDraw4* pdd, int iStart, int iCount, LPDIRECTDRAWSURFACE4* pdds, HTSPALETTE hPalette);
BOOL LoadTMPImageInSurface(IDirectDraw7* pdd, int iStart, int iCount, LPDIRECTDRAWSURFACE7* pdds, HTSPALETTE hPalette);
BOOL LoadTMPImage(int iStart, int iCount, BYTE** lpTileArray);
BOOL LoadSHPImageInSurface(IDirectDraw4* pdd, HTSPALETTE hPalette, int iImageIndex, int iCount, LPDIRECTDRAWSURFACE4* pdds);
BOOL LoadSHPImageInSurface(IDirectDraw7* pdd, HTSPALETTE hPalette, int iImageIndex, int iCount, LPDIRECTDRAWSURFACE7* pdds);
// load 'wantedNum' frames at 'startIndex'
BOOL LoadSHPImage(int startIndex, int wantedNum, BYTE** lpPics);
BOOL LoadSHPImage(int iImageIndex, std::vector<BYTE>& pic);
@ -229,7 +229,7 @@ namespace FSunPackLib
BOOL GetVXLSectionInfo(int section, VoxelNormalClass& normalClass);
#if defined(XCC_VXL_DRAW)
BOOL LoadVXLImageInSurface(const VoxelNormalTables& normalTables, Vec3f lightDirection, IDirectDraw4* pdd, int iStart, int iCount, Vec3f rotation, Vec3f modelOffset, LPDIRECTDRAWSURFACE4* pdds, HTSPALETTE hPalette, int* lpXCenter = NULL, int* lpYCenter = NULL, int ZAdjust = 0, int* lpXCenterZMax = NULL, int* lpYCenterZMax = NULL, int i3dCenterX = -1, int i3dCenterY = -1);
BOOL LoadVXLImageInSurface(const VoxelNormalTables& normalTables, Vec3f lightDirection, IDirectDraw7* pdd, int iStart, int iCount, Vec3f rotation, Vec3f modelOffset, LPDIRECTDRAWSURFACE7* pdds, HTSPALETTE hPalette, int* lpXCenter = NULL, int* lpYCenter = NULL, int ZAdjust = 0, int* lpXCenterZMax = NULL, int* lpYCenterZMax = NULL, int i3dCenterX = -1, int i3dCenterY = -1);
#endif
// modelOffset is applied before VXL/HVA translates and scales and before model-to-world rotation
@ -251,7 +251,7 @@ namespace FSunPackLib
BOOL WriteMixFile(LPCTSTR lpMixFile, LPCSTR* lpFiles, DWORD dwFileCount, Game game);
HRESULT SetColorKey(IDirectDrawSurface4* pDDS, COLORREF rgb);
HRESULT SetColorKey(IDirectDrawSurface7* pDDS, COLORREF rgb);
std::pair<MemoryBuffer, bool> LoadCCFile(LPCTSTR name, HMIXFILE hMix);
};