1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: The mapped LUA function "SectorEnemyControlled" (mapped to l_fEnemyControlled) retrieved the wrong sector from the StrategicMap array

Browse Source 
o This fixes the bug, that the creature cutscene was never triggered (because of wrong sector infos)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-09-10 13:35:22 +00:00
parent 8b65e37cfd
commit f65bc9d649
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+11 -10
View File
@@ -5808,22 +5808,21 @@ return 1;
static int l_TacticalStatusTeamActive(lua_State *L)
{
BOOLEAN Bool;
BOOLEAN Bool;
if ( lua_gettop(L) >= 1 )
{
UINT8 team = lua_tointeger(L,1);
if (gTacticalStatus.Team[team].bTeamActive )
Bool = TRUE;
else
Bool = FALSE;
if (gTacticalStatus.Team[team].bTeamActive )
Bool = TRUE;
else
Bool = FALSE;
lua_pushboolean(L, Bool);
lua_pushboolean(L, Bool);
}
return 1;
return 1;
}
static int l_usStrategicInsertionDataProfileID(lua_State *L)
@@ -7498,8 +7497,10 @@ static int l_fEnemyControlled (lua_State *L)
{
UINT16 id = lua_tointeger(L,1);
BOOLEAN Bool = StrategicMap[ id ].fEnemyControlled;
// WANNE: Bugfix: We have to get the sector from StrategicMap array by using the SECTOR_INFO_TO_STRATEGIC_INDEX(sectorID) function!!!
//BOOLEAN Bool = StrategicMap[ id ].fEnemyControlled;
BOOLEAN Bool = StrategicMap[ SECTOR_INFO_TO_STRATEGIC_INDEX(id)].fEnemyControlled;
lua_pushboolean(L, Bool);
}