diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index 556c584f8..da2dafb76 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -593,11 +593,28 @@ void HandleBeginScreenTextEvent( UINT32 uiKey ) break; default: - if( uiKey >= 'A' && uiKey <= 'Z' || + +//Heinz (18.01.2009): Russian layout +// +#if defined(RUSSIAN) + if( ( (DWORD)GetKeyboardLayout(0) & 0xFFFF ) == 0x419) + { + unsigned char RussianTranslationTable[] = + " #Ý####ý####á-þ.0123456789ÆæÁ#Þ##ÔÈÑÂÓÀÏÐØÎËÄÜÒÙÇÉÊÛÅÃÌÖ×Íßõ#ú#_¸ôèñâóàïðøîëäüòùçéêûåãìö÷íÿÕ#Ú¨"; + if(uiKey >= ' ' && uiKey <= '~') uiKey = RussianTranslationTable[uiKey-' ']; + else uiKey = '#'; + } + else if( !(uiKey >= 'A' && uiKey <= 'Z' || uiKey >= 'a' && uiKey <= 'z' || uiKey >= '0' && uiKey <= '9' || + uiKey == '_' || uiKey == '.' || uiKey == ' ') ) uiKey = '#'; + if(uiKey != '#') +#else + if( uiKey >= 'A' && uiKey <= 'Z' || uiKey >= 'a' && uiKey <= 'z' || uiKey >= '0' && uiKey <= '9' || uiKey == '_' || uiKey == '.' || uiKey == ' ' ) +#endif + { // if the current string position is at max or great, do nothing switch( ubTextEnterMode ) diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index e81d14a78..812fd617c 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -164,11 +164,19 @@ void PrintImpText( void ) // gender LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640 ), IMP_BEGIN_6, FONT14ARIAL, FONT_BLACK, FALSE, 0); +//inshy (18.01.2009): fix position for russian text + #ifdef RUSSIAN + // male + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 225, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640 ), IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0); + // female + LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 335, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640 ), IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0); + #else // male LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 240, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640 ), IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0); // female LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 360, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640 ), IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0); + #endif break; case ( IMP_PERSONALITY ): diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 9091b58b7..73ad11178 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -1141,7 +1141,7 @@ BOOLEAN InitializeInvPanelCoordsOld() // Inventory slots gMapScreenInvPocketXY[HELMETPOS].sX = PLAYER_INFO_X + 204; gMapScreenInvPocketXY[HELMETPOS].sY = PLAYER_INFO_Y + 9; // HELMETPOS gMapScreenInvPocketXY[VESTPOS].sX = PLAYER_INFO_X + 204; gMapScreenInvPocketXY[VESTPOS].sY = PLAYER_INFO_Y + 38; // VESTPOS - gMapScreenInvPocketXY[LEGPOS].sX = PLAYER_INFO_X + 204; gMapScreenInvPocketXY[LEGPOS].sY = PLAYER_INFO_Y + 96; // LEGPOS, + gMapScreenInvPocketXY[LEGPOS].sX = PLAYER_INFO_X + 204; gMapScreenInvPocketXY[LEGPOS].sY = PLAYER_INFO_Y + 98; // LEGPOS, gMapScreenInvPocketXY[HEAD1POS].sX = PLAYER_INFO_X + 21; gMapScreenInvPocketXY[HEAD1POS].sY = PLAYER_INFO_Y + 9; // HEAD1POS gMapScreenInvPocketXY[HEAD2POS].sX = PLAYER_INFO_X + 21; gMapScreenInvPocketXY[HEAD2POS].sY = PLAYER_INFO_Y + 33; // HEAD2POS gMapScreenInvPocketXY[HANDPOS].sX = PLAYER_INFO_X + 21; gMapScreenInvPocketXY[HANDPOS].sY = PLAYER_INFO_Y + 87; // HANDPOS, @@ -1367,7 +1367,7 @@ BOOLEAN InitializeInvPanelCoordsNew() gMapScreenInvPocketXY[1].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[1].sY = PLAYER_INFO_Y + 38; // VESTPOS gMapScreenInvPocketXY[2].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[2].sY = PLAYER_INFO_Y + 97; // LEGPOS gMapScreenInvPocketXY[3].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[3].sY = PLAYER_INFO_Y + 9; // HEAD1POS - gMapScreenInvPocketXY[4].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[4].sY = PLAYER_INFO_Y + 33; // HEAD2POS + gMapScreenInvPocketXY[4].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[4].sY = PLAYER_INFO_Y + 32; // HEAD2POS gMapScreenInvPocketXY[5].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[5].sY = PLAYER_INFO_Y + 86; // HANDPOS gMapScreenInvPocketXY[6].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[6].sY = PLAYER_INFO_Y + 110; // SECONDHANDPOS gMapScreenInvPocketXY[7].sX = PLAYER_INFO_X + 186; gMapScreenInvPocketXY[7].sY = PLAYER_INFO_Y + 134; // VESTPOCK @@ -1421,10 +1421,10 @@ BOOLEAN InitializeInvPanelCoordsNew() } else{ gMapScreenInvPocketXY[0].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[0].sY = PLAYER_INFO_Y + 9; // HELMETPOS - gMapScreenInvPocketXY[1].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[1].sY = PLAYER_INFO_Y + 38; // VESTPOS + gMapScreenInvPocketXY[1].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[1].sY = PLAYER_INFO_Y + 37; // VESTPOS gMapScreenInvPocketXY[2].sX = PLAYER_INFO_X + 131; gMapScreenInvPocketXY[2].sY = PLAYER_INFO_Y + 97; // LEGPOS gMapScreenInvPocketXY[3].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[3].sY = PLAYER_INFO_Y + 9; // HEAD1POS - gMapScreenInvPocketXY[4].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[4].sY = PLAYER_INFO_Y + 33; // HEAD2POS + gMapScreenInvPocketXY[4].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[4].sY = PLAYER_INFO_Y + 32; // HEAD2POS gMapScreenInvPocketXY[5].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[5].sY = PLAYER_INFO_Y + 86; // HANDPOS gMapScreenInvPocketXY[6].sX = PLAYER_INFO_X + 14; gMapScreenInvPocketXY[6].sY = PLAYER_INFO_Y + 110; // SECONDHANDPOS gMapScreenInvPocketXY[7].sX = PLAYER_INFO_X + 186; gMapScreenInvPocketXY[7].sY = PLAYER_INFO_Y + 156; // VESTPOCK diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index f293b7e11..f8f95e757 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -174,7 +174,7 @@ INT16 ITEMDESC_ITEM_STATUS_HEIGHT; #define WORD_WRAP_INV_WIDTH 58 #define ITEM_BAR_WIDTH 2 -#define ITEM_BAR_HEIGHT 21 +#define ITEM_BAR_HEIGHT 20 #define ITEM_FONT TINYFONT1 diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 44675a628..59f63a7fc 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -1401,25 +1401,25 @@ BOOLEAN InitializeSMPanelCoordsOld() * any questions? joker */ // Inventory slots - gSMInvPocketXY[HELMETPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[HELMETPOS].sY = INV_INTERFACE_START_Y + 7; // HELMETPOS - gSMInvPocketXY[VESTPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[VESTPOS].sY = INV_INTERFACE_START_Y + 36; // VESTPOS - gSMInvPocketXY[LEGPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[LEGPOS].sY = INV_INTERFACE_START_Y + 96; // LEGPOS, - gSMInvPocketXY[HEAD1POS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[HEAD1POS].sY = INV_INTERFACE_START_Y + 7; // HEAD1POS - gSMInvPocketXY[HEAD2POS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[HEAD2POS].sY = INV_INTERFACE_START_Y + 31; // HEAD2POS + gSMInvPocketXY[HELMETPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[HELMETPOS].sY = INV_INTERFACE_START_Y + 6; // HELMETPOS + gSMInvPocketXY[VESTPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[VESTPOS].sY = INV_INTERFACE_START_Y + 35; // VESTPOS + gSMInvPocketXY[LEGPOS].sX = INTERFACE_START_X + 344; gSMInvPocketXY[LEGPOS].sY = INV_INTERFACE_START_Y + 95; // LEGPOS, + gSMInvPocketXY[HEAD1POS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[HEAD1POS].sY = INV_INTERFACE_START_Y + 6; // HEAD1POS + gSMInvPocketXY[HEAD2POS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[HEAD2POS].sY = INV_INTERFACE_START_Y + 30; // HEAD2POS gSMInvPocketXY[HANDPOS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[HANDPOS].sY = INV_INTERFACE_START_Y + 84; // HANDPOS, gSMInvPocketXY[SECONDHANDPOS].sX = INTERFACE_START_X + 226; gSMInvPocketXY[SECONDHANDPOS].sY = INV_INTERFACE_START_Y + 108; // SECONDHANDPOS - gSMInvPocketXY[BIGPOCK1POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK1POS].sY = INV_INTERFACE_START_Y + 6; // BIGPOCK1 - gSMInvPocketXY[BIGPOCK2POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK2POS].sY = INV_INTERFACE_START_Y + 30; // BIGPOCK2 - gSMInvPocketXY[BIGPOCK3POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK3POS].sY = INV_INTERFACE_START_Y + 54; // BIGPOCK3 - gSMInvPocketXY[BIGPOCK4POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK4POS].sY = INV_INTERFACE_START_Y + 78; // BIGPOCK4 - gSMInvPocketXY[SMALLPOCK1POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK1POS].sY = INV_INTERFACE_START_Y + 6; // SMALLPOCK1 - gSMInvPocketXY[SMALLPOCK2POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK2POS].sY = INV_INTERFACE_START_Y + 30; // SMALLPOCK2 - gSMInvPocketXY[SMALLPOCK3POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK3POS].sY = INV_INTERFACE_START_Y + 54; // SMALLPOCK3 - gSMInvPocketXY[SMALLPOCK4POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK4POS].sY = INV_INTERFACE_START_Y + 78; // SMALLPOCK4 - gSMInvPocketXY[SMALLPOCK5POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK5POS].sY = INV_INTERFACE_START_Y + 6; // SMALLPOCK5 - gSMInvPocketXY[SMALLPOCK6POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK6POS].sY = INV_INTERFACE_START_Y + 30; // SMALLPOCK6 - gSMInvPocketXY[SMALLPOCK7POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK7POS].sY = INV_INTERFACE_START_Y + 54; // SMALLPOCK7 - gSMInvPocketXY[SMALLPOCK8POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK8POS].sY = INV_INTERFACE_START_Y + 78; // SMALLPOCK8 + gSMInvPocketXY[BIGPOCK1POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK1POS].sY = INV_INTERFACE_START_Y + 5; // BIGPOCK1 + gSMInvPocketXY[BIGPOCK2POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK2POS].sY = INV_INTERFACE_START_Y + 29; // BIGPOCK2 + gSMInvPocketXY[BIGPOCK3POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK3POS].sY = INV_INTERFACE_START_Y + 53; // BIGPOCK3 + gSMInvPocketXY[BIGPOCK4POS].sX = INTERFACE_START_X + 468; gSMInvPocketXY[BIGPOCK4POS].sY = INV_INTERFACE_START_Y + 77; // BIGPOCK4 + gSMInvPocketXY[SMALLPOCK1POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK1POS].sY = INV_INTERFACE_START_Y + 5; // SMALLPOCK1 + gSMInvPocketXY[SMALLPOCK2POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK2POS].sY = INV_INTERFACE_START_Y + 29; // SMALLPOCK2 + gSMInvPocketXY[SMALLPOCK3POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK3POS].sY = INV_INTERFACE_START_Y + 53; // SMALLPOCK3 + gSMInvPocketXY[SMALLPOCK4POS].sX = INTERFACE_START_X + 396; gSMInvPocketXY[SMALLPOCK4POS].sY = INV_INTERFACE_START_Y + 77; // SMALLPOCK4 + gSMInvPocketXY[SMALLPOCK5POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK5POS].sY = INV_INTERFACE_START_Y + 5; // SMALLPOCK5 + gSMInvPocketXY[SMALLPOCK6POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK6POS].sY = INV_INTERFACE_START_Y + 29; // SMALLPOCK6 + gSMInvPocketXY[SMALLPOCK7POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK7POS].sY = INV_INTERFACE_START_Y + 53; // SMALLPOCK7 + gSMInvPocketXY[SMALLPOCK8POS].sX = INTERFACE_START_X + 432; gSMInvPocketXY[SMALLPOCK8POS].sY = INV_INTERFACE_START_Y + 77; // SMALLPOCK8 SM_ITEMDESC_START_X = ( 214 + INTERFACE_START_X ); SM_ITEMDESC_START_Y = ( 1 + INV_INTERFACE_START_Y ); @@ -1649,7 +1649,7 @@ BOOLEAN InitializeSMPanelCoordsNew() } else if(iResolution == 1){ gSMInvPocketXY[0].sX = INTERFACE_START_X + 258; gSMInvPocketXY[0].sY = INV_INTERFACE_START_Y + 68; // HELMETPOS - gSMInvPocketXY[1].sX = INTERFACE_START_X + 258; gSMInvPocketXY[1].sY = INV_INTERFACE_START_Y + 96; // VESTPOS + gSMInvPocketXY[1].sX = INTERFACE_START_X + 258; gSMInvPocketXY[1].sY = INV_INTERFACE_START_Y + 97; // VESTPOS gSMInvPocketXY[2].sX = INTERFACE_START_X + 258; gSMInvPocketXY[2].sY = INV_INTERFACE_START_Y + 157; // LEGPOS gSMInvPocketXY[3].sX = INTERFACE_START_X + 124; gSMInvPocketXY[3].sY = INV_INTERFACE_START_Y + 68; // HEAD1POS gSMInvPocketXY[4].sX = INTERFACE_START_X + 124; gSMInvPocketXY[4].sY = INV_INTERFACE_START_Y + 92; // HEAD2POS @@ -1662,9 +1662,9 @@ BOOLEAN InitializeSMPanelCoordsNew() gSMInvPocketXY[11].sX = INTERFACE_START_X + 594; gSMInvPocketXY[11].sY = INV_INTERFACE_START_Y + 13; // BPACKPOCK gSMInvPocketXY[12].sX = INTERFACE_START_X + 505; gSMInvPocketXY[12].sY = INV_INTERFACE_START_Y + 79; // GUNSLINGPOCKPOS gSMInvPocketXY[13].sX = INTERFACE_START_X + 388; gSMInvPocketXY[13].sY = INV_INTERFACE_START_Y + 79; // KNIFEPOCKPOS - gSMInvPocketXY[14].sX = INTERFACE_START_X + 565; gSMInvPocketXY[14].sY = INV_INTERFACE_START_Y + 116; // BIGPOCK1 - gSMInvPocketXY[15].sX = INTERFACE_START_X + 565; gSMInvPocketXY[15].sY = INV_INTERFACE_START_Y + 140; // BIGPOCK2 - gSMInvPocketXY[16].sX = INTERFACE_START_X + 565; gSMInvPocketXY[16].sY = INV_INTERFACE_START_Y + 164; // BIGPOCK3 + gSMInvPocketXY[14].sX = INTERFACE_START_X + 566; gSMInvPocketXY[14].sY = INV_INTERFACE_START_Y + 116; // BIGPOCK1 + gSMInvPocketXY[15].sX = INTERFACE_START_X + 566; gSMInvPocketXY[15].sY = INV_INTERFACE_START_Y + 140; // BIGPOCK2 + gSMInvPocketXY[16].sX = INTERFACE_START_X + 566; gSMInvPocketXY[16].sY = INV_INTERFACE_START_Y + 164; // BIGPOCK3 gSMInvPocketXY[17].sX = INTERFACE_START_X + 729; gSMInvPocketXY[17].sY = INV_INTERFACE_START_Y + 10; // BIGPOCK4 gSMInvPocketXY[18].sX = INTERFACE_START_X + 729; gSMInvPocketXY[18].sY = INV_INTERFACE_START_Y + 34; // BIGPOCK5 gSMInvPocketXY[19].sX = INTERFACE_START_X + 729; gSMInvPocketXY[19].sY = INV_INTERFACE_START_Y + 58; // BIGPOCK6 @@ -1683,18 +1683,18 @@ BOOLEAN InitializeSMPanelCoordsNew() gSMInvPocketXY[32].sX = INTERFACE_START_X + 419; gSMInvPocketXY[32].sY = INV_INTERFACE_START_Y + 34; // SMALLPOCK8 gSMInvPocketXY[33].sX = INTERFACE_START_X + 455; gSMInvPocketXY[33].sY = INV_INTERFACE_START_Y + 34; // SMALLPOCK9 gSMInvPocketXY[34].sX = INTERFACE_START_X + 491; gSMInvPocketXY[34].sY = INV_INTERFACE_START_Y + 34; // SMALLPOCK10 - gSMInvPocketXY[35].sX = INTERFACE_START_X + 321; gSMInvPocketXY[35].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK11 - gSMInvPocketXY[36].sX = INTERFACE_START_X + 357; gSMInvPocketXY[36].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK12 - gSMInvPocketXY[37].sX = INTERFACE_START_X + 321; gSMInvPocketXY[37].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK13 - gSMInvPocketXY[38].sX = INTERFACE_START_X + 357; gSMInvPocketXY[38].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK14 - gSMInvPocketXY[39].sX = INTERFACE_START_X + 407; gSMInvPocketXY[39].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK15 - gSMInvPocketXY[40].sX = INTERFACE_START_X + 443; gSMInvPocketXY[40].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK16 - gSMInvPocketXY[41].sX = INTERFACE_START_X + 407; gSMInvPocketXY[41].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK17 - gSMInvPocketXY[42].sX = INTERFACE_START_X + 443; gSMInvPocketXY[42].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK18 - gSMInvPocketXY[43].sX = INTERFACE_START_X + 493; gSMInvPocketXY[43].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK19 - gSMInvPocketXY[44].sX = INTERFACE_START_X + 529; gSMInvPocketXY[44].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK20 - gSMInvPocketXY[45].sX = INTERFACE_START_X + 493; gSMInvPocketXY[45].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK21 - gSMInvPocketXY[46].sX = INTERFACE_START_X + 529; gSMInvPocketXY[46].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK22 + gSMInvPocketXY[35].sX = INTERFACE_START_X + 322; gSMInvPocketXY[35].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK11 + gSMInvPocketXY[36].sX = INTERFACE_START_X + 358; gSMInvPocketXY[36].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK12 + gSMInvPocketXY[37].sX = INTERFACE_START_X + 322; gSMInvPocketXY[37].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK13 + gSMInvPocketXY[38].sX = INTERFACE_START_X + 358; gSMInvPocketXY[38].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK14 + gSMInvPocketXY[39].sX = INTERFACE_START_X + 408; gSMInvPocketXY[39].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK15 + gSMInvPocketXY[40].sX = INTERFACE_START_X + 444; gSMInvPocketXY[40].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK16 + gSMInvPocketXY[41].sX = INTERFACE_START_X + 408; gSMInvPocketXY[41].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK17 + gSMInvPocketXY[42].sX = INTERFACE_START_X + 444; gSMInvPocketXY[42].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK18 + gSMInvPocketXY[43].sX = INTERFACE_START_X + 494; gSMInvPocketXY[43].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK19 + gSMInvPocketXY[44].sX = INTERFACE_START_X + 530; gSMInvPocketXY[44].sY = INV_INTERFACE_START_Y + 116; // SMALLPOCK20 + gSMInvPocketXY[45].sX = INTERFACE_START_X + 494; gSMInvPocketXY[45].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK21 + gSMInvPocketXY[46].sX = INTERFACE_START_X + 530; gSMInvPocketXY[46].sY = INV_INTERFACE_START_Y + 140; // SMALLPOCK22 gSMInvPocketXY[47].sX = INTERFACE_START_X + 657; gSMInvPocketXY[47].sY = INV_INTERFACE_START_Y + 10; // SMALLPOCK23 gSMInvPocketXY[48].sX = INTERFACE_START_X + 657; gSMInvPocketXY[48].sY = INV_INTERFACE_START_Y + 34; // SMALLPOCK24 gSMInvPocketXY[49].sX = INTERFACE_START_X + 657; gSMInvPocketXY[49].sY = INV_INTERFACE_START_Y + 58; // SMALLPOCK25 @@ -1707,7 +1707,7 @@ BOOLEAN InitializeSMPanelCoordsNew() else if(iResolution == 2){ //1024x768 resolution gSMInvPocketXY[0].sX = INTERFACE_START_X + 258; gSMInvPocketXY[0].sY = INV_INTERFACE_START_Y + 68; // HELMETPOS - gSMInvPocketXY[1].sX = INTERFACE_START_X + 258; gSMInvPocketXY[1].sY = INV_INTERFACE_START_Y + 96; // VESTPOS + gSMInvPocketXY[1].sX = INTERFACE_START_X + 258; gSMInvPocketXY[1].sY = INV_INTERFACE_START_Y + 97; // VESTPOS gSMInvPocketXY[2].sX = INTERFACE_START_X + 258; gSMInvPocketXY[2].sY = INV_INTERFACE_START_Y + 157; // LEGPOS gSMInvPocketXY[3].sX = INTERFACE_START_X + 124; gSMInvPocketXY[3].sY = INV_INTERFACE_START_Y + 68; // HEAD1POS gSMInvPocketXY[4].sX = INTERFACE_START_X + 124; gSMInvPocketXY[4].sY = INV_INTERFACE_START_Y + 92; // HEAD2POS diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 3fac9fb84..aeff565aa 100644 Binary files a/Utils/_ChineseText.cpp and b/Utils/_ChineseText.cpp differ diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index a6b92b140..901a072da 100644 Binary files a/Utils/_Ja25ChineseText.cpp and b/Utils/_Ja25ChineseText.cpp differ diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index a9736b7ce..6723dc2e5 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -577,7 +577,7 @@ STR16 pUpperLeftMapScreenStrings[] = L"Íàçíà÷åíèå", // the mercs current assignment L"Êîíòðàêò", // the contract info about the merc L"Çäîðîâüå", // the health level of the current merc - L"Áîåâîé äóõ", // the morale of the current merc + L"Áîåâ.äóõ", // the morale of the current merc L"Ñîñò.", // the condition of the current vehicle L"Áåíçèí", // the fuel level of the current vehicle };