1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +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/Font.cpp
+5 -5
View File
@@ -132,7 +132,7 @@ UINT32 uiRed, uiGreen, uiBlue;
//return;
std::wstringstream wss;
wss << L"invalid font index ( " << FontDefault << L" )";
THROWEXCEPTION(wss.str().c_str());
SGP_THROW(wss.str().c_str());
}
FontForeground8=ubForeground;
@@ -197,7 +197,7 @@ UINT32 uiRed, uiGreen, uiBlue;
//return;
std::wstringstream wss;
wss << L"invalid color background value ( " << ubBackground << L" )";
THROWEXCEPTION(wss.str().c_str());
SGP_THROW(wss.str().c_str());
}
FontBackground8=ubBackground;
@@ -942,9 +942,9 @@ BOOLEAN SetFont(INT32 iFontIndex)
//Assert(iFontIndex >= 0);
//Assert(iFontIndex <= MAX_FONTS);
//Assert(FontObjs[iFontIndex]!=NULL);
THROWIFFALSE( iFontIndex >= 0 ,"negative font index");
THROWIFFALSE( iFontIndex <= MAX_FONTS, "font index > MAX_FONTS" );
THROWIFFALSE( FontObjs[iFontIndex]!=NULL, "font is not initialized" );
SGP_THROW_IFFALSE( iFontIndex >= 0 ,"negative font index");
SGP_THROW_IFFALSE( iFontIndex <= MAX_FONTS, "font index > MAX_FONTS" );
SGP_THROW_IFFALSE( FontObjs[iFontIndex]!=NULL, "font is not initialized" );
#ifdef WINFONTS
SET_WINFONT(WinFontMap[iFontIndex]);
#endif