Merge branch 'master' into mobile_hacks

FWGS · Jun 2, 2023 · 21bc80f · 21bc80f
2 parents 42611c9 + 31790c1
commit 21bc80f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake
@@ -36,12 +36,14 @@ endmacro()
 # grep '^#undef XASH' build.h | grep "XASH_RISCV_" |  awk '{ print "check_build_target(" $2 ")"}'
 # echo "endif()"
 
+# NOTE: Android must have priority over Linux to work correctly!
+
 set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/public/")
 check_build_target(XASH_64BIT)
 check_group_build_target(XASH_WIN32 XASH_PLATFORM)
+check_group_build_target(XASH_ANDROID XASH_PLATFORM)
 check_group_build_target(XASH_LINUX XASH_PLATFORM)
 check_group_build_target(XASH_FREEBSD XASH_PLATFORM)
-check_group_build_target(XASH_ANDROID XASH_PLATFORM)
 check_group_build_target(XASH_APPLE XASH_PLATFORM)
 check_group_build_target(XASH_NETBSD XASH_PLATFORM)
 check_group_build_target(XASH_OPENBSD XASH_PLATFORM)

diff --git a/dlls/talkmonster.cpp b/dlls/talkmonster.cpp
@@ -1345,7 +1345,7 @@ void CTalkMonster::StartFollowing( CBaseEntity *pLeader )
 
 BOOL CTalkMonster::CanFollow( void )
 {
-	if( m_MonsterState == MONSTERSTATE_SCRIPT )
+	if( m_MonsterState == MONSTERSTATE_SCRIPT || m_IdealMonsterState == MONSTERSTATE_SCRIPT )
 	{
 		if( !m_pCine )
 			return FALSE;