mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
- 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
This commit is contained in:
@@ -1401,6 +1401,10 @@ BOOLEAN ExecuteOverhead( )
|
|||||||
#ifdef JA2BETAVERSION
|
#ifdef JA2BETAVERSION
|
||||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_BETAVERSION, L"Told to open struct at %d and none was found", sGridNo );
|
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_BETAVERSION, L"Told to open struct at %d and none was found", sGridNo );
|
||||||
#endif
|
#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;
|
fKeepMoving = FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -861,7 +861,7 @@ DragSelection::Setup( UINT32 aVal )
|
|||||||
|
|
||||||
if ( xmlentry >= 0 )
|
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
|
// 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<void, UINT32>( &Wrapper_Function_DragSelection_GridNo, sTempGridNo ) );
|
pOption = new POPUP_OPTION( &std::wstring( pStr ), new popupCallbackFunction<void, UINT32>( &Wrapper_Function_DragSelection_GridNo, sTempGridNo ) );
|
||||||
|
|||||||
@@ -2849,7 +2849,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"侦查一个区域,友军狙击手在瞄准你所观察到的目标时会增加命中率。",
|
L"侦查一个区域,友军狙击手在瞄准你所观察到的目标时会增加命中率。",
|
||||||
L"增加中断几率(标记区域以外)。", //L"Increase interrupt modifier (malus outside of area)",
|
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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2848,7 +2848,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
|
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"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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2857,7 +2857,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Observe an area, granting allied snipers a bonus to cth on anything you see.",
|
L"Observe an area, granting allied snipers a bonus to cth on anything you see.",
|
||||||
L"Increase interrupt modifier (penalty outside of area).",
|
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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2857,7 +2857,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Observer une zone avec un tireur d'élite donne un bonus de CDT sur tout ce que vous voyez.",
|
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"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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2878,7 +2878,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Bestimmtes Gebiet beobachten, damit Scharfschützen einen Bonus auf deren Treffsicherheit erhalten.",
|
L"Bestimmtes Gebiet beobachten, damit Scharfschützen einen Bonus auf deren Treffsicherheit erhalten.",
|
||||||
L"Increase interrupt modifier (penalty outside of area).", // 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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2843,7 +2843,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
|
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"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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2855,7 +2855,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
|
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"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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
@@ -2849,7 +2849,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
|
|||||||
// various
|
// various
|
||||||
L"Наблюдать за местностью, чтобы обеспечить более меткую стрельбу своим снайперам.",
|
L"Наблюдать за местностью, чтобы обеспечить более меткую стрельбу своим снайперам.",
|
||||||
L"Increase interrupt modifier (penalty outside of area).", // 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[] =
|
STR16 pTraitSkillsDenialStrings[] =
|
||||||
|
|||||||
Reference in New Issue
Block a user