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

Fix: lua function CheckMiscFlags1 checks the wrong flags

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-06-02 00:56:15 +00:00
parent f945d164af
commit 492790cbf0
1 changed files with 8 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+8 -55
View File
@@ -11175,67 +11175,20 @@ static int l_ubMiscFlags2Check (lua_State *L)
//check character MiscFlags1 //check character MiscFlags1
static int l_ubMiscFlags1Check (lua_State *L) static int l_ubMiscFlags1Check (lua_State *L)
{ {
UINT32 set = 0;
UINT8 Profile = 0;
UINT8 n = lua_gettop(L); UINT8 n = lua_gettop(L);
UINT8 Flag = 0; if ( n >= 2 )
int i = 0; {
UINT8 Profile = lua_tointeger( L, 1 );
UINT8 set = lua_tointeger( L, 2 );
for (i= 1; i<=n; i++ ) if ( gMercProfiles[Profile].ubMiscFlags & set )
{ lua_pushinteger( L, 1 );
if (i == 1 ) Profile = lua_tointeger(L,i); else
if (i == 2 ) set = lua_tointeger(L,i); lua_pushinteger( L, 0 );
} }
if (set == 1)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_RECRUITED)
Flag = 1;
}
else if (set == 2)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_HAVESEENCREATURE)
Flag = 1;
}
else if (set == 4)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_FORCENPCQUOTE)
Flag = 1;
}
else if (set == 8)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_WOUNDEDBYPLAYER)
Flag = 1;
}
else if (set == 16)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_TEMP_NPC_QUOTE_DATA_EXISTS)
Flag = 1;
}
else if (set == 32)
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_SAID_HOSTILE_QUOTE)
Flag = 1;
}
else if (set == 64 )
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_EPCACTIVE)
Flag = 1;
}
else if (set == 128 )
{
if (gMercProfiles[Profile].ubMiscFlags2 & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS)
Flag = 1;
}
//Flag = (gMercProfiles[Profile].ubMiscFlags & set);
lua_pushinteger(L, Flag);
return 1; return 1;
} }
//set chracter MiscFlags1 //set chracter MiscFlags1