From 5036772e1bac6f20d9d029160dbf37ca2e27e1c0 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 24 Jul 2020 19:25:47 +0000 Subject: [PATCH] - Fix: outdated text - Fix: animation loops until new order given git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8871 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 4 ++++ Tactical/SkillMenu.cpp | 2 +- Utils/_ChineseText.cpp | 2 +- Utils/_DutchText.cpp | 2 +- Utils/_EnglishText.cpp | 2 +- Utils/_FrenchText.cpp | 2 +- Utils/_GermanText.cpp | 2 +- Utils/_ItalianText.cpp | 2 +- Utils/_PolishText.cpp | 2 +- Utils/_RussianText.cpp | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 273e978e7..75ad3c4ea 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -1401,6 +1401,10 @@ BOOLEAN ExecuteOverhead( ) #ifdef JA2BETAVERSION ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_BETAVERSION, L"Told to open struct at %d and none was found", sGridNo ); #endif + // Flugente: if there is no structure for us to interact with, stop + pSoldier->EVENT_StopMerc( pSoldier->sGridNo, pSoldier->ubDirection ); + pSoldier->aiData.ubPendingAction = NO_PENDING_ACTION; + fKeepMoving = FALSE; } else diff --git a/Tactical/SkillMenu.cpp b/Tactical/SkillMenu.cpp index 596cdfb68..abb9ffb81 100644 --- a/Tactical/SkillMenu.cpp +++ b/Tactical/SkillMenu.cpp @@ -861,7 +861,7 @@ DragSelection::Setup( UINT32 aVal ) if ( xmlentry >= 0 ) { - swprintf( pStr, L"%hs %s", gStructureMovePossible[xmlentry].szTileSetDisplayName, FaceDirs[gOneCDirection[ubDirection]] ); + swprintf( pStr, L"%hs (%s)", gStructureMovePossible[xmlentry].szTileSetDisplayName, FaceDirs[gOneCDirection[ubDirection]] ); // we have to use an offset of NOBODY in order to differentiate between person and corpse pOption = new POPUP_OPTION( &std::wstring( pStr ), new popupCallbackFunction( &Wrapper_Function_DragSelection_GridNo, sTempGridNo ) ); diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 62d9f0e45..20b4a17ce 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -2849,7 +2849,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"侦查一个区域，友军狙击手在瞄准你所观察到的目标时会增加命中率。", L"增加中断几率(标记区域以外)。", //L"Increase interrupt modifier (malus outside of area)", - L"移动时拖人或尸体。", //L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", // TODO.Translate }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index a241be5b0..d5c31dd0d 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -2848,7 +2848,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index b60056ae6..e4ad0dbe2 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -2857,7 +2857,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Observe an area, granting allied snipers a bonus to cth on anything you see.", L"Increase interrupt modifier (penalty outside of area).", - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index ff89279d8..7088dc76c 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -2857,7 +2857,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Observer une zone avec un tireur d'élite donne un bonus de CDT sur tout ce que vous voyez.", L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 6dbeafee9..63b9fb2a6 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -2878,7 +2878,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Bestimmtes Gebiet beobachten, damit Scharfschützen einen Bonus auf deren Treffsicherheit erhalten.", L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index cc4c9c4d7..725666863 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -2843,7 +2843,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 13e60c582..22cd75d1c 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -2855,7 +2855,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 219d9e218..69f700f5b 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -2849,7 +2849,7 @@ STR16 pTraitSkillsMenuDescStrings[] = // various L"Наблюдать за местностью, чтобы обеспечить более меткую стрельбу своим снайперам.", L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate - L"Drag a person or corpse while you move.", + L"Drag a person, corpse or structure while you move.", }; STR16 pTraitSkillsDenialStrings[] =