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

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/vsurface.cpp
+17 -5
View File
@@ -167,7 +167,7 @@ namespace SurfaceData
SurfaceData::_surfaceOfData[data] = surfaceID;
return data;
}
THROWEXCEPTION(L"Unregistered surface ID");
SGP_THROW(L"Unregistered surface ID");
}
BYTE* SetSurfaceData(HVSURFACE surface, BYTE* data)
{
@@ -181,7 +181,7 @@ namespace SurfaceData
return data;
}
}
THROWEXCEPTION(L"Unregistered surface");
SGP_THROW(L"Unregistered surface");
}
void ReleaseSurfaceData(tID surfaceID)
{
@@ -246,7 +246,8 @@ namespace SurfaceData
{
return it->second;
}
THROWEXCEPTION(L"Pointer to surface invalid");
//SGP_THROW(L"Pointer to surface invalid");
return 0;
}
};
@@ -1035,9 +1036,20 @@ HVSURFACE CreateVideoSurface( VSURFACE_DESC *VSurfaceDesc )
//
// Create himage object from file
//
ImageFileType::TestOrder order = ImageFileType::JPC_FALLBACK;
if(VSurfaceDesc->fCreateFlags & VSURFACE_CREATE_FROMJPC) {
order = ImageFileType::JPC;
} if(VSurfaceDesc->fCreateFlags & VSURFACE_CREATE_FROMJPC_FALLBACK) {
order = ImageFileType::JPC_FALLBACK;
} if(VSurfaceDesc->fCreateFlags & VSURFACE_CREATE_FROMPNG) {
order = ImageFileType::PNG;
} if(VSurfaceDesc->fCreateFlags & VSURFACE_CREATE_FROMPNG_FALLBACK) {
order = ImageFileType::PNG_FALLBACK;
}
hImage = CreateImage( VSurfaceDesc->ImageFile, IMAGE_ALLIMAGEDATA );
SGP_THROW_IFFALSE(hImage = CreateImage( VSurfaceDesc->ImageFile, IMAGE_ALLIMAGEDATA, order ),
_BS(L"Could not create video surface from file : ") << vfs::String(VSurfaceDesc->ImageFile) << _BS::wget);
if ( hImage == NULL )
{
DbgMessage( TOPIC_VIDEOSURFACE, DBG_LEVEL_2, "Invalid Image Filename given" );