mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
**********************************************************
** Big Maps Projects code (incl. Multiplayer v1.5 ** ********************************************************** - Merged Big Maps Project code from BMP+MP trunk (Revision: 3340) o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - Before THIS merge, I made a branch of the existing 1.13 source o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src - Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago - I will add VS 2010 projects and solution file in the next few days git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1296,8 +1296,6 @@ INT16 GetNumberOfLinesInHeight( const STR16 pStringA )
|
||||
{
|
||||
STR16 pToken;
|
||||
INT16 sCounter = 0;
|
||||
// HEADROCK HAM 3.6: This is a serious limitation... Increasing size
|
||||
//CHAR16 pString[ 512 ];
|
||||
CHAR16 pString[ 4096 ];
|
||||
|
||||
wcscpy( pString, pStringA );
|
||||
@@ -1307,14 +1305,16 @@ INT16 GetNumberOfLinesInHeight( const STR16 pStringA )
|
||||
|
||||
while( pToken != NULL )
|
||||
{
|
||||
// HEADROCK HAM 3.6: Make sure that all lines can appear on screen. If impossible, reduce number of lines
|
||||
// artificially.
|
||||
// WANNE: Fix by Headrock
|
||||
if ( (sCounter+1) * (GetFontHeight(FONT10ARIAL)+1) > (SCREEN_HEIGHT - 10) )
|
||||
{
|
||||
break;
|
||||
}
|
||||
pToken = wcstok( NULL, L"\n" );
|
||||
sCounter++;
|
||||
{
|
||||
break;
|
||||
}
|
||||
pToken = wcstok( NULL, L"\n" );
|
||||
sCounter++;
|
||||
|
||||
/*pToken = wcstok( NULL, L"\n" );
|
||||
sCounter++;*/
|
||||
}
|
||||
|
||||
return( sCounter );
|
||||
@@ -1387,8 +1387,6 @@ void DisplayFastHelp( MOUSE_REGION *region )
|
||||
|
||||
INT16 GetWidthOfString( const STR16 pStringA )
|
||||
{
|
||||
// HEADROCK HAM 3.6: This is a serious limitation... Increasing size.
|
||||
//CHAR16 pString[ 512 ];
|
||||
CHAR16 pString[ 4096 ];
|
||||
STR16 pToken;
|
||||
INT16 sWidth = 0;
|
||||
@@ -1416,8 +1414,6 @@ void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY )
|
||||
STR16 pToken;
|
||||
INT32 iCounter = 0, i;
|
||||
UINT32 uiCursorXPos;
|
||||
// HEADROCK HAM 3.6: This is a serious limitation... Increasing size
|
||||
//CHAR16 pString[ 512 ];
|
||||
CHAR16 pString[ 4096 ];
|
||||
INT32 iLength;
|
||||
|
||||
@@ -1428,14 +1424,15 @@ void DisplayHelpTokenizedString( const STR16 pStringA, INT16 sX, INT16 sY )
|
||||
|
||||
while( pToken != NULL )
|
||||
{
|
||||
// HEADROCK HAM 3.6: If height of screen exceeds screen height, replace the last VISIBLE line with "..."
|
||||
// and break the cycle.
|
||||
// WANNE: Fix by Headrock
|
||||
if ( (iCounter+2) * (GetFontHeight(FONT10ARIAL)+1) > (SCREEN_HEIGHT - 10) )
|
||||
{
|
||||
mprintf( sX, sY + iCounter * (GetFontHeight(FONT10ARIAL)+1), L"..." );
|
||||
break;
|
||||
}
|
||||
iLength = (INT32)wcslen( pToken );
|
||||
{
|
||||
mprintf( sX, sY + iCounter * (GetFontHeight(FONT10ARIAL)+1), L"..." );
|
||||
break;
|
||||
}
|
||||
iLength = (INT32)wcslen( pToken );
|
||||
|
||||
//iLength = (INT32)wcslen( pToken );
|
||||
for( i = 0; i < iLength; i++ )
|
||||
{
|
||||
uiCursorXPos = StringPixLengthArgFastHelp( FONT10ARIAL, FONT10ARIALBOLD, i, pToken );
|
||||
|
||||
Reference in New Issue
Block a user