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

bug fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/Font.cpp
+43 -88
View File
@@ -333,10 +333,7 @@ int count;
// This function returns (-1) if it fails, and debug msgs for a reason.
// Otherwise the font number is returned.
//*****************************************************************************
template INT32 LoadFontFile<char *>(char *);
template INT32 LoadFontFile<char const *>(char const *);
template <typename string1>
INT32 LoadFontFile(string1 filename)
INT32 LoadFontFile(const STR8 filename)
{
VOBJECT_DESC vo_desc;
UINT32 LoadIndex;
@@ -419,10 +416,10 @@ UINT32 GetWidth(HVOBJECT hSrcVObject, INT16 ssIndex)
// evaluate to is 512.
// 'uiCharCount' specifies how many characters of the string are counted.
//*****************************************************************************
INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, wchar_t *pFontString, ...)
INT16 StringPixLengthArg(INT32 usUseFont, UINT32 uiCharCount, STR16 pFontString, ...)
{
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
Assert(pFontString!=NULL);
@@ -457,12 +454,12 @@ wchar_t string[512];
// 'uiCharCount' specifies how many characters of the string are counted.
// YOU HAVE TO PREBUILD THE FAST HELP STRING!
//*****************************************************************************
INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, wchar_t *pFontString )
INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCharCount, STR16 pFontString )
{
wchar_t string[512];
CHAR16 string[512];
UINT32 i, index;
INT16 sBoldDiff = 0;
wchar_t str[2];
CHAR16 str[2];
Assert(pFontString!=NULL);
@@ -518,10 +515,11 @@ INT16 StringPixLengthArgFastHelp(INT32 usUseFont, INT32 usBoldFont, UINT32 uiCha
// Created on: 12/1/99
//
//*****************************************************************************************
INT16 StringNPixLength(wchar_t *string, UINT32 uiMaxCount, INT32 UseFont)
INT16 StringNPixLength(STR16 string, UINT32 uiMaxCount, INT32 UseFont)
{
UINT32 Cur, uiCharCount;
wchar_t *curletter,transletter;
STR16 curletter;
UINT16 transletter;
Cur = 0;
uiCharCount = 0;
@@ -543,11 +541,7 @@ INT16 StringNPixLength(wchar_t *string, UINT32 uiMaxCount, INT32 UseFont)
// Returns the length of a string in pixels, depending on the font given.
//
//*****************************************************************************
template INT16 StringPixLength<short *>(short *, INT32);
template INT16 StringPixLength<unsigned short const *>(unsigned short const *, INT32);
template INT16 StringPixLength<wchar_t const *>(wchar_t const *, INT32);
template <typename type1>
INT16 StringPixLength(type1 string, INT32 UseFont)
INT16 StringPixLength(const STR16 string, INT32 UseFont)
{
UINT32 Cur;
UINT16 *curletter,transletter;
@@ -657,7 +651,7 @@ UINT16 GetFontHeight(INT32 FontNum)
// CreateEnglishTransTable()
//
//*****************************************************************************
INT16 GetIndex(UINT16 siChar)
INT16 GetIndex(CHAR16 siChar)
{
UINT16 *pTrav;
UINT16 ssCount=0;
@@ -731,25 +725,19 @@ BOOLEAN SetFontDestBuffer(UINT32 DestBuffer, INT32 x1, INT32 y1, INT32 x2, INT32
// the parameters are identical to printf. The resulting string may be no longer
// than 512 word-characters. Uses monochrome font color settings
//*****************************************************************************
template UINT32 mprintf<wchar_t *>(INT32, INT32, wchar_t *, ...);
template UINT32 mprintf<wchar_t const *>(INT32, INT32, wchar_t const *, ...);
template UINT32 mprintf<short *>(INT32, INT32, short *, ...);
template UINT32 mprintf<unsigned short *>(INT32, INT32, unsigned short *, ...);
template UINT32 mprintf<unsigned short const *>(INT32, INT32, unsigned short const *, ...);
template <typename type3>
UINT32 mprintf(INT32 x, INT32 y, type3 pFontString, ...)
UINT32 mprintf(INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT32 uiDestPitchBYTES;
UINT8 *pDestBuf;
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
curletter=string;
@@ -788,49 +776,31 @@ UINT8 *pDestBuf;
return(0);
}
template void VarFindFontRightCoordinates<short *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, short *, ...);
template void VarFindFontRightCoordinates<unsigned short *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short *, ...);
template void VarFindFontRightCoordinates<wchar_t *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t *, ...);
template void VarFindFontRightCoordinates<wchar_t const *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t const *, ...);
template <typename type8>
void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... )
void VarFindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... )
{
wchar_t string[512];
CHAR16 string[512];
va_list argptr;
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
FindFontRightCoordinates( sLeft, sTop, sWidth, sHeight, string, iFontIndex, psNewX, psNewY );
}
template void VarFindFontCenterCoordinates<wchar_t *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t *, ...);
template void VarFindFontCenterCoordinates<wchar_t const *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, wchar_t const*, ...);
template void VarFindFontCenterCoordinates<short *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, short *, ...);
template void VarFindFontCenterCoordinates<unsigned short *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short *, ...);
template void VarFindFontCenterCoordinates<unsigned short const *>(INT16, INT16, INT16, INT16, INT32, INT16 *, INT16 *, unsigned short const*, ...);
template <typename type8>
void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, type8 pFontString, ... )
void VarFindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY, const STR16 pFontString, ... )
{
wchar_t string[512];
CHAR16 string[512];
va_list argptr;
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, string, iFontIndex, psNewX, psNewY );
}
template void FindFontRightCoordinates<wchar_t *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, wchar_t *, INT32, unsigned short *, unsigned short *);
template void FindFontRightCoordinates<short *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, short *, INT32, unsigned short *, unsigned short *);
template void FindFontRightCoordinates<short *, short *, unsigned short *>(INT16, INT16, INT16, INT16, short *, INT32, short *, unsigned short *);
template void FindFontRightCoordinates<unsigned short *, short *, short *>(INT16, INT16, INT16, INT16, unsigned short *, INT32, short *, short *);
template void FindFontRightCoordinates<unsigned short *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, unsigned short *, INT32, unsigned short *, unsigned short *);
template void FindFontRightCoordinates<wchar_t *, wchar_t *, wchar_t *>(INT16, INT16, INT16, INT16, wchar_t *, INT32, wchar_t *, wchar_t *);
template <typename string5, typename string7, typename string8>
void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY )
void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY )
{
INT16 xp,yp;
@@ -842,14 +812,7 @@ void FindFontRightCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHei
*psNewY = yp;
}
template void FindFontCenterCoordinates<wchar_t *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, wchar_t *, INT32, unsigned short *, unsigned short *);
template void FindFontCenterCoordinates<short *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, short *, INT32, unsigned short *, unsigned short *);
template void FindFontCenterCoordinates<unsigned short *, unsigned short *, unsigned short *>(INT16, INT16, INT16, INT16, unsigned short *, INT32, unsigned short *, unsigned short *);
template void FindFontCenterCoordinates<unsigned short *, short *, short *>(INT16, INT16, INT16, INT16, unsigned short *, INT32, short *, short *);
template void FindFontCenterCoordinates<short *, short *, short *>(INT16, INT16, INT16, INT16, short *, INT32, short *, short *);
template void FindFontCenterCoordinates<wchar_t *, wchar_t *, wchar_t *>(INT16, INT16, INT16, INT16, wchar_t *, INT32, wchar_t *, wchar_t *);
template <typename string5, typename string7, typename string8>
void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, string5 pStr, INT32 iFontIndex, string7 psNewX, string8 psNewY )
void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, const STR16 pStr, INT32 iFontIndex, INT16 *psNewX, INT16 *psNewY )
{
INT16 xp,yp;
@@ -869,12 +832,12 @@ void FindFontCenterCoordinates( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHe
// the parameters are identical to printf. The resulting string may be no longer
// than 512 word-characters.
//*****************************************************************************
UINT32 gprintf(INT32 x, INT32 y, wchar_t *pFontString, ...)
UINT32 gprintf(INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT32 uiDestPitchBYTES;
UINT8 *pDestBuf;
@@ -920,12 +883,12 @@ UINT8 *pDestBuf;
return(0);
}
UINT32 gprintfDirty(INT32 x, INT32 y, wchar_t *pFontString, ...)
UINT32 gprintfDirty(INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT32 uiDestPitchBYTES;
UINT8 *pDestBuf;
@@ -989,12 +952,12 @@ UINT8 *pDestBuf;
// the parameters are identical to printf. The resulting string may be no longer
// than 512 word-characters.
//*****************************************************************************
UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, wchar_t *pFontString, ...)
UINT32 gprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
Assert(pFontString!=NULL);
@@ -1033,23 +996,17 @@ wchar_t string[512];
return(0);
}
template UINT32 mprintf_buffer<short *>(UINT8 *, UINT32, UINT32, INT32, INT32, short *, ...);
template UINT32 mprintf_buffer<unsigned short *>(UINT8 *, UINT32, UINT32, INT32, INT32, unsigned short *, ...);
template UINT32 mprintf_buffer<unsigned short const*>(UINT8 *, UINT32, UINT32, INT32, INT32, unsigned short const*, ...);
template UINT32 mprintf_buffer<wchar_t *>(UINT8 *, UINT32, UINT32, INT32, INT32, wchar_t *, ...);
template UINT32 mprintf_buffer<wchar_t const*>(UINT8 *, UINT32, UINT32, INT32, INT32, wchar_t const*, ...);
template <typename string6>
UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...)
UINT32 mprintf_buffer( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
curletter=string;
@@ -1082,20 +1039,18 @@ wchar_t string[512];
return(0);
}
template UINT32 mprintf_buffer_coded<short *>(UINT8 *, UINT32, UINT32, INT32, INT32, short *, ...);
template <typename string6>
UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, string6 pFontString, ...)
UINT32 mprintf_buffer_coded( UINT8 *pDestBuf, UINT32 uiDestPitchBYTES, UINT32 FontType, INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT16 usOldForeColor;
Assert(pFontString!=NULL);
va_start(argptr, pFontString); // Set up variable argument pointer
vswprintf((wchar_t *)string, (wchar_t *)pFontString, argptr); // process gprintf string (get output str)
vswprintf(string, pFontString, argptr); // process gprintf string (get output str)
va_end(argptr);
curletter=string;
@@ -1144,12 +1099,12 @@ UINT16 usOldForeColor;
}
UINT32 mprintf_coded( INT32 x, INT32 y, wchar_t *pFontString, ...)
UINT32 mprintf_coded( INT32 x, INT32 y, const STR16 pFontString, ...)
{
INT32 destx, desty;
wchar_t *curletter, transletter;
CHAR16 *curletter, transletter;
va_list argptr;
wchar_t string[512];
CHAR16 string[512];
UINT16 usOldForeColor;
UINT32 uiDestPitchBYTES;
UINT8 *pDestBuf;