Add CMake support

.gitignore

@@ -521,3 +521,4 @@ Xbox-Release/
 !xCore/Tools/stringTool.exe
 !xCore/Tools/xCL.exe
 !xCore/Tools/xbmpTool.exe
+/build

Apps/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(GameApp)

Apps/GameApp/CMakeLists.txt

@@ -0,0 +1,30 @@
+file(GLOB GAMEAPP_SRC
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+)
+
+add_executable(GameApp WIN32 ${GAMEAPP_SRC})
+set_support_defaults(GameApp)
+
+set_target_properties(GameApp PROPERTIES OUTPUT_NAME "Area51")
+
+target_link_libraries(GameApp GameLib)
+
+# DirectX linkage
+if (MSVC)
+	if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+		target_link_directories(GameApp PRIVATE "$ENV{DXSDK_DIR}/Lib/x64")
+	else()
+		target_link_directories(GameApp PRIVATE "$ENV{DXSDK_DIR}/Lib/x86")
+	endif()
+
+	target_include_directories(GameApp PRIVATE "$ENV{DXSDK_DIR}/Include")
+	target_link_libraries(GameApp d3d9 d3dx9 dxguid XInput dinput8 dsound)
+endif()
+
+
+# Miles linkage
+if (MSVC)
+	target_link_directories(GameApp PRIVATE "${CMAKE_SOURCE_DIR}/xCore/3rdParty/Miles6/lib/win")
+	target_link_libraries(GameApp Mss32)
+endif()

CMakeLists.txt

@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+project(Area51 C CXX)
+if(APPLE)
+    enable_language(OBJC)
+endif()
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin") 
+
+if (MSVC)
+    # Always generate PDBs
+    add_compile_options(/Zi)
+    add_link_options(/DEBUG)
+
+    add_compile_options(/W3) # Warning level
+endif()
+
+# XCore utilities
+
+set(XCORE_PATH "${CMAKE_SOURCE_DIR}/xCore")
+set(XCORE_AUX_PATH "${CMAKE_SOURCE_DIR}/xCore/Auxiliary")
+set(XCORE_X_FILES_PATH "${CMAKE_SOURCE_DIR}/xCore/x_files")
+set(XCORE_3RDPARTY_PATH "${CMAKE_SOURCE_DIR}/xCore/3rdParty")
+
+function(set_xcore_defaults TARGET)
+	target_include_directories(${TARGET} 	PRIVATE ${XCORE_PATH} 
+											PRIVATE ${XCORE_AUX_PATH}
+											PRIVATE ${XCORE_X_FILES_PATH})
+											
+	# Compile definitions
+	target_compile_definitions(${TARGET}	PRIVATE TARGET_PC
+											PRIVATE $<$<CONFIG:Debug>:CONFIG_DEBUG>
+											PRIVATE $<$<CONFIG:Release>:CONFIG_RETAIL>)
+endfunction()
+
+# Support utilities
+
+set(SUPPORT_PATH "${CMAKE_SOURCE_DIR}/Support")
+
+function(set_support_defaults TARGET)
+	set_xcore_defaults(${TARGET})
+	target_include_directories(${TARGET} PRIVATE "${SUPPORT_PATH}")
+endfunction()
+
+add_subdirectory(xCore)
+add_subdirectory(Support)
+add_subdirectory(Apps)

README.md

@@ -27,6 +27,29 @@ The main goal is to get the source code into a buildable state on modern systems
 To contribute, please fork the repository, make your changes, and submit a pull request with your updates. For discussion, collaboration, and support, join our community on platforms like Discord or participate in GitHub Discussions for this project.
 
 
+## How to Build
+Currently, the only compiler supported is Visual Studio and Win32 configuration. 
+Build system is based on CMake, so version of Visual Studio is doesn't mean, it's should be higher or equal to Visual Studio 2013.
+
+For build project run from command-line:
+
+Visual Studio 2019+:
+```
+cmake -B build -A Win32
+```
+
+Visual Studio 2013-2017:
+```
+cmake -B build
+```
+
+After you should run:
+```
+cmake --build build --config Release
+```
+
+Release or Debug binaries are located in bin folder.
+
 ## Releases
 
 [Here](https://github.com/ProjectDreamland/area51/releases/)

Support/Animation/AnimCompress.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //=========================================================================
 //
 //  ANIMCOMPRESS.CPP
@@ -986,3 +987,5 @@ void CompressAnimationData( bitstream&          aBS,
 
 //=========================================================================
 
+
+#endif // !DISABLE_LEGACY_CODE

Support/Animation/AnimData.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //=========================================================================
 //
 //  ANIMDATA.CPP
@@ -1611,3 +1612,4 @@ void anim_loader::Unload( void* pData, const char* pFileName  )
 }
 
 //==============================================================================
+#endif // !DISABLE_LEGACY_CODE

Support/AudioMgr/AudioMgr.cpp

@@ -521,10 +521,13 @@ voice_id audio_manager::Play( const char* pIdentifier, sound_type SoundType, con
     voice_id    VoiceID   = 0;
     vector3     FinalPos  = Position;
 
+    // #TODO:   Research the Zone argument in the PlayVolumeClipped and Play methods of audio_mgr class.
+    //          For now ZONELESS
+
     if( VolumeClipped )
-        VoiceID = g_AudioMgr.PlayVolumeClipped( pIdentifier, FinalPos, AutoStart );
+        VoiceID = g_AudioMgr.PlayVolumeClipped( pIdentifier, FinalPos, ZONELESS, AutoStart );
     else
-        VoiceID = g_AudioMgr.Play( pIdentifier, FinalPos, AutoStart );
+        VoiceID = g_AudioMgr.Play( pIdentifier, FinalPos, ZONELESS, AutoStart );
   
     m_Receiver[ m_CurrentReceiverCursor ].Guid      = Guid;
     m_Receiver[ m_CurrentReceiverCursor ].Pos       = FinalPos;

Support/AudioMgr/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(GLOB AUDIOMGR_SRC
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+)
+
+add_library(audiomgr STATIC ${AUDIOMGR_SRC})
+set_support_defaults(audiomgr)
+
+target_link_libraries(audiomgr Entropy)

Support/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_subdirectory(AudioMgr)
+add_subdirectory(ConversationMgr)
+add_subdirectory(EventMgr)
+add_subdirectory(Render)
+add_subdirectory(NetworkMgr)
+add_subdirectory(UI)
+add_subdirectory(Dialogs)
+add_subdirectory(Music_mgr)
+add_subdirectory(GameLib)

Support/Characters/AStar.hpp

@@ -3,7 +3,7 @@
 
 #include "Navigation\ng_node2.hpp"
 #include "Navigation\ng_connection2.hpp"
-#include "..\MiscUtils\PriorityQueue.hpp"
+#include "MiscUtils\PriorityQueue.hpp"
 #include "AStarNode.hpp"
 
 

Support/Characters/Character.cpp

@@ -17,7 +17,7 @@
 #include "Character.hpp"
 #include "Navigation\CoverNode.hpp"
 #include "Navigation\AlarmNode.hpp"
-#include "..\MiscUtils\TrajectoryGenerator.hpp"
+#include "MiscUtils\TrajectoryGenerator.hpp"
 #include "objects\GrenadeProjectile.hpp"
 #include "objects\GravChargeProjectile.hpp"
 #include "Objects\Player.hpp"

Support/Characters/CharacterState.cpp

@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "CharacterState.hpp"
-#include "..\..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "God.hpp"
 #include "Character.hpp"
 

Support/Characters/GenericNPC/GenericNPC.cpp

@@ -12,8 +12,8 @@
 
 #include "objects\GrenadeProjectile.hpp"
 #include "objects\NewWeapon.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
-#include "..\MiscUtils\TrajectoryGenerator.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\TrajectoryGenerator.hpp"
 #include "Debris\debris_mgr.hpp"
 #include "Debris\debris_rigid.hpp"
 #include "gamelib\StatsMgr.hpp"

Support/Characters/Grunt/Grunt.cpp

@@ -12,8 +12,8 @@
 
 #include "objects\GrenadeProjectile.hpp"
 #include "objects\NewWeapon.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
-#include "..\MiscUtils\TrajectoryGenerator.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\TrajectoryGenerator.hpp"
 #include "Debris\debris_mgr.hpp"
 #include "Debris\debris_rigid.hpp"
 #include "gamelib\StatsMgr.hpp"

Support/Characters/MutantTank/MutantTank_Attack_State.cpp

@@ -3,7 +3,7 @@
 #include "Objects\WeaponSMP.hpp"
 #include "Objects\WeaponShotgun.hpp"
 #include "Objects\SuperDestructible.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 //=========================================================================
 // DEFINES

Support/Characters/MutantTank/Mutant_Tank.cpp

@@ -9,7 +9,7 @@
 //=========================================================================
 
 #include "Mutant_Tank.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Gamelib\StatsMgr.hpp"
 #include "Objects\Player.hpp"
 #include "Objects\SuperDestructible.hpp"

Support/Characters/ResponseList.cpp

@@ -3,7 +3,7 @@
 //=========================================================================
 // OBJECT DESCRIPTION
 //=========================================================================
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 void response_list::AddFlags( u32 newFlags )
 {

Support/Characters/TaskSystem/character_task.cpp

@@ -10,7 +10,7 @@
 
 #include "character_task.hpp"
 #include "character_task_set.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 static const s32        MAX_STRING_TASK_DESC_LEN = 255;
 

Support/Characters/TaskSystem/character_task_set.cpp

@@ -12,7 +12,7 @@
 #include "CollisionMgr\CollisionMgr.hpp"
 #include "Entropy.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Characters\Character.hpp"
 
 #define MAX_TASK_STRING_LEN     255

Support/ConversationMgr/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(GLOB CONVERSATIONMGR_SRC
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+)
+
+add_library(ConversationMgr STATIC ${CONVERSATIONMGR_SRC})
+set_support_defaults(ConversationMgr)
+
+target_link_libraries(ConversationMgr Entropy)

Support/Debris/debris_alien_grenade_explosion.cpp

@@ -1,6 +1,6 @@
 #include "debris_alien_grenade_explosion.hpp"
 #include "NetworkMgr\Networkmgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "..\Objects\Player.hpp"
 #include "objects\ParticleEmiter.hpp"
 #include "Tracers\TracerMgr.hpp"

Support/Debris/debris_cannon.cpp

@@ -13,7 +13,7 @@
 #include "GameLib\RenderContext.hpp"
 #include "Render\RigidGeom.hpp"
 #include "NetworkMgr\Networkmgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "..\Objects\Player.hpp"
 
 //=============================================================================

Support/Debris/debris_frag_explosion.cpp

@@ -1,6 +1,6 @@
 #include "debris_frag_explosion.hpp"
 #include "NetworkMgr\Networkmgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "..\Objects\Player.hpp"
 #include "objects\ParticleEmiter.hpp"
 #include "Decals\DecalMgr.hpp"

Support/Debris/debris_meson_lash.cpp

@@ -1,6 +1,6 @@
 #include "debris_meson_lash.hpp"
 #include "NetworkMgr\Networkmgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "..\Objects\Player.hpp"
 #include "objects\ParticleEmiter.hpp"
 #include "Tracers\TracerMgr.hpp"

Support/Dialogs/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(GLOB DIALOGS_SRC
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+)
+
+add_library(UIDialogs STATIC ${DIALOGS_SRC})
+set_support_defaults(UIDialogs)
+
+target_link_libraries(UIDialogs UI)

Support/Dialogs/dlg_BuddyList.cpp

@@ -1,3 +1,4 @@
+#if 0
 //=========================================================================
 //
 //  dlg_buddy_list.cpp
@@ -478,3 +479,4 @@ void dlg_buddy_list::RefreshBuddyList( void )
 }
 
 //=========================================================================
+#endif

Support/Dialogs/dlg_MemcardSelect.cpp

@@ -257,7 +257,7 @@ xbool dlg_memcard_select::Create( s32                        UserID,
 
 //=========================================================================
 
-void dlg_memcard_select::Configure( card_data_mode mode, s32 size = 0 )
+void dlg_memcard_select::Configure( card_data_mode mode, s32 size/* = 0*/ )
 { 
     m_Mode = mode; 
     m_Size = size; 

Support/Dialogs/dlg_OnlineConnect.cpp

@@ -296,7 +296,7 @@ void dlg_online_connect::Render( s32 ox, s32 oy )
 
     xbool PalMode;
     irect textPos;
-    eng_GetPALMode( PalMode );
+    //eng_GetPALMode( PalMode ); // #TODO: !!!
     if( PalMode )
     {
         textPos.Set( tempW-150, 370, tempW+150, 50 );
@@ -832,8 +832,8 @@ void dlg_online_connect::OnUpdate ( ui_win* pWin, f32 DeltaTime )
                         if( Error==ATTACH_STATUS_ERROR )
                         {
                             connect_status ConnStatus;
-
-                            net_GetConnectStatus( ConnStatus );
+                            // #TODO: !!!
+                          //  net_GetConnectStatus( ConnStatus );
                             // Literal error text from the connection
                             if( ConnStatus.ErrorText[0] )
                             {

Support/Dialogs/dlg_OnlineConnect.hpp

@@ -114,7 +114,7 @@ class dlg_online_connect : public ui_dialog
     void                UpdateAuthUser      ( void );
 
 
-#if defined(TARGET_PS2)
+#if 1// defined(TARGET_PS2)
     s32                 PopulateConfigurationList( void );
 #endif
     ui_frame*           m_pFrame1;
@@ -150,7 +150,7 @@ class dlg_online_connect : public ui_dialog
 
     cancel_mode         m_CancelMode;
     connect_states      m_RetryDestination;
-#if defined(TARGET_PS2)
+#if 1// defined(TARGET_PS2)
     // DNAS logo controls
     s32                 m_DNASIconID[NUM_DNAS_LOGOS];
     xbool               m_bRenderLogo[NUM_DNAS_LOGOS];

Support/Dialogs/dlg_Stats.cpp

@@ -303,6 +303,7 @@ xbool dlg_stats::Create( s32                        UserID,
     m_pNavText->SetLabelFlags( ui_font::h_center|ui_font::v_top|ui_font::is_help_text );
     m_pNavText->UseSmallText(TRUE);
 
+#if 0
     // Get stats data for player here!
     player_stats MyStats = g_MatchMgr.GetAllCareerStats();
     s32 Hours   = ( MyStats.PlayTime / 60 );
@@ -318,6 +319,7 @@ xbool dlg_stats::Create( s32                        UserID,
 #ifndef TARGET_XBOX
     m_pTextKicks    ->SetLabel( xwstring( xfs( "%d", MyStats.Kicks        ) ) );
     m_pTextVotes    ->SetLabel( xwstring( xfs( "%d", MyStats.VotesStarted ) ) );
+#endif
 #endif
 
     // Disable highlight

Support/Dialogs/dlg_Template.cpp

@@ -1,3 +1,4 @@
+#if 0
 //=========================================================================
 //
 //  dlg_main_menu.cpp
@@ -261,3 +262,4 @@ void dlg_main_menu::OnUpdate ( ui_win* pWin, f32 DeltaTime )
 }
 
 //=========================================================================
+#endif

Support/EventMgr/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(GLOB EVENTMGR_SRC
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+)
+
+add_library(EventMgr STATIC ${EVENTMGR_SRC})
+set_support_defaults(EventMgr)
+
+target_link_libraries(EventMgr Entropy)

Support/GameLib/CMakeLists.txt

@@ -0,0 +1,353 @@
+set(SUPPORT_PATH "${CMAKE_SOURCE_DIR}/Support")
+set(GAMELIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+# Root GameLib sources
+file(GLOB GAMELIB_SRC
+	"${GAMELIB_PATH}/*.cpp"
+	"${GAMELIB_PATH}/*.hpp"
+)
+
+# Support Root
+set(GAMELIB_ROOT_SRC
+	"${SUPPORT_PATH}/ManagerRegistration.cpp"
+	"${SUPPORT_PATH}/ManagerRegistration.hpp"
+)
+
+# AI
+file(GLOB_RECURSE GAMELIB_AI_SRC
+	"${SUPPORT_PATH}/AI/*.cpp"
+	"${SUPPORT_PATH}/AI/*.hpp"
+)
+
+# Animation
+file(GLOB_RECURSE GAMELIB_ANIMATION_SRC
+	"${SUPPORT_PATH}/Animation/*.cpp"
+	"${SUPPORT_PATH}/Animation/*.hpp"
+)
+
+# Characters
+file(GLOB_RECURSE GAMELIB_CHARACTERS_SRC
+	"${SUPPORT_PATH}/Characters/*.cpp"
+	"${SUPPORT_PATH}/Characters/*.hpp"
+)
+
+# CheckPointMgr
+file(GLOB_RECURSE GAMELIB_CHECKPOINTMGR_SRC
+	"${SUPPORT_PATH}/CheckPointMgr/*.cpp"
+	"${SUPPORT_PATH}/CheckPointMgr/*.hpp"
+)
+
+# Cloth
+file(GLOB_RECURSE GAMELIB_CLOTH_SRC
+	"${SUPPORT_PATH}/Cloth/*.cpp"
+	"${SUPPORT_PATH}/Cloth/*.hpp"
+)
+
+# CollisionMgr
+file(GLOB_RECURSE GAMELIB_COLLISIONMGR_SRC
+	"${SUPPORT_PATH}/CollisionMgr/*.cpp"
+	"${SUPPORT_PATH}/CollisionMgr/*.hpp"
+)
+
+# Configuration
+file(GLOB_RECURSE GAMELIB_CONFIGURATION_SRC
+	"${SUPPORT_PATH}/Configuration/*.cpp"
+	"${SUPPORT_PATH}/Configuration/*.hpp"
+)
+
+# DataVault
+file(GLOB_RECURSE GAMELIB_DATAVAULT_SRC
+	"${SUPPORT_PATH}/DataVault/*.cpp"
+	"${SUPPORT_PATH}/DataVault/*.hpp"
+)
+
+# Debris
+file(GLOB_RECURSE GAMELIB_DEBRIS_SRC
+	"${SUPPORT_PATH}/Debris/*.cpp"
+	"${SUPPORT_PATH}/Debris/*.hpp"
+)
+
+# Decals
+file(GLOB_RECURSE GAMELIB_DECALS_SRC
+	"${SUPPORT_PATH}/Decals/*.cpp"
+	"${SUPPORT_PATH}/Decals/*.hpp"
+)
+
+# Dictionary
+file(GLOB_RECURSE GAMELIB_DICTIONARY_SRC
+	"${SUPPORT_PATH}/Dictionary/*.cpp"
+	"${SUPPORT_PATH}/Dictionary/*.hpp"
+)
+
+# GameTextMgr
+file(GLOB_RECURSE GAMELIB_GAMETEXTMGR_SRC
+	"${SUPPORT_PATH}/GameTextMgr/*.cpp"
+	"${SUPPORT_PATH}/GameTextMgr/*.hpp"
+)
+
+# Globals
+file(GLOB_RECURSE GAMELIB_GLOBALS_SRC
+	"${SUPPORT_PATH}/Globals/*.cpp"
+	"${SUPPORT_PATH}/Globals/*.hpp"
+)
+
+# InputMgr
+file(GLOB_RECURSE GAMELIB_INPUTMGR_SRC
+	"${SUPPORT_PATH}/InputMgr/*.cpp"
+	"${SUPPORT_PATH}/InputMgr/*.hpp"
+)
+
+# Inventory
+file(GLOB_RECURSE GAMELIB_INVENTORY_SRC
+	"${SUPPORT_PATH}/Inventory/*.cpp"
+	"${SUPPORT_PATH}/Inventory/*.hpp"
+)
+
+# Loco
+file(GLOB_RECURSE GAMELIB_LOCO_SRC
+	"${SUPPORT_PATH}/Loco/*.cpp"
+	"${SUPPORT_PATH}/Loco/*.hpp"
+)
+
+# Locomotion
+file(GLOB_RECURSE GAMELIB_LOCOMOTION_SRC
+	"${SUPPORT_PATH}/Locomotion/*.cpp"
+	"${SUPPORT_PATH}/Locomotion/*.hpp"
+)
+
+# MemCardMgr
+file(GLOB GAMELIB_MEMCARDMGR_SRC
+	"${SUPPORT_PATH}/MemCardMgr/*.cpp"
+	"${SUPPORT_PATH}/MemCardMgr/*.hpp"
+)
+
+# Menu
+file(GLOB GAMELIB_MENU_SRC
+	"${SUPPORT_PATH}/Menu/*.cpp"
+	"${SUPPORT_PATH}/Menu/*.hpp"
+)
+
+# MusicStateMgr
+file(GLOB GAMELIB_MUSICSTATEMGR_SRC
+	"${SUPPORT_PATH}/MusicStateMgr/*.cpp"
+	"${SUPPORT_PATH}/MusicStateMgr/*.hpp"
+)
+
+# Navigation
+file(GLOB GAMELIB_NAVIGATION_SRC
+	"${SUPPORT_PATH}/navigation/*.cpp"
+	"${SUPPORT_PATH}/navigation/*.hpp"
+)
+
+# Object Manager
+file(GLOB GAMELIB_OBJMGR_SRC
+	"${SUPPORT_PATH}/Obj_mgr/*.cpp"
+	"${SUPPORT_PATH}/Obj_mgr/*.hpp"
+)
+
+# Objects
+file(GLOB_RECURSE GAMELIB_OBJECTS_SRC
+	"${SUPPORT_PATH}/Objects/*.cpp"
+	"${SUPPORT_PATH}/Objects/*.hpp"
+)
+
+# OccluderMgr
+file(GLOB_RECURSE GAMELIB_OCCLUDERMGR_SRC
+	"${SUPPORT_PATH}/OccluderMgr/*.cpp"
+	"${SUPPORT_PATH}/OccluderMgr/*.hpp"
+)
+
+# PainMgr
+file(GLOB_RECURSE GAMELIB_PAINMGR_SRC
+	"${SUPPORT_PATH}/PainMgr/*.cpp"
+	"${SUPPORT_PATH}/PainMgr/*.hpp"
+)
+
+# PerceptionMgr
+file(GLOB_RECURSE GAMELIB_PERCEPTIONMGR_SRC
+	"${SUPPORT_PATH}/PerceptionMgr/*.cpp"
+	"${SUPPORT_PATH}/PerceptionMgr/*.hpp"
+)
+
+# PhysicsMgr
+file(GLOB_RECURSE GAMELIB_PHYSICSMGR_SRC
+	"${SUPPORT_PATH}/PhysicsMgr/*.cpp"
+	"${SUPPORT_PATH}/PhysicsMgr/*.hpp"
+)
+
+# PlaySurfaceMgr
+file(GLOB_RECURSE GAMELIB_PLAYSURFACEMGR_SRC
+	"${SUPPORT_PATH}/PlaySurfaceMgr/*.cpp"
+	"${SUPPORT_PATH}/PlaySurfaceMgr/*.hpp"
+)
+
+# Ragdoll
+file(GLOB_RECURSE GAMELIB_RAGDOLL_SRC
+	"${SUPPORT_PATH}/Ragdoll/*.cpp"
+	"${SUPPORT_PATH}/Ragdoll/*.hpp"
+)
+
+# ResourceMgr
+file(GLOB_RECURSE GAMELIB_RESOURCEMGR_SRC
+	"${SUPPORT_PATH}/ResourceMgr/*.cpp"
+	"${SUPPORT_PATH}/ResourceMgr/*.hpp"
+)
+
+# Sound
+file(GLOB_RECURSE GAMELIB_SOUND_SRC
+	"${SUPPORT_PATH}/Sound/*.cpp"
+	"${SUPPORT_PATH}/Sound/*.hpp"
+)
+
+# SpatialDBase
+file(GLOB_RECURSE GAMELIB_SPATIALDBASE_SRC
+	"${SUPPORT_PATH}/SpatialDBase/*.cpp"
+	"${SUPPORT_PATH}/SpatialDBase/*.hpp"
+)
+
+# StateMgr
+file(GLOB_RECURSE GAMELIB_STATEMGR_SRC
+	"${SUPPORT_PATH}/StateMgr/*.cpp"
+	"${SUPPORT_PATH}/StateMgr/*.hpp"
+)
+
+# StringMgr
+file(GLOB_RECURSE GAMELIB_STRINGMGR_SRC
+	"${SUPPORT_PATH}/StringMgr/*.cpp"
+	"${SUPPORT_PATH}/StringMgr/*.hpp"
+)
+
+# TemplateMgr
+file(GLOB_RECURSE GAMELIB_TEMPLATEMGR_SRC
+	"${SUPPORT_PATH}/TemplateMgr/*.cpp"
+	"${SUPPORT_PATH}/TemplateMgr/*.hpp"
+)
+
+# Tracers
+file(GLOB_RECURSE GAMELIB_TRACERS_SRC
+	"${SUPPORT_PATH}/Tracers/*.cpp"
+	"${SUPPORT_PATH}/Tracers/*.hpp"
+)
+
+# TriggerEx
+file(GLOB_RECURSE GAMELIB_TRIGGEREX_SRC
+	"${SUPPORT_PATH}/TriggerEx/*.cpp"
+	"${SUPPORT_PATH}/TriggerEx/*.hpp"
+)
+
+# TweakMgr
+file(GLOB_RECURSE GAMELIB_TWEAKMGR_SRC
+	"${SUPPORT_PATH}/TweakMgr/*.cpp"
+	"${SUPPORT_PATH}/TweakMgr/*.hpp"
+)
+
+# ZoneMgr
+file(GLOB_RECURSE GAMELIB_ZONEMGR_SRC
+	"${SUPPORT_PATH}/ZoneMgr/*.cpp"
+	"${SUPPORT_PATH}/ZoneMgr/*.hpp"
+)
+
+
+# Source Groupes
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_ROOT_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_AI_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_ANIMATION_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_CHARACTERS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_CHECKPOINTMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_CLOTH_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_COLLISIONMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_CONFIGURATION_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_DATAVAULT_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_DEBRIS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_DECALS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_DICTIONARY_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_GAMETEXTMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_GLOBALS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_INPUTMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_INVENTORY_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_LOCO_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_LOCOMOTION_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_MEMCARDMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_MENU_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_MUSICSTATEMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_NAVIGATION_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_OBJMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_OBJECTS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_OCCLUDERMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_PAINMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_PERCEPTIONMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_PHYSICSMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_PLAYSURFACEMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_RAGDOLL_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_RESOURCEMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_SOUND_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_SPATIALDBASE_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_STATEMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_STRINGMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_TEMPLATEMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_TRACERS_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_TRIGGEREX_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_TWEAKMGR_SRC})
+source_group(TREE ${SUPPORT_PATH} FILES ${GAMELIB_ZONEMGR_SRC})
+
+add_library(GameLib STATIC 	${GAMELIB_SRC}
+							${GAMELIB_ROOT_SRC}
+							${GAMELIB_AI_SRC}
+							${GAMELIB_ANIMATION_SRC}
+							${GAMELIB_CHARACTERS_SRC}
+							${GAMELIB_CHECKPOINTMGR_SRC}
+							${GAMELIB_CLOTH_SRC}
+							${GAMELIB_COLLISIONMGR_SRC}
+							${GAMELIB_CONFIGURATION_SRC}
+							${GAMELIB_DATAVAULT_SRC}
+							${GAMELIB_DEBRIS_SRC}
+							${GAMELIB_DECALS_SRC}
+							${GAMELIB_DICTIONARY_SRC}
+							${GAMELIB_GAMETEXTMGR_SRC}
+							${GAMELIB_GLOBALS_SRC}
+							${GAMELIB_INPUTMGR_SRC}
+							${GAMELIB_INVENTORY_SRC}
+							${GAMELIB_LOCO_SRC}
+							${GAMELIB_LOCOMOTION_SRC}
+							${GAMELIB_MEMCARDMGR_SRC}
+							${GAMELIB_MENU_SRC}
+							${GAMELIB_MUSICSTATEMGR_SRC}
+							${GAMELIB_NAVIGATION_SRC}
+							${GAMELIB_OBJMGR_SRC}
+							${GAMELIB_OBJECTS_SRC}
+							${GAMELIB_OCCLUDERMGR_SRC}
+							${GAMELIB_PAINMGR_SRC}
+							${GAMELIB_PERCEPTIONMGR_SRC}
+							${GAMELIB_PHYSICSMGR_SRC}
+							${GAMELIB_PLAYSURFACEMGR_SRC}
+							${GAMELIB_RAGDOLL_SRC}
+							${GAMELIB_RESOURCEMGR_SRC}
+							${GAMELIB_SOUND_SRC}
+							${GAMELIB_SPATIALDBASE_SRC}
+							${GAMELIB_STATEMGR_SRC}
+							${GAMELIB_STRINGMGR_SRC}
+							${GAMELIB_TEMPLATEMGR_SRC}
+							${GAMELIB_TRACERS_SRC}
+							${GAMELIB_TRIGGEREX_SRC}
+							${GAMELIB_TWEAKMGR_SRC}
+							${GAMELIB_ZONEMGR_SRC}
+)
+
+set_support_defaults(GameLib)
+
+target_compile_definitions(GameLib PRIVATE DISABLE_LEGACY_CODE)
+
+target_link_libraries(GameLib 	Entropy 
+								MiscUtils 
+								ConversationMgr 
+								EventMgr 
+								fx_RunTime 
+								Parsing 
+								audiomgr
+								Render
+								NetworkMgr
+								UI
+								UIDialogs
+								MusicMgr
+)

Support/GameTextMgr/GameTextMgr.cpp

@@ -10,7 +10,7 @@
 #include "ConversationMgr\ConversationMgr.hpp"
 #include "Objects\HudObject.hpp"
 #include "Sound\SimpleSoundEmitter.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 #ifndef X_EDITOR
 #include "NetworkMgr\MsgMgr.hpp"

Support/Globals/Global_Variables_Manager.cpp

@@ -14,7 +14,7 @@
 #include "Parsing\TextIn.hpp"
 #include "Parsing\TextOut.hpp"
 
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 #ifdef X_EDITOR
 #include <windows.h>

Support/Globals/Global_Variables_Manager.hpp

@@ -15,7 +15,7 @@
 #include <x_types.hpp>
 #include <x_array.hpp>
 #include "Auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "x_bitstream.hpp"
 
 //=========================================================================

Support/InputMgr/InputMgr.cpp

@@ -310,7 +310,7 @@ void input_pad::OnUpdate( s32 iPlatform, f32 DeltaTime )
             }
         }
 
-#ifdef TARGET_PC
+#if defined( TARGET_PC ) && !defined(X_RETAIL)
         if ( Log.IsValue && g_InputText )
         {
             x_printfxy( INPUT_TEXT_COLUMN, g_InputTextLine++, 

Support/Music_mgr/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(MUSICMGR_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+file(GLOB MUSICMGR_SRC 
+	"${MUSICMGR_PATH}/*.cpp"
+	"${MUSICMGR_PATH}/*.hpp"
+)
+
+add_library(MusicMgr STATIC ${MUSICMGR_SRC})
+set_support_defaults(MusicMgr)
+
+target_link_libraries(MusicMgr Entropy)

Support/NetworkMgr/CMakeLists.txt

@@ -0,0 +1,32 @@
+set(NETWORK_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+file(GLOB NETWORK_SRC 
+	"${NETWORK_PATH}/*.cpp"
+	"${NETWORK_PATH}/*.hpp"
+)
+
+set(NETWORK_VOICE_SRC
+"${NETWORK_PATH}/Voice/Headset.hpp"
+"${NETWORK_PATH}/Voice/headset_common.cpp"
+"${NETWORK_PATH}/Voice/Headset_STUB.cpp"
+"${NETWORK_PATH}/Voice/lpc10.cpp"
+"${NETWORK_PATH}/Voice/lpc10.hpp"
+"${NETWORK_PATH}/Voice/speex.cpp"
+"${NETWORK_PATH}/Voice/speex.hpp"
+"${NETWORK_PATH}/Voice/VoiceMgr.cpp"
+"${NETWORK_PATH}/Voice/VoiceMgr.hpp"
+"${NETWORK_PATH}/Voice/VoiceProxy.cpp"
+"${NETWORK_PATH}/Voice/VoiceProxy.hpp"
+)
+
+file(GLOB_RECURSE NETWORK_DOWNLOADER_SRC
+"${NETWORK_PATH}/downloader/*.c"
+"${NETWORK_PATH}/downloader/*.h"
+"${NETWORK_PATH}/downloader/*.cpp"
+"${NETWORK_PATH}/downloader/*.hpp"
+)
+
+add_library(NetworkMgr STATIC ${NETWORK_SRC} ${NETWORK_VOICE_SRC} ${NETWORK_DOWNLOADER_SRC})
+set_support_defaults(NetworkMgr)
+
+target_link_libraries(NetworkMgr Entropy)

Support/NetworkMgr/MatchMgr_PS2.cpp

@@ -9,6 +9,8 @@
 //
 //==============================================================================
 
+#if 0
+
 #if !defined(TARGET_PS2)
 #error This should only be included for PS2 gamespy support.
 #endif
@@ -2813,3 +2815,5 @@ void match_mgr::ParseMessageOfTheDay( const char* pBuffer )
     LOG_MESSAGE( "match_mgr::ParseMessageOfTheDay", "Manifest Version:%d MOTD:%s", m_RemoteManifestVersion, GetMessageOfTheDay() );
     m_HasNewContent = (m_RemoteManifestVersion > m_LocalManifestVersion );
 }
+
+#endif

Support/NetworkMgr/MatchMgr_STUB.cpp

@@ -0,0 +1,385 @@
+//==============================================================================
+//
+// MatchMgr.cpp - Matchup manager interface functions.
+//
+//==============================================================================
+//
+//  Copyright (c) 2002-2003 Inevitable Entertainment Inc. All rights reserved.
+//  Not to be used without express permission of Inevitable Entertainment, Inc.
+//
+//==============================================================================
+
+// this is stub match manager for PC
+
+#if !defined(TARGET_PC)
+#error This should only be included for PC gamespy support.
+#endif
+#include "x_files.hpp"
+#include "x_threads.hpp"
+#include "e_Network.hpp"
+#include "NetworkMgr/MatchMgr.hpp"
+#include "NetworkMgr/NetworkMgr.hpp"
+#include "NetworkMgr/GameSpy/callbacks.hpp"
+#include "StateMgr/StateMgr.hpp"
+#include "ServerVersion.hpp"
+#include "Configuration/GameConfig.hpp"
+#include "x_log.hpp"
+#include "../Apps/GameApp/Config.hpp"
+
+//=========================================================================
+//  Defines
+//=========================================================================
+//#define ENABLE_LAN_LOOKUP
+
+#define LABEL_STRING(x) case x: return ( #x );
+// Authentication data filename. This is short for obfuscation reason.
+
+const s32   GAMESPY_PRODUCT_ID  = 10384;
+const char* GAMESPY_GAMENAME    = "area51ps2";
+const char* GAMESPY_SECRETKEY   = "eR48fP";
+const char* EMAIL_POSTFIX       = "a51";
+
+extern s32 g_Changelist;
+
+#ifdef GSI_UNICODE
+#define _T(a) L##a
+#define _tprintf wprintf
+#else
+#define _T(a) a
+#define _tprintf x_DebugMsg
+#endif
+
+//=========================================================================
+//  External function and data prototypes
+//=========================================================================
+
+extern const char* MANIFEST_LOCATION;
+extern const char* HDD_MANIFEST_FILENAME;
+
+const char* TIMESTAMP_FILENAME = "HDD:lasttime.txt";
+#if !defined(ENABLE_LAN_LOOKUP)
+/* todo BISCUIT - this needs data for the other product codes. */
+static unsigned char SLUS_20595_pass_phrase[] = { 0xb9, 0xfd, 0xb2, 0xce, 0x5c, 0xd9, 0x0e, 0x0c };
+static unsigned char SLES_52570_pass_phrase[] = { 0xb9, 0xfd, 0xb2, 0xce, 0x5c, 0xd9, 0x0e, 0x0c };
+static unsigned char SLES_53075_pass_phrase[] = { 0xb9, 0xfd, 0xb2, 0xce, 0x5c, 0xd9, 0x0e, 0x0c };
+#endif
+
+static byte* s_pAuthData;
+#if defined(X_DEBUG) && defined(bwatson)
+// This will create a temporary patch
+static void MakePatch( void );
+#endif
+
+
+//------------------------------------------------------------------------------
+xbool match_mgr::Init( net_socket& Local, const net_address Broadcast )
+{
+    return TRUE;
+}
+
+//------------------------------------------------------------------------------
+void  match_mgr::Kill                ( void )
+{
+}
+
+//------------------------------------------------------------------------------
+void  match_mgr::Update( f32 DeltaTime )
+{
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::Reset( void )
+{
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::UpdateState( f32 DeltaTime)
+{
+}
+
+//------------------------------------------------------------------------------
+// Called whenever we transition from one state to another
+void match_mgr::ExitState( match_mgr_state OldState )
+{
+}
+
+//------------------------------------------------------------------------------
+// Called whenever we transition from one state to another
+void match_mgr::EnterState( match_mgr_state NewState )
+{
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::CheckVisibility(void)
+{
+
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::StartAcquisition( match_acquire AcquisitionMode )
+{
+}
+
+//------------------------------------------------------------------------------
+xbool match_mgr::IsAcquireComplete( void )
+{
+    return FALSE;
+}
+
+//------------------------------------------------------------------------------
+// SetState will change internal state and initiate any packets that are
+// required for the processing of the state just entered.
+
+void match_mgr::SetState( match_mgr_state NewState )
+{
+}
+
+//------------------------------------------------------------------------------
+xbool match_mgr::ReceivePacket( net_address& Remote, bitstream& Bitstream )
+{
+    return FALSE;
+}
+
+//------------------------------------------------------------------------------
+// This append server instance is called when a fully complete response is received
+// via the matchmaking service.
+void match_mgr::AppendServer( const server_info& Response )
+{
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::LocalLookups(f32 DeltaTime)
+{
+}
+//------------------------------------------------------------------------------
+f32 match_mgr::GetPingTime(s32 Index)
+{
+    return 0.0f;
+}
+
+//------------------------------------------------------------------------------
+void match_mgr::DisconnectFromMatchmaker(void)
+{
+}
+//------------------------------------------------------------------------------
+void match_mgr::ConnectToMatchmaker( match_mgr_state PendingState )
+{
+}
+
+//==============================================================================
+
+xbool match_mgr::ValidateLobbyInfo( const lobby_info &info )
+{
+    return TRUE;
+}
+
+//==============================================================================
+static s32 GetHex( const char* &pChallenge, s32 Count )
+{
+    s32 Value;
+    s32 Digit;
+
+    Value = 0;
+    while( Count )
+    {
+        Digit = *pChallenge-'0';
+        if( Digit < 0 )
+        {
+            return 0;
+        }
+        if( Digit > 9 )
+        {
+            Digit -= ('a'-'9'-1);
+        }
+        if( Digit > 15 )
+        {
+            return 0;
+        }
+
+        Value = Value * 16 + Digit;
+        Count--;
+        pChallenge++;
+    }
+    return Value;
+}
+
+//==============================================================================
+xbool match_mgr::CheckSecurityChallenge( const char* pChallenge )
+{
+    return FALSE;
+}
+
+//==============================================================================
+
+void match_mgr::IssueSecurityChallenge(void)
+{
+}
+
+//==============================================================================
+
+void match_mgr::NotifyKick(const char* UniqueId)
+{
+    (void)UniqueId;
+}
+
+//==============================================================================
+
+void match_mgr::RemoteLookups( f32 DeltaTime )
+{
+    (void)DeltaTime;
+}
+
+//==============================================================================
+
+void match_mgr::SetUserAccount( s32 UserIndex )
+{
+}
+
+//==============================================================================
+
+s32 match_mgr::GetAuthResult( char* pLabelBuffer )
+{
+    return 0;
+}
+
+//==============================================================================
+
+void match_mgr::BecomeClient( void )
+{
+}
+
+//==============================================================================
+
+void match_mgr::MarkBuddyPresent( const net_address& Remote )
+{
+}
+
+//==============================================================================
+
+const extended_info* match_mgr::GetExtendedServerInfo( s32 Index )
+{
+    return NULL;
+}
+
+//==============================================================================
+
+void match_mgr::InitDownload( const char* pURL )
+{
+}
+
+//==============================================================================
+
+void match_mgr::KillDownload( void )
+{
+}
+
+//==============================================================================
+
+download_status match_mgr::GetDownloadStatus( void )
+{
+    return DL_STAT_OK;
+}
+
+//==============================================================================
+
+f32 match_mgr::GetDownloadProgress( void )
+{
+    return 0.0f;
+}
+
+//==============================================================================
+
+void* match_mgr::GetDownloadData( s32& Length )
+{
+    return nullptr;
+}
+
+//==============================================================================
+
+xbool match_mgr::AddBuddy( const buddy_info& Buddy )
+{
+    return TRUE;
+}
+
+//==============================================================================
+
+xbool match_mgr::DeleteBuddy( const buddy_info& Buddy )
+{
+    xbool Result;
+    Result = FALSE;
+    return Result;
+}
+
+//==============================================================================
+
+void match_mgr::AnswerBuddyRequest( buddy_info& Buddy, buddy_answer Answer )
+{
+}
+
+//==============================================================================
+
+xbool match_mgr::InviteBuddy( buddy_info& Buddy )
+{
+    return FALSE;
+}
+
+//==============================================================================
+
+void match_mgr::CancelBuddyInvite( buddy_info& Buddy )
+{
+}
+
+//==============================================================================
+
+xbool match_mgr::AnswerBuddyInvite( buddy_info& Buddy, buddy_answer Answer )
+{
+    return FALSE;
+}
+
+//==============================================================================
+xbool match_mgr::JoinBuddy( buddy_info& Buddy )
+{
+    return FALSE;
+}
+
+//==============================================================================
+const char* match_mgr::GetConnectErrorMessage( void )
+{
+    return "";
+}
+
+//==============================================================================
+
+xbool match_mgr::IsPlayerMuted( u64 Identifier )
+{
+    (void)Identifier;
+    return( FALSE );
+}
+
+//==============================================================================
+
+void match_mgr::SetIsPlayerMuted( u64 Identifier, xbool IsMuted )
+{
+    (void)Identifier;
+    (void)IsMuted;
+}
+
+//==============================================================================
+void match_mgr::SendFeedback( u64 Identifier, const char* pName, player_feedback Type )
+{
+    (void)Identifier;
+    (void)pName;
+    (void)Type;
+
+    ASSERTS( FALSE, "Not implemented yet" );
+}
+
+//==============================================================================
+void match_mgr::StartLogin(void)
+{
+}
+
+//==============================================================================
+void match_mgr::StartIndirectLookup(void)
+{
+}

Support/NetworkMgr/MatchMgr_WIN32.cpp

@@ -9,6 +9,8 @@
 //
 //==============================================================================
 
+#if 0
+
 #if !defined(TARGET_PC)
 #error This should only be included for PC gamespy support.
 #endif
@@ -2181,3 +2183,5 @@ void match_mgr::SendFeedback( u64 Identifier, const char* pName, player_feedback
 
     ASSERTS( FALSE, "Not implemented yet" );
 }
+
+#endif

Support/NetworkMgr/MatchMgr_XBOX.cpp

@@ -9,6 +9,8 @@
 //
 //==============================================================================
 
+#if 0
+
 #include "x_files.hpp"
 #include "x_threads.hpp"
 #include "e_Network.hpp"
@@ -5072,3 +5074,5 @@ void match_mgr::ClearAllKeys( xbool IncludeConfigs )
         g_PendingConfig.GetConfig().KeyIsRegistered=FALSE;
     }
 }
+
+#endif

Support/NetworkMgr/Move.cpp

@@ -6,6 +6,8 @@
 //
 //==============================================================================
 
+#if 0
+
 //==============================================================================
 //	DEBUG DEFINES AND MACROS
 //==============================================================================
@@ -359,3 +361,4 @@ void move::Write( bitstream& BS, const move& Compress )
 }
 
 //==============================================================================
+#endif

Support/NetworkMgr/MoveMgr.cpp

@@ -26,6 +26,8 @@
 //
 //==============================================================================
 
+#if 0
+
 //#if !defined(mtraub)
 #define X_SUPPRESS_LOGS
 //#endif
@@ -601,3 +603,4 @@ void move_mgr::LogQueue( void )
 #undef HEAD
 
 //==============================================================================
+#endif

Support/NetworkMgr/Voice/Headset_STUB.cpp

@@ -0,0 +1,57 @@
+//==============================================================================
+//
+//  Headset_PC.cpp
+//
+//==============================================================================
+#include "x_types.hpp"
+
+#if !defined(TARGET_PC)
+#error This should only be getting compiled for the PC platform. Check your dependancies.
+#endif
+
+#include "headset.hpp"
+//
+// Even though the xbox voice code will be significantly different than PS2 voice code,
+// I am still including the Provide and Accept update functions as they will allow us
+// to maintain compatibility between PS2 & XBOX. XBOX live should take care of headset
+// support.
+//
+
+//==============================================================================
+void headset::Init( xbool )
+{
+    m_pEncodeBuffer = new u8[512];
+    m_pDecodeBuffer = m_pEncodeBuffer+256;
+    m_ReadFifo.Init(m_pEncodeBuffer,256);
+    m_WriteFifo.Init(m_pDecodeBuffer,256);
+}
+
+//==============================================================================
+void headset::Kill( void )
+{
+    m_WriteFifo.Kill();
+    m_ReadFifo.Kill();
+    delete[] m_pEncodeBuffer;
+}
+
+//==============================================================================
+void headset::PeriodicUpdate( f32 )
+{
+}
+
+//==============================================================================
+void headset::Update( f32 DeltaTime )
+{
+    (void)DeltaTime;
+}
+
+//==============================================================================
+void headset::OnHeadsetInsert(void)
+{
+}
+
+//==============================================================================
+void headset::OnHeadsetRemove(void)
+{
+}
+

Support/Objects/Actor/Actor.cpp

@@ -15,7 +15,7 @@
 #include "Characters\GenericNPC\GenericNPC.hpp"
 #include "GameLib\RenderContext.hpp"
 #include "Objects\NewWeapon.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Debris\debris_rigid.hpp"
 #include "Objects\door.hpp"
 #include "Decals\DecalMgr.hpp"

Support/Objects/AlienPlatform.cpp

@@ -7,7 +7,7 @@
 #include "CollisionMgr\PolyCache.hpp"
 #include "GameLib\RigidGeomCollision.hpp"
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "..\Support\Objects\Player.hpp"
 #include "InputMgr\GamePad.hpp"
 #include "Objects\Path.hpp"

Support/Objects/AlienShield.cpp

@@ -10,7 +10,7 @@
 #include "alienshield.hpp"
 #include "e_Draw.hpp"
 #include "CollisionMgr\PolyCache.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "AlienOrb.hpp"
 #include "TemplateMgr\TemplateMgr.hpp"
 #include "Player.hpp"

Support/Objects/BaseProjectile.cpp

@@ -11,7 +11,7 @@
 #include "Objects\ParticleEmiter.hpp"
 #include "AudioMgr\AudioMgr.hpp"
 #include "..\Support\Tracers\TracerMgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Objects\ClothObject.hpp"
 #include "Objects\Flag.hpp"
 #include "Objects\Actor\Actor.hpp"

Support/Objects/Camera.cpp

@@ -3,7 +3,7 @@
 //=========================================================================
 #include "Camera.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Path.hpp"
 #include "Characters\Character.hpp"
 #include "Objects\Player.hpp"

Support/Objects/Cinema.cpp

@@ -14,7 +14,7 @@
 #include "ConversationMgr\ConversationMgr.hpp"
 #include "Loco\LocoUtil.hpp"
 #include "Characters\Character.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Animation\AnimPlayer.hpp"
 
 //=========================================================================

Support/Objects/Controller.cpp

@@ -3,7 +3,7 @@
 //=========================================================================
 #include "Controller.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Path.hpp"
 
 

Support/Objects/Coupler.cpp

@@ -3,7 +3,7 @@
 //=========================================================================
 #include "Coupler.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "e_ScratchMem.hpp"
 #include "Dictionary\Global_Dictionary.hpp"
 #include "e_Draw.hpp"

Support/Objects/DamageField.cpp

@@ -3,7 +3,7 @@
 #include "Entropy.hpp"
 #include "CollisionMgr\CollisionMgr.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 #include "Objects\Player.hpp"
 #include "characters\character.hpp"

Support/Objects/DeadBody.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 #include "DeadBody.hpp"
 #include "e_ScratchMem.hpp"
 
@@ -1000,4 +1001,4 @@ xbool dead_body::OnProperty( prop_query&   I )
 }
 
 //===============================================================================
-
+#endif

Support/Objects/GZCoreObj.cpp

@@ -14,7 +14,7 @@
 #include "GZCoreObj.hpp"
 #include "e_Draw.hpp"
 #include "CollisionMgr\PolyCache.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "AlienOrb.hpp"
 #include "TemplateMgr\TemplateMgr.hpp"
 #include "Player.hpp"

Support/Objects/Ghost.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 //
 //  Ghost.cpp
@@ -882,3 +883,4 @@ s32 ghost::GetWeaponRenderState( void )
 }
 
 //==============================================================================
+#endif

Support/Objects/GhostNet.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 //
 //  GhostNet.cpp
@@ -1205,3 +1206,4 @@ void ghost::net_ApplyPain( s32 Source, s32 Amount, s32 Type )
 }
 
 //==============================================================================
+#endif

Support/Objects/HudObject.cpp

@@ -15,7 +15,7 @@
 #include "e_View.hpp"
 #include "Entropy.hpp"
 #include "x_math.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Objects\WeaponSniper.hpp"
 #include "GameTextMgr\GameTextMgr.hpp"
 #include "NetworkMgr\NetworkMgr.hpp"

Support/Objects/Ladders/Ladder_Field.cpp

@@ -4,7 +4,7 @@
 #include "Ladder_Field.hpp"
 #include "Obj_mgr\obj_mgr.hpp"
 #include "entropy.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "CollisionMgr\PolyCache.hpp"
 
 

Support/Objects/MP_Settings.cpp

@@ -21,7 +21,7 @@ Circuit CTF\04\Value    = enum of 4 choices         no      yes     no
 //  INCLUDES
 //==============================================================================
 
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "MP_Settings.hpp"
 
 //==============================================================================

Support/Objects/NewWeapon.cpp

@@ -13,7 +13,7 @@
 #include "Entropy\e_Draw.hpp"
 #include "player.hpp"
 #include "ProjectileBullett.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "objects\GrenadeProjectile.hpp"
 #include "Dictionary\global_dictionary.hpp"
 #include "TemplateMgr\TemplateMgr.hpp"

Support/Objects/ParticleEmiter.cpp

@@ -16,7 +16,7 @@
 #include "GameLib\RenderContext.hpp"
 #include "Render\Render.hpp"
 #include "Objects\player.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 //=========================================================================
 // GLOBALS

Support/Objects/ParticleEmiter.hpp

@@ -16,7 +16,7 @@
 #include "Obj_mgr\Obj_mgr.hpp"
 #include "..\auxiliary\fx_RunTime\Fx_Mgr.hpp"
 #include "..\Auxiliary\Miscutils\Dictionary.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 //=========================================================================
 // CLASS

Support/Objects/Path.cpp

@@ -5,7 +5,7 @@
 #include "Entropy.hpp"
 #include "Path.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 
 #ifdef X_EDITOR

Support/Objects/Pickup.hpp

@@ -19,7 +19,7 @@
 #include "Render\RigidGeom.hpp"
 #include "Render\Render.hpp"
 #include "Objects\Render\RigidInst.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 //nclude "Hud\Focus_Inst.hpp"
 #include "Inventory/Inventory2.hpp"
 #include "NetProjectile.hpp"

Support/Objects/Pip.cpp

@@ -5,7 +5,7 @@
 #include "Pip.hpp"
 #include "Camera.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "EventMgr\EventMgr.hpp"
 #include "Render\LightMgr.hpp"
 #include "PlaySurface.hpp"

Support/Objects/PlaySurface.cpp

@@ -7,7 +7,7 @@
 #include "GameLib\RigidGeomCollision.hpp"
 #include "Render\Render.hpp"
 #include "Debris\Debris_mgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 xbool ShowCollision = FALSE;
 

Support/Objects/Portal.cpp

@@ -3,7 +3,7 @@
 #include "Entropy.hpp"
 #include "CollisionMgr\CollisionMgr.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "ZoneMgr\ZoneMgr.hpp"
 
 //=========================================================================

Support/Objects/ProjectileAlienTurret.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //=============================================================================================
 // SEEKER PROJECTILE
 //=============================================================================================
@@ -654,4 +655,6 @@ xbool alien_turret_projectile::OnProperty( prop_query& I )
 void alien_turret_projectile::AvoidObstacles      ( xbool bAvoid )
 {
     m_bAvoidObstacles = bAvoid;
-}
+}
+
+#endif

Support/Objects/ProjectileSeeker.cpp

@@ -104,7 +104,7 @@ void seeker_projectile::Initialize( const vector3&        InitPos,
                                         f32             Speed,
                                         guid            OwnerGuid,
                                         pain_handle     PainHandle,
-                                        xbool           bHitLiving = TRUE )
+                                        xbool           bHitLiving /*= TRUE*/ )
 {
     // Call base class
     base_projectile::Initialize(InitPos, InitRot, InheritedVelocity, Speed, OwnerGuid , PainHandle, bHitLiving ) ;
@@ -288,7 +288,7 @@ void seeker_projectile::OnExplode( void )
     //g_AudioManager.Play( "Grenade_Explosion", GetPosition() );
 
     g_AudioManager.Play( "GravCharge_Explosion", audio_manager::EXPLOSION, GetPosition(), 
-        GetZone1(), GetGuid() );
+        GetZone1(), GetGuid(), FALSE, FALSE );
 
     // create a decal
     decal_package* pPackage = m_hDecalPackage.GetPointer();

Support/Objects/ProxyPlaySurface.cpp

@@ -1,5 +1,5 @@
 #include "ProxyPlaySurface.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Obj_Mgr\Obj_Mgr.hpp"
 #include "PlaySurfaceMgr\PlaySurfaceMgr.hpp"
 #include "Debris\debris_mgr.hpp"

Support/Objects/ReactiveSurface.cpp

@@ -1,7 +1,7 @@
 
 #include "reactivesurface.hpp"
 #include "Dictionary\Global_Dictionary.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Player.hpp"
 
 xstring g_ReactiveSurfaceStringList;

Support/Objects/SkinPropSurface.hpp

@@ -10,7 +10,7 @@
 #include "ResourceMgr\ResourceMgr.hpp"
 #include "Objects\Render\SkinInst.hpp"
 #include "Animation\AnimPlayer.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Characters\FloorProperties.hpp"
 
 //=========================================================================

Support/Objects/Spawner/SpawnerObject.hpp

@@ -2,7 +2,7 @@
 #define __SPAWNEROBJECT_HPP__
 
 #include "..\Object.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 //#include "..\Support\Globals\Global_Variables_Manager.hpp"
 
 class spawner_object : public object

Support/Objects/Teleporter.cpp

@@ -12,7 +12,7 @@
 #include "Objects\Player.hpp"
 #include "Dictionary\global_dictionary.hpp"
 #include "AudioMgr\AudioMgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 //==============================================================================
 //  OBJECT DESCRIPTION

Support/Objects/Tracker.cpp

@@ -3,7 +3,7 @@
 //=========================================================================
 #include "Tracker.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 
 //=========================================================================

Support/Objects/Vehicles/Car.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 //
 //  Car.cpp
@@ -666,3 +667,4 @@ void car::ZeroVelocities( void )
 }
 
 //==============================================================================
+#endif

Support/Objects/Vehicles/CarObject.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 //
 //  CarObject.cpp
@@ -1950,3 +1951,4 @@ void car_object::VehicleRender( void )
 }
 
 //==============================================================================
+#endif

Support/Objects/Vehicles/RigidBody.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 //
 //  RigidBody.cpp
@@ -729,4 +730,4 @@ bbox GetRigidGeomBoneBBox( const rigid_geom* pRigidGeom, s32 iBone )
 }
 
 //==============================================================================
-
+#endif

Support/Objects/Vehicles/VehicleObject.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //=========================================================================
 //
 //  VehicleObject.cpp
@@ -12,6 +13,8 @@
 #include "Obj_mgr\obj_mgr.hpp"
 #include "Entropy.hpp"
 
+
+
 //=========================================================================
 // DEFINES
 //=========================================================================
@@ -398,3 +401,4 @@ void vehicle_object::ComputeView( view& View )
 }
 
 //=============================================================================
+#endif // DISABLE_LEGACY_CODE

Support/Objects/VolumetricLight.cpp

@@ -10,7 +10,7 @@
 //==============================================================================
 
 #include "VolumetricLight.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Entropy.hpp"
 #include "E_Draw.hpp"
 #include "Render\Render.hpp"

Support/Objects/WeaponGauss.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 #include "Obj_mgr\obj_mgr.hpp"
 #include "WeaponGauss.hpp"
 #include "ProjectileBullett.hpp"
@@ -475,3 +476,4 @@ xbool weapon_gauss::CanIntereptSecondaryFire( s32 nFireAnimIndex )
 }
 
 //==============================================================================
+#endif

Support/Objects/WeaponMHG.cpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_LEGACY_CODE
 //==============================================================================
 // Weapon Meson Hand Gun.cpp
 //==============================================================================
@@ -698,3 +699,4 @@ void weapon_mhg::DestoryReloadFx( void )
 }
 
 //==============================================================================
+#endif

Support/Objects/WeaponMutation.cpp

@@ -27,7 +27,7 @@
 #include "Gamelib/DebugCheats.hpp"
 #include "PerceptionMgr\PerceptionMgr.hpp"
 #include "objects\ProjectileMutantParasite2.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 //=========================================================================
 // DEFINES and CONSTS

Support/Objects/bomb_object.cpp

@@ -22,7 +22,7 @@
 
 #include "Render\Render.hpp"
 #include "Debris\Debris_mgr.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "objects\player.hpp"
 
 //=============================================================================

Support/Objects/feedbackemitter.cpp

@@ -16,7 +16,7 @@
 #include "Entropy.hpp"
 #include "CollisionMgr\CollisionMgr.hpp"
 #include "Render\editor_icons.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 #include "Objects\Player.hpp"
 #include "characters\character.hpp"

Support/Objects/marker_object.cpp

@@ -14,7 +14,7 @@
 
 #ifdef X_EDITOR
 #include "Dictionary\global_dictionary.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #endif
 
 

Support/PhysicsMgr/PhysicsInst.cpp

@@ -13,7 +13,7 @@
 #include "Entropy.hpp"
 #include "Loco\LocoCharAnimPlayer.hpp"
 #include "Objects\BaseProjectile.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 
 #ifdef TARGET_PS2
 #include "Entropy/PS2/ps2_spad.hpp"

Support/Ragdoll/Ragdoll.cpp

@@ -749,7 +749,8 @@ void ragdoll::ApplyCharacterConstraints( void )
 */
 
     // Find all dead bodies
-    g_ObjMgr.SelectBBox(object::ATTR_COLLIDABLE, WorldBBox, object::TYPE_DEAD_BODY) ;
+   // g_ObjMgr.SelectBBox(object::ATTR_COLLIDABLE, WorldBBox, object::TYPE_DEAD_BODY) ;
+   g_ObjMgr.SelectBBox(object::ATTR_COLLIDABLE, WorldBBox, object::TYPE_NULL) ; // #TODO: !!!
     slot_id SlotID = g_ObjMgr.StartLoop();
     while(SlotID != SLOT_NULL)
     {
@@ -2088,7 +2089,8 @@ void ragdoll::RenderCollision( void )
 
 void ragdoll::Advance( f32 DeltaTime )
 {
-    LOG_STAT(k_stats_Ragdoll);
+    // #TODO: !!!
+   // LOG_STAT(k_stats_Ragdoll);
 
     CONTEXT("ragdoll::Advance") ;
 

Support/Render/CMakeLists.txt

@@ -0,0 +1,38 @@
+set(RENDER_SRC
+"${CMAKE_CURRENT_SOURCE_DIR}/CollisionVolume.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/CollisionVolume.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/editor_icons.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/editor_icons.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/geom.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/geom.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/geom_mgr.inl"
+"${CMAKE_CURRENT_SOURCE_DIR}/LightMgr.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/LightMgr.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Material.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Material.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MaterialArray.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MaterialArray.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Material_Prefs.hpp"
+#"${CMAKE_CURRENT_SOURCE_DIR}/pc_Render.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/platform_Render.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/ProjTextureMgr.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/ProjTextureMgr.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Render.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Render.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/RigidGeom.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/RigidGeom.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/shader_mgr.inl"
+"${CMAKE_CURRENT_SOURCE_DIR}/SkinGeom.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SkinGeom.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SoftVertexMgr.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/SoftVertexMgr.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Texture.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Texture.hpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/VertexMgr.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/VertexMgr.hpp"
+)
+
+add_library(Render STATIC ${RENDER_SRC})
+set_support_defaults(Render)
+
+target_link_libraries(Render Entropy)

Support/StateMgr/StateMgr.cpp

@@ -941,8 +941,8 @@ void state_mgr::CheckControllers( void )
 #if !defined(X_EDITOR)
 
 #ifdef TARGET_PC
-    (void) input_gadget ControllerQuery;
-    (void) input_gadget AnalogQuery;
+    input_gadget ControllerQuery;
+    input_gadget AnalogQuery;
     return;
 #endif
 

Support/Trigger/Trigger_Actions.hpp

@@ -15,7 +15,7 @@
 #include "x_types.hpp"
 #include "Obj_Mgr\Obj_Mgr.hpp"
 #include "..\Support\Globals\Global_Variables_Manager.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Auxiliary\MiscUtils\PropertyEnum.hpp"
 
 class trigger_object;

Support/TriggerEx/Actions/action_ai_base.cpp

@@ -10,7 +10,7 @@
 
 #include "action_ai_base.hpp"
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Entropy.hpp"
 #include "Obj_Mgr\Obj_Mgr.hpp"
 #include "..\Support\Characters\Character.hpp"

Support/TriggerEx/Actions/action_ai_nav_activation.cpp

@@ -10,7 +10,7 @@
 
 #include "action_ai_nav_activation.hpp"
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Entropy.hpp"
 #include "Obj_Mgr\Obj_Mgr.hpp"
 #include "Obj_Mgr\Obj_Mgr.hpp"

Support/TriggerEx/Actions/action_change_perception.cpp

@@ -11,7 +11,7 @@
 #include "action_change_perception.hpp"
 
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "PerceptionMgr\PerceptionMgr.hpp"
 
 //=========================================================================

Support/TriggerEx/Actions/action_checkpoint.cpp

@@ -11,7 +11,7 @@
 #include "action_checkpoint.hpp"
 
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Objects\HudObject.hpp"
 #include "Dictionary\Global_Dictionary.hpp"
 #include "GameTextMgr\GameTextMgr.hpp"

Support/TriggerEx/Actions/action_display_text.cpp

@@ -13,7 +13,7 @@
 
 #include "Entropy.hpp"
 #include "..\xcore\auxiliary\MiscUtils\Property.hpp"
-#include "..\MiscUtils\SimpleUtils.hpp"
+#include "MiscUtils\SimpleUtils.hpp"
 #include "Objects\HudObject.hpp"
 #include "Dictionary\Global_Dictionary.hpp"
 #include "GameTextMgr\GameTextMgr.hpp"