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

New tags in CivGroupNames.xml: Side, CustomSide allow setting custom side for civilian group.

Browse Source 
NewEye: fix possible bug.
InitShopKeeperSubTitledText: correctly initialize data.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-02-27 10:51:45 +00:00
parent 9d1ebb6eb9
commit 8b53d273f9
11 changed files with 121 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+3 -3
View File
@@ -7635,7 +7635,7 @@ static int l_SetEnterCombatMode (lua_State *L)
pGoon = MercPtrs[ ubLoop ];
if ( pGoon->ubCivilianGroup == group && pGoon->bActive && pGoon->bInSector && pGoon->stats.bLife >= OKLIFE && pGoon->aiData.bOppList[ ubID ] == SEEN_CURRENTLY )
{
MakeCivHostile( pGoon, 2 );
MakeCivHostile(pGoon);
if ( ! (gTacticalStatus.uiFlags & INCOMBAT) )
{
EnterCombatMode( pGoon->bTeam );
@@ -7665,7 +7665,7 @@ static int l_MakeMercPtrsHostile (lua_State *L)
{
UINT8 ubID = lua_tointeger(L,1);
MakeCivHostile( MercPtrs[ ubID ], 2 );
MakeCivHostile(MercPtrs[ ubID ]);
}
return 0;
@@ -9805,7 +9805,7 @@ static int l_MakeHostile (lua_State *L)
else
{
// make hostile
MakeCivHostile( pSoldier, 2 );
MakeCivHostile(pSoldier);
}
DeleteTalkingMenu();
if ( ! ( gTacticalStatus.uiFlags & INCOMBAT ) )