1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
** 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:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text Input.cpp
+32 -24
View File
@@ -281,7 +281,7 @@ void AddTextInputField( INT16 sLeft, INT16 sTop, INT16 sWidth, INT16 sHeight, IN
if( szInitText )
{
pNode->ubStrLen = (UINT8)wcslen( szInitText );
Assert( pNode->ubStrLen <= ubMaxChars );//dnl Warning if filename is longer this will throw assertion, need to be consider in future!!!
Assert( pNode->ubStrLen <= ubMaxChars );
swprintf( pNode->szString, szInitText );
}
else
@@ -1093,37 +1093,33 @@ void HandleExclusiveInput( UINT32 uiKey )
}
}
void AddChar( UINT32 uiKey )
//dnl ch39 180909
void AddChar(UINT32 uiKey)
{
PlayJA2Sample( ENTERING_TEXT, RATE_11025, BTNVOLUME, 1, MIDDLEPAN );
if( gpActive->ubStrLen >= gpActive->ubMaxChars )
{ //max length reached. Just replace the last character with new one.
/*dnl this part has no sense and is wrong escpecially when you insert characters then last was always replace
gpActive->ubStrLen = gpActive->ubMaxChars;
gpActive->szString[ gpActive->ubStrLen-1 ] = (UINT16)uiKey;
gpActive->szString[ gpActive->ubStrLen ] = '\0';
*/
PlayJA2Sample(ENTERING_TEXT, RATE_11025, BTNVOLUME, 1, MIDDLEPAN);
if(gpActive->ubStrLen >= gpActive->ubMaxChars)
return;
}
else if( gubCursorPos == gpActive->ubStrLen )
{ //add character to end
gpActive->szString[ gpActive->ubStrLen ] = (UINT16)uiKey;
gpActive->szString[ gpActive->ubStrLen + 1 ] = '\0';
else if(gubCursorPos == gpActive->ubStrLen)
{
// Add character to end
gpActive->szString[gpActive->ubStrLen] = (UINT16)uiKey;
gpActive->szString[gpActive->ubStrLen+1] = L'\0';
gpActive->ubStrLen++;
gubCursorPos = gpActive->ubStrLen;
}
else
{ //insert character after cursor
{
// Insert character after cursor
INT16 sChar;
sChar = (INT16)gpActive->ubStrLen;//dnl sChar = (INT16)(gpActive->ubStrLen + 1); disbanded because was lead into heap breach detected by debugger because gpActive->szString[ sChar + 1 ] was always overlap 2 bytes out of allocation region
while( sChar >= gubCursorPos )
sChar = (INT16)gpActive->ubStrLen;
while(sChar >= gubCursorPos)
{
gpActive->szString[ sChar + 1 ] = gpActive->szString[ sChar ];
gpActive->szString[sChar+1] = gpActive->szString[sChar];
sChar--;
}
gpActive->szString[ gubCursorPos ] = (UINT16)uiKey;
gpActive->szString[gubCursorPos] = (UINT16)uiKey;
gpActive->ubStrLen++;
gpActive->szString[ gpActive->ubStrLen ] = '\0';//dnl
gpActive->szString[gpActive->ubStrLen] = L'\0';
gubCursorPos++;
}
}
@@ -1328,10 +1324,14 @@ void RenderActiveTextField()
if ( strPixLen > regionXLen )
{
// if the cursor is left of the visible position
if (gubCursorPos < gubParkingPos)
if (gubCursorPos <= gubParkingPos)
{
// shift the visible string left
gubParkingPos = gubCursorPos;
//dnl ch39 190909
UINT16 visPixLengthToCursor = 0;
while(visPixLengthToCursor < (3*regionXLen/4) && gubParkingPos > 0)
visPixLengthToCursor = SubstringPixLength(gpActive->szString, --gubParkingPos, gubCursorPos, pColors->usFont);
}
// if the cursor is right of the visible position
else if (gubCursorPos > gubParkingPos)
@@ -1353,13 +1353,19 @@ void RenderActiveTextField()
gubParkingPos += j + 1;
}
}
scrollCursorPos = gubCursorPos - gubParkingPos; // set the relative cursor position (for drawing only)
scrollStrLen = gpActive->ubStrLen - gubParkingPos;
//dnl ch39 190909
scrollStrLen = gpActive->ubStrLen;
while(scrollStrLen > gubParkingPos && SubstringPixLength(gpActive->szString, gubParkingPos, scrollStrLen, pColors->usFont) > (gpActive->region.RegionBottomRightX-gpActive->region.RegionTopLeftX))
--scrollStrLen;
scrollStrLen -= gubParkingPos;
while(gubCursorPos > (gubParkingPos + scrollStrLen))
++scrollStrLen;
memcpy(scrollStr,&gpActive->szString[gubParkingPos], scrollStrLen*sizeof(CHAR16));
}
else
{
gubParkingPos = 0;//dnl ch39 190909
scrollCursorPos = gubCursorPos;
scrollStrLen = gpActive->ubStrLen;
memcpy(scrollStr,gpActive->szString, scrollStrLen*sizeof(CHAR16));
@@ -1374,6 +1380,8 @@ void RenderActiveTextField()
if( gubStartHilite < gubEndHilite )
{
// translate hilite positions into the shifted string
if(gubStartHilite < gubParkingPos)//dnl ch39 190909
gubStartHilite = gubParkingPos;
usStart = gubStartHilite - gubParkingPos;
usEnd = gubEndHilite - gubParkingPos;
}