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

- code cleanup mostly from Brent Johnson (Nonomori), a very few from me

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Lesh
2006-09-06 19:10:08 +00:00
parent f205c1f620
commit 6df124efd7
34 changed files with 174 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/CharProfile.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ INT32 giIMPButtonImage[1];
// visted subpages
BOOLEAN fVisitedIMPSubPages[ IMP_NUM_PAGES ];
extern INT32 iCurrentPortrait;
extern iCurrentVoices;
extern INT32 iCurrentVoices;
extern INT32 giMaxPersonalityQuizQuestion;
extern BOOLEAN fStartOverFlag;
Laptop/IMP Begin Screen.cpp
+4 -4
View File
@@ -586,7 +586,7 @@ void HandleBeginScreenTextEvent( UINT32 uiKey )
uiFullNameCharacterPosition = 0;
}
// make sure we haven't moved too far
if( ( uiFullNameCursorPosition + StringPixLength( ( CHAR16 *)&(uiKey ), FONT14ARIAL ) ) > FULL_NAME_REGION_WIDTH + 196 + LAPTOP_SCREEN_UL_X)
if( ( uiFullNameCursorPosition + StringPixLength( ( CHAR16 *)&(uiKey ), FONT14ARIAL ) ) > (UINT32)FULL_NAME_REGION_WIDTH + 196 + LAPTOP_SCREEN_UL_X)
{
// do nothing for now, when pop up is in place, display
break;
@@ -622,7 +622,7 @@ void HandleBeginScreenTextEvent( UINT32 uiKey )
}
// make sure we haven't moved too far
if( ( uiNickNameCursorPosition + StringPixLength( (CHAR16 *)&(uiKey ), FONT14ARIAL ) ) > NICK_NAME_REGION_WIDTH + 196 + LAPTOP_SCREEN_UL_X )
if( ( uiNickNameCursorPosition + StringPixLength( (CHAR16 *)&(uiKey ), FONT14ARIAL ) ) > (UINT32)NICK_NAME_REGION_WIDTH + 196 + LAPTOP_SCREEN_UL_X )
{
// do nothing for now, when pop up is in place, display
break;
@@ -1244,8 +1244,6 @@ void Print8CharacterOnlyString( void )
BOOLEAN CheckCharacterInputForEgg( void )
{
MERC_HIRE_STRUCT HireMercStruct;
#ifndef JA2BETAVERSION
return( FALSE );
#else
@@ -1456,6 +1454,8 @@ BOOLEAN CheckCharacterInputForEgg( void )
iPortraitNumber = 2;
//DEF: temp
MERC_HIRE_STRUCT HireMercStruct;
HireMercStruct.sSectorX = gsMercArriveSectorX;
HireMercStruct.sSectorY = gsMercArriveSectorY;
HireMercStruct.bSectorZ = 0;