1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix: outdated text

Browse Source 
- 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:
Flugente
2020-07-24 19:25:47 +00:00
parent 0c4997f6ec
commit 5036772e1b
10 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+4
View File
@@ -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
Tactical/SkillMenu.cpp
+1 -1
View File
@@ -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<void, UINT32>( &Wrapper_Function_DragSelection_GridNo, sTempGridNo ) );