From f7f07d48974f77432c361faa4cd9af2e49f1271e Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 7 Nov 2013 13:42:05 +0000 Subject: [PATCH] - Fixed wrong x-location of IMP title texts git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6562 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/IMP Background.cpp | 5 +++-- Laptop/IMP Character Trait.cpp | 12 +++++------- Laptop/IMP Character and Disability Entrance.cpp | 4 +++- Laptop/IMP Color Choosing.cpp | 8 +++++--- Laptop/IMP Disability Trait.cpp | 12 +++--------- Laptop/IMP HomePage.cpp | 1 - Laptop/IMP Minor Trait.cpp | 6 ++++-- Laptop/IMP Prejudice.cpp | 3 ++- Laptop/IMP Skill Trait.cpp | 7 ++++--- Laptop/IMP Text System.cpp | 3 ++- 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 57c0d3c2..491f0b21 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -52,7 +52,6 @@ #define IMP_BACKGROUND__TITLE_X LAPTOP_SCREEN_UL_X - 111 #define IMP_BACKGROUND__TITLE_Y iScreenHeightOffset + 53 -#define IMP_BACKGROUND__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ) #define IMP_BACKGROUND__GREY_BOX_OFFSET_X 5 #define IMP_BACKGROUND__GREY_BOX_OFFSET_Y 7 @@ -367,8 +366,10 @@ 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, IMP_BACKGROUND__TITLE_WIDTH, IMP_BACKGROUND__TITLE_FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + 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 ); // Stats GetVideoObject(&hImageHandle, guiIMPBackground_GreyGoldBox ); diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index 91ffeeef..ef963f18 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -45,10 +45,6 @@ #define IMP_CHARACTER_TRAIT__TEXT_OFFSET_X 65 #define IMP_CHARACTER_TRAIT__TEXT_OFFSET_Y 12 -#define IMP_CHARACTER_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_CHARACTER_TRAIT__TITLE_Y iScreenHeightOffset + 53 -#define IMP_CHARACTER_TRAIT__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ) - #define IMP_CHARACTER_TRAIT__GREY_BOX_OFFSET_X 5 #define IMP_CHARACTER_TRAIT__GREY_BOX_OFFSET_Y 7 @@ -174,14 +170,16 @@ 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, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPCharacterTraitText[IMP_NUMBER_CHARACTER_TRAITS], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); else - DrawTextToScreen( gzIMPAttitudesText[IMP_NUMBER_ATTITUDES], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPAttitudesText[IMP_NUMBER_ATTITUDES], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); IMPCharacterTraitDisplayCharacterTraits(); } @@ -490,4 +488,4 @@ void AssignCharacterTraitHelpText( UINT8 ubNumber ) SetRegionHelpEndCallback( &gMR_CharacterTraitHelpTextRegions[ubNumber], MSYS_NO_CALLBACK ); return; -} +} diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index 9f758566..3a4f52fe 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -92,8 +92,10 @@ 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, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( pCharacterTraitBeginIMPStrings[ 0 ], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, 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 fbc5c77b..8068aacb 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -384,6 +384,8 @@ 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(); @@ -397,14 +399,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, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPColorChoosingText[0], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, 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, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPColorChoosingText[1], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } // figure and frame @@ -1201,4 +1203,4 @@ void SetBadAss( BOOLEAN fSetTrue ) bBadAss = TRUE; else bBadAss = FALSE; -} +} diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index 694fac9b..75672dd4 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -53,10 +53,6 @@ enum #define IMP_DISABILITY_TRAIT__TEXT_OFFSET_X 65 #define IMP_DISABILITY_TRAIT__TEXT_OFFSET_Y 12 -#define IMP_DISABILITY_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 -#define IMP_DISABILITY_TRAIT__TITLE_Y iScreenHeightOffset + 53 -#define IMP_DISABILITY_TRAIT__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ) - #define IMP_DISABILITY_TRAIT__GREY_BOX_OFFSET_X 5 #define IMP_DISABILITY_TRAIT__GREY_BOX_OFFSET_Y 7 @@ -176,11 +172,13 @@ 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, ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ), FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( gzIMPDisabilityTraitText[IMP_DISABILITIES_NUMBER], LAPTOP_SCREEN_UL_X - 111, iScreenHeightOffset + 53, sWidth, FONT14ARIAL, FONT_MCOLOR_WHITE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); IMPDisabilityTraitDisplayDisabilityTraits(); } @@ -362,10 +360,6 @@ void IMPDisabilityTraitDisplayDisabilityTraits() UINT16 usBoxPosX, usBoxPosY; HVOBJECT hImageHandle; - - //Display the title - //DrawTextToScreen( gzIMPSkillTraitsText[ IMP_DISABILITY_TRAIT__TITLE_TEXT ], IMP_DISABILITY_TRAIT__TITLE_X, IMP_DISABILITY_TRAIT__TITLE_Y, IMP_DISABILITY_TRAIT__TITLE_WIDTH, IMP_DISABILITY_TRAIT__TITLE_FONT, IMP_DISABILITY_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); - // Stats GetVideoObject(&hImageHandle, guiIST_GreyGoldBox3 ); diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index cec08943..da15a7a0 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -129,7 +129,6 @@ void RenderImpHomePage( void ) // render the activation string DisplayPlayerActivationString( ); - return; } diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index 62e2774d..18d66b14 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -55,7 +55,7 @@ #define IMP_MINOR_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 #define IMP_MINOR_TRAIT__TITLE_Y iScreenHeightOffset + 53 -#define IMP_MINOR_TRAIT__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ) + #define IMP_MINOR_TRAIT__GREY_BOX_OFFSET_X 5 #define IMP_MINOR_TRAIT__GREY_BOX_OFFSET_Y 7 @@ -432,8 +432,10 @@ void IMPMinorTraitDisplaySkills() UINT16 usBoxPosX, usBoxPosY; HVOBJECT hImageHandle; + INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + //Display the title - DrawTextToScreen( gzIMPSkillTraitsTextNewMinor[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ], IMP_MINOR_TRAIT__TITLE_X, IMP_MINOR_TRAIT__TITLE_Y, IMP_MINOR_TRAIT__TITLE_WIDTH, 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, IMP_MINOR_TRAIT__TITLE_Y, sWidth, 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 34b11f23..f6ccc3c7 100644 --- a/Laptop/IMP Prejudice.cpp +++ b/Laptop/IMP Prejudice.cpp @@ -42,7 +42,7 @@ #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 ) +#define IMP_PREJUDICE__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111) //******************************************************************* // @@ -298,6 +298,7 @@ void HandleIMPPrejudice( void ) void IMPPrejudiceDisplay() { UINT16 usPosX, usPosY; + INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); //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 ); diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 81e4db0a..8f682a5e 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -57,7 +57,6 @@ #define IMP_SKILL_TRAIT__TITLE_X LAPTOP_SCREEN_UL_X - 111 #define IMP_SKILL_TRAIT__TITLE_Y iScreenHeightOffset + 53 -#define IMP_SKILL_TRAIT__TITLE_WIDTH ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X ) #define IMP_SKILL_TRAIT__GREY_BOX_OFFSET_X 5 #define IMP_SKILL_TRAIT__GREY_BOX_OFFSET_Y 7 @@ -801,6 +800,8 @@ void IMPSkillTraitDisplaySkills() UINT8 uiNumSkillsToStartRightColumn; HVOBJECT hImageHandle; + INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); + if ( gGameOptions.fNewTraitSystem ) { uiCntMax = IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS; @@ -808,7 +809,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, IMP_SKILL_TRAIT__TITLE_WIDTH, 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, IMP_SKILL_TRAIT__TITLE_Y, sWidth, IMP_SKILL_TRAIT__TITLE_FONT, IMP_SKILL_TRAIT__COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); } else { @@ -817,7 +818,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, IMP_SKILL_TRAIT__TITLE_WIDTH, 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, IMP_SKILL_TRAIT__TITLE_Y, sWidth, 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 3ac2c88c..067a90af 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; + INT16 sWidth = (LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X + 1) + (2 * 111); // looks at current page and prints text needed switch( iCurrentImpPage ) @@ -167,6 +167,7 @@ void PrintImpText( void ) break; 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); // set up for IMP text for title box area