1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

*** Merged Code from Multiplayer Branch Revision 2960 ***

Browse Source 
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 21:01:45 +00:00
parent 17f44f63e8
commit 47db604b50
301 changed files with 76701 additions and 1843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/vobject.cpp
+76 -2
View File
@@ -455,6 +455,54 @@ HVOBJECT CreateVideoObject( VOBJECT_DESC *VObjectDesc )
}
}
if(hImage->ubBitDepth == 32)
{
hVObject->p16BPPObject = new SixteenBPPObjectInfo;
int SIZE = hImage->usHeight*hImage->usWidth;
hVObject->pPixData = new UINT32[SIZE];
memcpy(hVObject->pPixData, hImage->p32BPPData, SIZE*sizeof(UINT32));
hVObject->p16BPPObject->p16BPPData = NULL;
hVObject->p16BPPObject->sOffsetX = 0;
hVObject->p16BPPObject->sOffsetY = 0;
hVObject->p16BPPObject->ubShadeLevel = 0;
hVObject->p16BPPObject->usHeight = hImage->usHeight;
hVObject->p16BPPObject->usWidth = hImage->usWidth;
hVObject->p16BPPObject->usRegionIndex = 0;
hVObject->usNumberOf16BPPObjects = 1;
hVObject->ubBitDepth = hImage->ubBitDepth;
if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE )
{
DestroyImage( hImage );
}
return hVObject;
}
else if(hImage->ubBitDepth == 16)
{
hVObject->p16BPPObject = new SixteenBPPObjectInfo;
int SIZE = hImage->usHeight*hImage->usWidth;
hVObject->p16BPPObject->p16BPPData = new UINT16[SIZE];
memcpy(hVObject->p16BPPObject->p16BPPData, hImage->p16BPPData, SIZE*sizeof(UINT16));
hVObject->p16BPPObject->sOffsetX = 0;
hVObject->p16BPPObject->sOffsetY = 0;
hVObject->p16BPPObject->ubShadeLevel = 0;
hVObject->p16BPPObject->usHeight = hImage->usHeight;
hVObject->p16BPPObject->usWidth = hImage->usWidth;
hVObject->p16BPPObject->usRegionIndex = 0;
hVObject->usNumberOf16BPPObjects = 1;
hVObject->ubBitDepth = hImage->ubBitDepth;
if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE )
{
DestroyImage( hImage );
}
return hVObject;
}
// Check if returned himage is TRLE compressed - return error if not
if ( ! (hImage->fFlags & IMAGE_TRLECOMPRESSED ) )
{
@@ -723,23 +771,49 @@ BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJE
__try
{
// Assertions
Assert( pBuffer != NULL );
//Assert( pBuffer != NULL );
THROWIFFALSE( pBuffer != NULL, L"No Destination Buffer" );
if ( hSrcVObject == NULL )
{
//int breakpoint=0;
}
Assert( hSrcVObject != NULL );
//Assert( hSrcVObject != NULL );
THROWIFFALSE( hSrcVObject != NULL, L"No Source Object" )
SixteenBPPObjectInfo *image = NULL;
// Check For Flags and bit depths
switch( hSrcVObject->ubBitDepth )
{
case 32:
image = &hSrcVObject->p16BPPObject[usIndex];
#if 0
Blt16BPPTo16BPPTrans( pBuffer, uiDestPitchBYTES,
image->p16BPPData, image->usWidth * sizeof(UINT16),
iDestX, iDestY,
0, 0, image->usWidth, image->usHeight,
0 );
#else
Blt32BPPTo16BPPTrans( pBuffer, uiDestPitchBYTES,
(UINT32*)hSrcVObject->pPixData, image->usWidth * sizeof(UINT32),
iDestX, iDestY,
0, 0, image->usWidth, image->usHeight);
#endif
break;
case 16:
image = &hSrcVObject->p16BPPObject[usIndex];
Blt16BPPTo16BPP( pBuffer, uiDestPitchBYTES,
image->p16BPPData, image->usWidth * sizeof(UINT16),
iDestX, iDestY,
0, 0, image->usWidth, image->usHeight );
break;
case 8:
THROWIFFALSE( hSrcVObject->usNumberOfObjects > usIndex, L"Video object index is larger than the number of subimages");
// Switch based on flags given
do
{