diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 3f3574b51..bd6c91ce2 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -2828,7 +2828,7 @@ void InitItemDescriptionBoxStartCoords( BOOLEAN fIsEnhanced ) { ITEMDESC_START_X = 259; ITEMDESC_START_Y = (1 + INV_INTERFACE_START_Y); - ITEMDESC_HEIGHT = guiCurrentItemDescriptionScreen == SHOPKEEPER_SCREEN ? 133 : 195; + ITEMDESC_HEIGHT = 195; ITEMDESC_WIDTH = 320; // OIV only } else // ODB/OIV @@ -8392,7 +8392,7 @@ void GetHelpTextForItem( STR16 pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier //Info for weapons #ifdef CHINESE - swprintf( pStr, ChineseSpecString4, + swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", #else swprintf( pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", #endif diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 85a8f4672..b7fe2b7fc 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -4532,13 +4532,21 @@ void ToggleTurnMode()// arynn : add forced turn mode { if ( !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] ) { - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Forced Turn Mode" ); + #ifdef CHINESE + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"强制回合制模式" ); + #else + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Forced Turn Mode" ); + #endif gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = TRUE; EnterCombatMode( OUR_TEAM ); // arynn : randomize ? i'm leaving this for now due to "i made the call, i get dibs" } else { - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Normal turn mode"); + #ifdef CHINESE + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"标准即时回合制模式"); + #else + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Normal turn mode"); + #endif gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE; } }// arynn : add forced turn mode