diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 491f0b219..9e2430478 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -51,7 +51,6 @@ #define IMP_BACKGROUND__TEXT_OFFSET_Y 12 #define IMP_BACKGROUND__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_BACKGROUND__TITLE_Y iScreenHeightOffset + 53 #define IMP_BACKGROUND__GREY_BOX_OFFSET_X 5 #define IMP_BACKGROUND__GREY_BOX_OFFSET_Y 7 @@ -366,10 +365,8 @@ void IMPBackgroundDisplaySkills() UINT16 usBoxPosX, usBoxPosY; HVOBJECT hImageHandle; - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); - //Display the title - DrawTextToScreen( L"I.M.P. Background", IMP_BACKGROUND__TITLE_X, IMP_BACKGROUND__TITLE_Y, sWidth, IMP_BACKGROUND__TITLE_FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( szBackgroundTitleText[0], IMP_BACKGROUND__TITLE_X, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, IMP_BACKGROUND__TITLE_FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); // Stats GetVideoObject(&hImageHandle, guiIMPBackground_GreyGoldBox ); diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index ef963f18f..40efa4392 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -169,17 +169,15 @@ void EnterIMPCharacterTrait( void ) void RenderIMPCharacterTrait( void ) -{ - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); - +{ //render the metal background graphic RenderProfileBackGround(); //Display the title if ( gGameOptions.fNewTraitSystem ) - DrawTextToScreen( gzIMPCharacterTraitText[IMP_NUMBER_CHARACTER_TRAITS], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPCharacterTraitText[IMP_NUMBER_CHARACTER_TRAITS], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); else - DrawTextToScreen( gzIMPAttitudesText[IMP_NUMBER_ATTITUDES], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPAttitudesText[IMP_NUMBER_ATTITUDES], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); IMPCharacterTraitDisplayCharacterTraits(); } diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index 3a4f52feb..e694a991f 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -91,11 +91,9 @@ void CreateIMPCharacterAndDisabilityEntranceButtons( void ) } void WriteIMPCharacterAndDisabilityEntranceText( void ) -{ - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); - +{ //Display the title - DrawTextToScreen( pCharacterTraitBeginIMPStrings[ 0 ], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( pCharacterTraitBeginIMPStrings[ 0 ], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); // The personality part DisplayWrappedString( LAPTOP_SCREEN_UL_X + 106, LAPTOP_SCREEN_WEB_UL_Y + 63, ( 400 - 100 ), 2, FONT12ARIAL, FONT_WHITE, pCharacterTraitBeginIMPStrings[ 1 ],FONT_BLACK,FALSE,CENTER_JUSTIFIED); diff --git a/Laptop/IMP Color Choosing.cpp b/Laptop/IMP Color Choosing.cpp index 8068aacb3..6534047e9 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -383,9 +383,7 @@ void EnterIMPColorChoice( void ) void RenderIMPColorChoice( void ) -{ - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); - +{ //render the metal background graphic RenderProfileBackGround(); @@ -399,14 +397,14 @@ void RenderIMPColorChoice( void ) DisplayWrappedString( LAPTOP_SCREEN_UL_X + 127, LAPTOP_SCREEN_WEB_UL_Y + 50, ( 426 - 200 ), 2, FONT10ARIAL, 142, gzIMPColorChoosingText[2],FONT_BLACK,FALSE,CENTER_JUSTIFIED); // title - DrawTextToScreen( gzIMPColorChoosingText[0], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPColorChoosingText[0], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } else { DisplayWrappedString( LAPTOP_SCREEN_UL_X + 127, LAPTOP_SCREEN_WEB_UL_Y + 50, ( 426 - 200 ), 2, FONT10ARIAL, 142, gzIMPColorChoosingText[3],FONT_BLACK,FALSE,CENTER_JUSTIFIED); // title - DrawTextToScreen( gzIMPColorChoosingText[1], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPColorChoosingText[1], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } // figure and frame diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index 75672dd4c..71b2771be 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -171,14 +171,12 @@ void EnterIMPDisabilityTrait( void ) void RenderIMPDisabilityTrait( void ) -{ - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); - +{ //render the metal background graphic RenderProfileBackGround(); // Display title - DrawTextToScreen( gzIMPDisabilityTraitText[IMP_DISABILITIES_NUMBER], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPDisabilityTraitText[IMP_DISABILITIES_NUMBER], LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); IMPDisabilityTraitDisplayDisabilityTraits(); } diff --git a/Laptop/IMP Finish.cpp b/Laptop/IMP Finish.cpp index c0c4f04dc..43b84a55a 100644 --- a/Laptop/IMP Finish.cpp +++ b/Laptop/IMP Finish.cpp @@ -634,9 +634,8 @@ BOOLEAN RenderCharProfileFinishFace( void ) */ void RenderCharFullName( void ) { - CHAR16 sString[ 64 ]; - INT16 sX, sY; + //INT16 sX, sY; // render the characters full name SetFont( FONT14ARIAL ); @@ -645,9 +644,10 @@ void RenderCharFullName( void ) swprintf( sString, pIMPFinishStrings[ 0 ], pFullName ); + DrawTextToScreen( sString, LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); - FindFontCenterCoordinates(LAPTOP_SCREEN_UL_X - 111, 0, LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X, 0 , sString , FONT14ARIAL, &sX, &sY); - mprintf( sX, iScreenHeightOffset + LAPTOP_SCREEN_WEB_DELTA_Y + 33, sString ); + //FindFontCenterCoordinates(LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, 0 , sString , FONT14ARIAL, &sX, &sY); + //mprintf( sX, iScreenHeightOffset + LAPTOP_SCREEN_WEB_DELTA_Y + 33, sString ); return; } diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index 18d66b14b..d487eda8e 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -54,7 +54,6 @@ #define IMP_MINOR_TRAIT__TEXT_OFFSET_Y 12 #define IMP_MINOR_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_MINOR_TRAIT__TITLE_Y iScreenHeightOffset + 53 #define IMP_MINOR_TRAIT__GREY_BOX_OFFSET_X 5 @@ -430,12 +429,10 @@ void IMPMinorTraitDisplaySkills() UINT32 uiCnt; UINT16 usPosX, usPosY; UINT16 usBoxPosX, usBoxPosY; - HVOBJECT hImageHandle; - - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + HVOBJECT hImageHandle; //Display the title - DrawTextToScreen( gzIMPSkillTraitsTextNewMinor[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ], IMP_MINOR_TRAIT__TITLE_X, IMP_MINOR_TRAIT__TITLE_Y, sWidth, IMP_MINOR_TRAIT__TITLE_FONT, IMP_MINOR_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPSkillTraitsTextNewMinor[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ], IMP_MINOR_TRAIT__TITLE_X, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, IMP_MINOR_TRAIT__TITLE_FONT, IMP_MINOR_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); // Stats GetVideoObject(&hImageHandle, guiIMT_GreyGoldBox ); diff --git a/Laptop/IMP Prejudice.cpp b/Laptop/IMP Prejudice.cpp index f6ccc3c77..f8959cb68 100644 --- a/Laptop/IMP Prejudice.cpp +++ b/Laptop/IMP Prejudice.cpp @@ -41,8 +41,6 @@ #define IMP_PREJUDICE__COLOR FONT_MCOLOR_WHITE #define IMP_PREJUDICE__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_PREJUDICE__TITLE_Y iScreenHeightOffset + 53 -#define IMP_PREJUDICE__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111) //******************************************************************* // @@ -297,11 +295,10 @@ void HandleIMPPrejudice( void ) void IMPPrejudiceDisplay() { - UINT16 usPosX, usPosY; - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + UINT16 usPosX, usPosY; //Display the title - DrawTextToScreen( L"I.M.P. Prejudices", IMP_PREJUDICE__TITLE_X, IMP_PREJUDICE__TITLE_Y, IMP_PREJUDICE__TITLE_WIDTH, FONT14ARIAL, IMP_PREJUDICE__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( szPersonalityTitleText[0], IMP_PREJUDICE__TITLE_X, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, FONT14ARIAL, IMP_PREJUDICE__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); ColorFillVideoSurfaceArea( FRAME_BUFFER, LAPTOP_SCREEN_UL_X + 2, LAPTOP_SCREEN_WEB_UL_Y + 40, LAPTOP_SCREEN_LR_X - 2, LAPTOP_SCREEN_WEB_UL_Y + 20 + 5 * DROPDOWN_MARKUP_Y, Get16BPPColor( FROMRGB( 100, 100, 100 ) ) ); diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 8f682a5ec..163b85eab 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -56,7 +56,6 @@ #define IMP_SKILL_TRAIT__TEXT_OFFSET_Y 12 #define IMP_SKILL_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_SKILL_TRAIT__TITLE_Y iScreenHeightOffset + 53 #define IMP_SKILL_TRAIT__GREY_BOX_OFFSET_X 5 #define IMP_SKILL_TRAIT__GREY_BOX_OFFSET_Y 7 @@ -798,9 +797,7 @@ void IMPSkillTraitDisplaySkills() UINT16 usBoxPosX, usBoxPosY; INT16 usSpaceBetweenButtons; UINT8 uiNumSkillsToStartRightColumn; - HVOBJECT hImageHandle; - - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + HVOBJECT hImageHandle; if ( gGameOptions.fNewTraitSystem ) { @@ -809,7 +806,7 @@ void IMPSkillTraitDisplaySkills() usSpaceBetweenButtons = IMP_SKILL_TRAIT__SPACE_BTN_BUTTONS + 5; //Display the title - DrawTextToScreen( gzIMPSkillTraitsTextNewMajor[ IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS ], IMP_SKILL_TRAIT__TITLE_X, IMP_SKILL_TRAIT__TITLE_Y, sWidth, IMP_SKILL_TRAIT__TITLE_FONT, IMP_SKILL_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPSkillTraitsTextNewMajor[ IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS ], IMP_SKILL_TRAIT__TITLE_X, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, IMP_SKILL_TRAIT__TITLE_FONT, IMP_SKILL_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } else { @@ -818,7 +815,7 @@ void IMPSkillTraitDisplaySkills() usSpaceBetweenButtons = IMP_SKILL_TRAIT__SPACE_BTN_BUTTONS; //Display the title - DrawTextToScreen( gzIMPSkillTraitsText[ IMP_SKILL_TRAITS__NUMBER_SKILLS ], IMP_SKILL_TRAIT__TITLE_X, IMP_SKILL_TRAIT__TITLE_Y, sWidth, IMP_SKILL_TRAIT__TITLE_FONT, IMP_SKILL_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPSkillTraitsText[ IMP_SKILL_TRAITS__NUMBER_SKILLS ], IMP_SKILL_TRAIT__TITLE_X, LAPTOP_TITLE_Y, LAPTOP_TEXT_WIDTH, IMP_SKILL_TRAIT__TITLE_FONT, IMP_SKILL_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } // Stats diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index 067a90af5..dce4b27be 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -133,7 +133,7 @@ void InitializeImpRecordLengthList( void ) void PrintImpText( void ) { - INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + INT16 sWidth = LAPTOP_TEXT_WIDTH; // looks at current page and prints text needed switch( iCurrentImpPage ) @@ -168,7 +168,7 @@ void PrintImpText( void ) case ( IMP_MAIN_PAGE ): // title - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 19, sWidth, IMP_MAIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_MAIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); // set up for IMP text for title box area switch( iCurrentProfileMode ) @@ -195,7 +195,7 @@ void PrintImpText( void ) case ( IMP_BEGIN ): // title - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_BEGIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED ); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_BEGIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED ); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 105, LAPTOP_SCREEN_WEB_UL_Y + 67, ( 390 - 105 ), IMP_BEGIN_2, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED); // fullname @@ -240,7 +240,7 @@ void PrintImpText( void ) DisplayWrappedString( LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 57, ( 456 - 200 ), 2, FONT12ARIAL, FONT_WHITE, pSkillTraitBeginIMPStrings[ 0 ],FONT_BLACK,FALSE,CENTER_JUSTIFIED); DisplayWrappedString( LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 140, ( 456 - 200 ), 2, FONT12ARIAL, FONT_WHITE, pSkillTraitBeginIMPStrings[ 1 ],FONT_BLACK,FALSE,CENTER_JUSTIFIED); } - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED ); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED ); break; @@ -254,7 +254,7 @@ void PrintImpText( void ) break; case ( IMP_PERSONALITY_FINISH ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X, LAPTOP_TITLE_Y, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); switch( bPersonalityEndState ) { case( 0 ): @@ -279,14 +279,14 @@ void PrintImpText( void ) } else { - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 50, ( 300 ), IMP_ATTRIB_5, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 130, ( 300 ), IMP_ATTRIB_6, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 200, ( 300 ), IMP_ATTRIB_7, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); } break; case( IMP_ATTRIBUTE_PAGE ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); // Moved this to "IMP Attribute Selection.cpp" - SANDRO // don't blit bonus if reviewing @@ -327,26 +327,26 @@ void PrintImpText( void ) break; case( IMP_ATTRIBUTE_FINISH ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, ( 356 - 100 ), IMP_AF_2 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break; case ( IMP_PORTRAIT ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_POR_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_POR_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 68, ( 240 ), IMP_POR_2 - 1, FONT10ARIAL, 142, TRUE, 0); break; case ( IMP_VOICE ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_VOC_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_VOC_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 70, ( 240 ), IMP_VOC_2 - 1, FONT10ARIAL, 142, TRUE, 0); break; case ( IMP_FINISH ): - //LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 7, ( 640 ), IMP_FIN_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, 0); + //LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 160, LAPTOP_TITLE_Y, ( 640 ), IMP_FIN_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, 0); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 150, LAPTOP_SCREEN_WEB_UL_Y + 55, ( 200 ), IMP_FIN_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0); break; case( IMP_CONFIRM ): - LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_CON_1 , FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X - 111, LAPTOP_TITLE_Y, sWidth, IMP_CON_1 , FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 60, ( 200 ), IMP_CON_2 , FONT12ARIAL, FONT_WHITE, TRUE, 0); //LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 145, ( 200 ), IMP_CON_3 , FONT12ARIAL, FONT_WHITE, TRUE, 0); // SANDRO - changed to show exact cost of profile diff --git a/Laptop/laptop.h b/Laptop/laptop.h index 039cc1c89..3ebfe1d9c 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -192,6 +192,8 @@ enum{ #define LAPTOP_SCREEN_WEB_UL_Y (LAPTOP_SCREEN_UL_Y + 19) #define LAPTOP_SCREEN_WEB_LR_Y (LAPTOP_SCREEN_WEB_UL_Y + LAPTOP_SCREEN_HEIGHT) #define LAPTOP_SCREEN_WEB_DELTA_Y 19 //LAPTOP_SCREEN_WEB_UL_Y - LAPTOP_SCREEN_UL_Y +#define LAPTOP_TITLE_Y (LAPTOP_SCREEN_WEB_UL_Y + 12) +#define LAPTOP_TEXT_WIDTH ((LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111)) // the laptop on/off button #define ON_X iScreenWidthOffset + 113 diff --git a/Utils/Text.h b/Utils/Text.h index d66d18375..a9da06ddc 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -2432,6 +2432,9 @@ enum PERSONALITYTEXT_PEOPLE, PERSONALITYTEXT_MAX, }; + +extern STR16 szBackgroundTitleText[]; +extern STR16 szPersonalityTitleText[]; extern STR16 szPersonalityDisplayText[]; extern STR16 szPersonalityHelpText[]; extern STR16 szRaceText[]; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 8aed0c95e..02b92a1df 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -7934,7 +7934,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%%医疗保证金\n", //L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 3f25680ac..687188a54 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -7950,7 +7950,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index abb73ade7..02f4c9c9a 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -7934,7 +7934,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= { L"You look", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 10a70588b..3326a61c8 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -7935,7 +7935,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index c46ff861b..b34e702eb 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -7758,7 +7758,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 4f3073e99..b66485186 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -7937,7 +7937,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_Ja25EnglishText.cpp b/Utils/_Ja25EnglishText.cpp index 77c0cf312..a94b43adc 100644 --- a/Utils/_Ja25EnglishText.cpp +++ b/Utils/_Ja25EnglishText.cpp @@ -453,7 +453,6 @@ STR16 gzIMPDisabilitiesHelpTexts[]= L"Reduced sight range.", }; - STR16 gzIMPProfileCostText[]= { L"The profile cost is $%d. Authorize payment?", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index bc144f9c5..d7fb2eb5b 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -7961,7 +7961,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 4a1bdf061..e12257ed1 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -7935,7 +7935,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look", diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index f1a1b4f0f..b0fa85d00 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -7953,7 +7953,17 @@ STR16 szBackgroundText_Value[]= L" %s%d%% insurance cost\n", }; +STR16 szBackgroundTitleText[] = // TODO.Translate +{ + L"I.M.P. Background", +}; + // Flugente: personality +STR16 szPersonalityTitleText[] = // TODO.Translate +{ + L"I.M.P. Prejudices", +}; + STR16 szPersonalityDisplayText[]= // TODO.Translate { L"You look",