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

I.M.P. Screen Adjustments

Browse Source 
- Fixed wrong X/Y coordinates of some title positions
- Externalized hardcoded "I.M.P. Prejudices" and "I.M.P. Background" texts to the language cpp files
- A few more minor cosmetics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-07 14:34:20 +00:00
parent f7f07d4897
commit a05bb3ad5b
22 changed files with 129 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Background.cpp
+1 -4
View File
@@ -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 );
Laptop/IMP Character Trait.cpp
+3 -5
View File
@@ -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();
}
Laptop/IMP Character and Disability Entrance.cpp
+2 -4
View File
@@ -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);
Laptop/IMP Color Choosing.cpp
+3 -5
View File
@@ -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
Laptop/IMP Disability Trait.cpp
+2 -4
View File
@@ -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();
}
Laptop/IMP Finish.cpp
+4 -4
View File
@@ -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;
}
Laptop/IMP Minor Trait.cpp
+2 -5
View File
@@ -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 );
Laptop/IMP Prejudice.cpp
+2 -5
View File
@@ -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 ) ) );
Laptop/IMP Skill Trait.cpp
+3 -6
View File
@@ -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
Laptop/IMP Text System.cpp
+12 -12
View File
@@ -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
Laptop/laptop.h
+2
View File
@@ -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
Utils/Text.h
+3
View File
@@ -2432,6 +2432,9 @@ enum
PERSONALITYTEXT_PEOPLE,
PERSONALITYTEXT_MAX,
};
extern STR16 szBackgroundTitleText[];
extern STR16 szPersonalityTitleText[];
extern STR16 szPersonalityDisplayText[];
extern STR16 szPersonalityHelpText[];
extern STR16 szRaceText[];
Utils/_ChineseText.cpp
+10
View File
@@ -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",
Utils/_DutchText.cpp
+10
View File
@@ -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",
Utils/_EnglishText.cpp
+10
View File
@@ -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",
Utils/_FrenchText.cpp
+10
View File
@@ -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",
Utils/_GermanText.cpp
+10
View File
@@ -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",
Utils/_ItalianText.cpp
+10
View File
@@ -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",
Utils/_Ja25EnglishText.cpp
-1
View File
@@ -453,7 +453,6 @@ STR16 gzIMPDisabilitiesHelpTexts[]=
L"Reduced sight range.",
};
STR16 gzIMPProfileCostText[]=
{
L"The profile cost is $%d. Authorize payment?",
Utils/_PolishText.cpp
+10
View File
@@ -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",
Utils/_RussianText.cpp
+10
View File
@@ -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",
Utils/_TaiwaneseText.cpp
+10
View File
@@ -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",