diff --git a/.gitignore b/.gitignore index ae6087d..3eacd25 100644 --- a/.gitignore +++ b/.gitignore @@ -521,3 +521,4 @@ Xbox-Release/ !xCore/Tools/stringTool.exe !xCore/Tools/xCL.exe !xCore/Tools/xbmpTool.exe +/build diff --git a/Apps/CMakeLists.txt b/Apps/CMakeLists.txt new file mode 100644 index 0000000..5b84a7f --- /dev/null +++ b/Apps/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(GameApp) \ No newline at end of file diff --git a/Apps/GameApp/CMakeLists.txt b/Apps/GameApp/CMakeLists.txt new file mode 100644 index 0000000..c18c748 --- /dev/null +++ b/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() diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..48862fc --- /dev/null +++ b/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> + PRIVATE $<$: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) diff --git a/README.md b/README.md index c460900..ffce671 100644 --- a/README.md +++ b/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/) diff --git a/Support/Animation/AnimCompress.cpp b/Support/Animation/AnimCompress.cpp index 60fa53b..43b2819 100644 --- a/Support/Animation/AnimCompress.cpp +++ b/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 diff --git a/Support/Animation/AnimData.cpp b/Support/Animation/AnimData.cpp index 6c81e1c..c56c5d5 100644 --- a/Support/Animation/AnimData.cpp +++ b/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 diff --git a/Support/AudioMgr/AudioMgr.cpp b/Support/AudioMgr/AudioMgr.cpp index 029051d..bb0caf8 100644 --- a/Support/AudioMgr/AudioMgr.cpp +++ b/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; diff --git a/Support/AudioMgr/CMakeLists.txt b/Support/AudioMgr/CMakeLists.txt new file mode 100644 index 0000000..2164517 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/CMakeLists.txt b/Support/CMakeLists.txt new file mode 100644 index 0000000..6c92d30 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/Characters/AStar.hpp b/Support/Characters/AStar.hpp index 3faa83e..c7ee61e 100644 --- a/Support/Characters/AStar.hpp +++ b/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" diff --git a/Support/Characters/Character.cpp b/Support/Characters/Character.cpp index 0405d5e..530dc91 100644 --- a/Support/Characters/Character.cpp +++ b/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" diff --git a/Support/Characters/CharacterState.cpp b/Support/Characters/CharacterState.cpp index edae59e..2a9eeda 100644 --- a/Support/Characters/CharacterState.cpp +++ b/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" diff --git a/Support/Characters/GenericNPC/GenericNPC.cpp b/Support/Characters/GenericNPC/GenericNPC.cpp index 3fd6fc6..24b7c92 100644 --- a/Support/Characters/GenericNPC/GenericNPC.cpp +++ b/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" diff --git a/Support/Characters/Grunt/Grunt.cpp b/Support/Characters/Grunt/Grunt.cpp index 87b5b5e..62a4577 100644 --- a/Support/Characters/Grunt/Grunt.cpp +++ b/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" diff --git a/Support/Characters/MutantTank/MutantTank_Attack_State.cpp b/Support/Characters/MutantTank/MutantTank_Attack_State.cpp index fe31f2e..7a4c9f8 100644 --- a/Support/Characters/MutantTank/MutantTank_Attack_State.cpp +++ b/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 diff --git a/Support/Characters/MutantTank/Mutant_Tank.cpp b/Support/Characters/MutantTank/Mutant_Tank.cpp index 36bf0cd..ea71a04 100644 --- a/Support/Characters/MutantTank/Mutant_Tank.cpp +++ b/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" diff --git a/Support/Characters/ResponseList.cpp b/Support/Characters/ResponseList.cpp index d04a468..b4724a4 100644 --- a/Support/Characters/ResponseList.cpp +++ b/Support/Characters/ResponseList.cpp @@ -3,7 +3,7 @@ //========================================================================= // OBJECT DESCRIPTION //========================================================================= -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" void response_list::AddFlags( u32 newFlags ) { diff --git a/Support/Characters/TaskSystem/character_task.cpp b/Support/Characters/TaskSystem/character_task.cpp index bbc6b01..9114e93 100644 --- a/Support/Characters/TaskSystem/character_task.cpp +++ b/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; diff --git a/Support/Characters/TaskSystem/character_task_set.cpp b/Support/Characters/TaskSystem/character_task_set.cpp index e7a214f..7d0d89d 100644 --- a/Support/Characters/TaskSystem/character_task_set.cpp +++ b/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 diff --git a/Support/ConversationMgr/CMakeLists.txt b/Support/ConversationMgr/CMakeLists.txt new file mode 100644 index 0000000..cc3ec09 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/Debris/debris_alien_grenade_explosion.cpp b/Support/Debris/debris_alien_grenade_explosion.cpp index ca7f002..793744b 100644 --- a/Support/Debris/debris_alien_grenade_explosion.cpp +++ b/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" diff --git a/Support/Debris/debris_cannon.cpp b/Support/Debris/debris_cannon.cpp index 12986e8..b4459f0 100644 --- a/Support/Debris/debris_cannon.cpp +++ b/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" //============================================================================= diff --git a/Support/Debris/debris_frag_explosion.cpp b/Support/Debris/debris_frag_explosion.cpp index 1dc1f5e..1a94a4b 100644 --- a/Support/Debris/debris_frag_explosion.cpp +++ b/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" diff --git a/Support/Debris/debris_meson_lash.cpp b/Support/Debris/debris_meson_lash.cpp index 9cab1dd..4e23ecd 100644 --- a/Support/Debris/debris_meson_lash.cpp +++ b/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" diff --git a/Support/Dialogs/CMakeLists.txt b/Support/Dialogs/CMakeLists.txt new file mode 100644 index 0000000..51e6d74 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/Dialogs/dlg_BuddyList.cpp b/Support/Dialogs/dlg_BuddyList.cpp index eb51e44..f9c4b96 100644 --- a/Support/Dialogs/dlg_BuddyList.cpp +++ b/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 diff --git a/Support/Dialogs/dlg_MemcardSelect.cpp b/Support/Dialogs/dlg_MemcardSelect.cpp index 6875c5e..5fe54b5 100644 --- a/Support/Dialogs/dlg_MemcardSelect.cpp +++ b/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; diff --git a/Support/Dialogs/dlg_OnlineConnect.cpp b/Support/Dialogs/dlg_OnlineConnect.cpp index 28ce7d3..2d430bd 100644 --- a/Support/Dialogs/dlg_OnlineConnect.cpp +++ b/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] ) { diff --git a/Support/Dialogs/dlg_OnlineConnect.hpp b/Support/Dialogs/dlg_OnlineConnect.hpp index 4b7ec3c..78b7d29 100644 --- a/Support/Dialogs/dlg_OnlineConnect.hpp +++ b/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]; diff --git a/Support/Dialogs/dlg_Stats.cpp b/Support/Dialogs/dlg_Stats.cpp index 9c3b99a..8bbf576 100644 --- a/Support/Dialogs/dlg_Stats.cpp +++ b/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 diff --git a/Support/Dialogs/dlg_Template.cpp b/Support/Dialogs/dlg_Template.cpp index 27affd9..2fe1969 100644 --- a/Support/Dialogs/dlg_Template.cpp +++ b/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 diff --git a/Support/EventMgr/CMakeLists.txt b/Support/EventMgr/CMakeLists.txt new file mode 100644 index 0000000..52fda15 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/GameLib/CMakeLists.txt b/Support/GameLib/CMakeLists.txt new file mode 100644 index 0000000..7db9df3 --- /dev/null +++ b/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 +) \ No newline at end of file diff --git a/Support/GameTextMgr/GameTextMgr.cpp b/Support/GameTextMgr/GameTextMgr.cpp index c7ef6ba..e5f58b3 100644 --- a/Support/GameTextMgr/GameTextMgr.cpp +++ b/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" diff --git a/Support/Globals/Global_Variables_Manager.cpp b/Support/Globals/Global_Variables_Manager.cpp index e2b22ba..875229c 100644 --- a/Support/Globals/Global_Variables_Manager.cpp +++ b/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 diff --git a/Support/Globals/Global_Variables_Manager.hpp b/Support/Globals/Global_Variables_Manager.hpp index 0e08669..215857e 100644 --- a/Support/Globals/Global_Variables_Manager.hpp +++ b/Support/Globals/Global_Variables_Manager.hpp @@ -15,7 +15,7 @@ #include #include #include "Auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "x_bitstream.hpp" //========================================================================= diff --git a/Support/InputMgr/InputMgr.cpp b/Support/InputMgr/InputMgr.cpp index 74f7127..0246d92 100644 --- a/Support/InputMgr/InputMgr.cpp +++ b/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++, diff --git a/Support/Music_mgr/CMakeLists.txt b/Support/Music_mgr/CMakeLists.txt new file mode 100644 index 0000000..a160426 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/NetworkMgr/CMakeLists.txt b/Support/NetworkMgr/CMakeLists.txt new file mode 100644 index 0000000..3490149 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/NetworkMgr/MatchMgr_PS2.cpp b/Support/NetworkMgr/MatchMgr_PS2.cpp index 566934b..45b0af7 100644 --- a/Support/NetworkMgr/MatchMgr_PS2.cpp +++ b/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 diff --git a/Support/NetworkMgr/MatchMgr_STUB.cpp b/Support/NetworkMgr/MatchMgr_STUB.cpp new file mode 100644 index 0000000..8984a06 --- /dev/null +++ b/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) +{ +} diff --git a/Support/NetworkMgr/MatchMgr_WIN32.cpp b/Support/NetworkMgr/MatchMgr_WIN32.cpp index cbc9095..266ed3a 100644 --- a/Support/NetworkMgr/MatchMgr_WIN32.cpp +++ b/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 diff --git a/Support/NetworkMgr/MatchMgr_XBOX.cpp b/Support/NetworkMgr/MatchMgr_XBOX.cpp index e36dd50..bce627b 100644 --- a/Support/NetworkMgr/MatchMgr_XBOX.cpp +++ b/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 diff --git a/Support/NetworkMgr/Move.cpp b/Support/NetworkMgr/Move.cpp index ae65239..1af255e 100644 --- a/Support/NetworkMgr/Move.cpp +++ b/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 diff --git a/Support/NetworkMgr/MoveMgr.cpp b/Support/NetworkMgr/MoveMgr.cpp index 27f740d..dc02631 100644 --- a/Support/NetworkMgr/MoveMgr.cpp +++ b/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 diff --git a/Support/NetworkMgr/Voice/Headset_STUB.cpp b/Support/NetworkMgr/Voice/Headset_STUB.cpp new file mode 100644 index 0000000..6332873 --- /dev/null +++ b/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) +{ +} + diff --git a/Support/Objects/Actor/Actor.cpp b/Support/Objects/Actor/Actor.cpp index ae01214..ec5ab4e 100644 --- a/Support/Objects/Actor/Actor.cpp +++ b/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" diff --git a/Support/Objects/AlienPlatform.cpp b/Support/Objects/AlienPlatform.cpp index 660d9a5..9fad06c 100644 --- a/Support/Objects/AlienPlatform.cpp +++ b/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" diff --git a/Support/Objects/AlienShield.cpp b/Support/Objects/AlienShield.cpp index 1e933cf..cf471cd 100644 --- a/Support/Objects/AlienShield.cpp +++ b/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" diff --git a/Support/Objects/BaseProjectile.cpp b/Support/Objects/BaseProjectile.cpp index b57c875..3d70c9d 100644 --- a/Support/Objects/BaseProjectile.cpp +++ b/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" diff --git a/Support/Objects/Camera.cpp b/Support/Objects/Camera.cpp index a62159c..08143c5 100644 --- a/Support/Objects/Camera.cpp +++ b/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" diff --git a/Support/Objects/Cinema.cpp b/Support/Objects/Cinema.cpp index c853c7c..ec855a9 100644 --- a/Support/Objects/Cinema.cpp +++ b/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" //========================================================================= diff --git a/Support/Objects/Controller.cpp b/Support/Objects/Controller.cpp index 435798b..a92a944 100644 --- a/Support/Objects/Controller.cpp +++ b/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" diff --git a/Support/Objects/Coupler.cpp b/Support/Objects/Coupler.cpp index 3998d17..9dc3f19 100644 --- a/Support/Objects/Coupler.cpp +++ b/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" diff --git a/Support/Objects/DamageField.cpp b/Support/Objects/DamageField.cpp index 54b07b7..8e689a9 100644 --- a/Support/Objects/DamageField.cpp +++ b/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" diff --git a/Support/Objects/DeadBody.cpp b/Support/Objects/DeadBody.cpp index 5e1d2d6..6c98cab 100644 --- a/Support/Objects/DeadBody.cpp +++ b/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 diff --git a/Support/Objects/GZCoreObj.cpp b/Support/Objects/GZCoreObj.cpp index 3ac99a0..dda9f81 100644 --- a/Support/Objects/GZCoreObj.cpp +++ b/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" diff --git a/Support/Objects/Ghost.cpp b/Support/Objects/Ghost.cpp index 7cdbd46..f0c881f 100644 --- a/Support/Objects/Ghost.cpp +++ b/Support/Objects/Ghost.cpp @@ -1,3 +1,4 @@ +#ifndef DISABLE_LEGACY_CODE //============================================================================== // // Ghost.cpp @@ -882,3 +883,4 @@ s32 ghost::GetWeaponRenderState( void ) } //============================================================================== +#endif diff --git a/Support/Objects/GhostNet.cpp b/Support/Objects/GhostNet.cpp index 983587f..2765450 100644 --- a/Support/Objects/GhostNet.cpp +++ b/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 diff --git a/Support/Objects/HudObject.cpp b/Support/Objects/HudObject.cpp index 1b0d695..594ef81 100644 --- a/Support/Objects/HudObject.cpp +++ b/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" diff --git a/Support/Objects/Ladders/Ladder_Field.cpp b/Support/Objects/Ladders/Ladder_Field.cpp index b0bef5a..7324f5c 100644 --- a/Support/Objects/Ladders/Ladder_Field.cpp +++ b/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" diff --git a/Support/Objects/MP_Settings.cpp b/Support/Objects/MP_Settings.cpp index 7402873..787a411 100644 --- a/Support/Objects/MP_Settings.cpp +++ b/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" //============================================================================== diff --git a/Support/Objects/NewWeapon.cpp b/Support/Objects/NewWeapon.cpp index 1c3f640..6ef75d9 100644 --- a/Support/Objects/NewWeapon.cpp +++ b/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" diff --git a/Support/Objects/ParticleEmiter.cpp b/Support/Objects/ParticleEmiter.cpp index b13fae4..4c8afb5 100644 --- a/Support/Objects/ParticleEmiter.cpp +++ b/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 diff --git a/Support/Objects/ParticleEmiter.hpp b/Support/Objects/ParticleEmiter.hpp index ff22893..7788f77 100644 --- a/Support/Objects/ParticleEmiter.hpp +++ b/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 diff --git a/Support/Objects/Path.cpp b/Support/Objects/Path.cpp index c3b303b..16f03e8 100644 --- a/Support/Objects/Path.cpp +++ b/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 diff --git a/Support/Objects/Pickup.hpp b/Support/Objects/Pickup.hpp index fe07c89..e73d60d 100644 --- a/Support/Objects/Pickup.hpp +++ b/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" diff --git a/Support/Objects/Pip.cpp b/Support/Objects/Pip.cpp index f2ed0ce..9d7c926 100644 --- a/Support/Objects/Pip.cpp +++ b/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" diff --git a/Support/Objects/PlaySurface.cpp b/Support/Objects/PlaySurface.cpp index 32e1f2f..cdc8781 100644 --- a/Support/Objects/PlaySurface.cpp +++ b/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; diff --git a/Support/Objects/Portal.cpp b/Support/Objects/Portal.cpp index 476a9c2..1590ca6 100644 --- a/Support/Objects/Portal.cpp +++ b/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" //========================================================================= diff --git a/Support/Objects/ProjectileAlienTurret.cpp b/Support/Objects/ProjectileAlienTurret.cpp index 701e0db..2165d3b 100644 --- a/Support/Objects/ProjectileAlienTurret.cpp +++ b/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; -} \ No newline at end of file +} + +#endif diff --git a/Support/Objects/ProjectileSeeker.cpp b/Support/Objects/ProjectileSeeker.cpp index 1d68731..e0f39db 100644 --- a/Support/Objects/ProjectileSeeker.cpp +++ b/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(); diff --git a/Support/Objects/ProxyPlaySurface.cpp b/Support/Objects/ProxyPlaySurface.cpp index b74a248..c9d23a4 100644 --- a/Support/Objects/ProxyPlaySurface.cpp +++ b/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" diff --git a/Support/Objects/ReactiveSurface.cpp b/Support/Objects/ReactiveSurface.cpp index 3b33ff9..7a5b3f9 100644 --- a/Support/Objects/ReactiveSurface.cpp +++ b/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; diff --git a/Support/Objects/SkinPropSurface.hpp b/Support/Objects/SkinPropSurface.hpp index 6ee9f08..0ba716f 100644 --- a/Support/Objects/SkinPropSurface.hpp +++ b/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" //========================================================================= diff --git a/Support/Objects/Spawner/SpawnerObject.hpp b/Support/Objects/Spawner/SpawnerObject.hpp index 09d0116..d0f316f 100644 --- a/Support/Objects/Spawner/SpawnerObject.hpp +++ b/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 diff --git a/Support/Objects/Teleporter.cpp b/Support/Objects/Teleporter.cpp index 445b484..48fee43 100644 --- a/Support/Objects/Teleporter.cpp +++ b/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 diff --git a/Support/Objects/Tracker.cpp b/Support/Objects/Tracker.cpp index d87cac1..d0fddd5 100644 --- a/Support/Objects/Tracker.cpp +++ b/Support/Objects/Tracker.cpp @@ -3,7 +3,7 @@ //========================================================================= #include "Tracker.hpp" #include "Render\editor_icons.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" //========================================================================= diff --git a/Support/Objects/Vehicles/Car.cpp b/Support/Objects/Vehicles/Car.cpp index cec3551..fa883f7 100644 --- a/Support/Objects/Vehicles/Car.cpp +++ b/Support/Objects/Vehicles/Car.cpp @@ -1,3 +1,4 @@ +#ifndef DISABLE_LEGACY_CODE //============================================================================== // // Car.cpp @@ -666,3 +667,4 @@ void car::ZeroVelocities( void ) } //============================================================================== +#endif diff --git a/Support/Objects/Vehicles/CarObject.cpp b/Support/Objects/Vehicles/CarObject.cpp index f203690..57cbe53 100644 --- a/Support/Objects/Vehicles/CarObject.cpp +++ b/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 diff --git a/Support/Objects/Vehicles/RigidBody.cpp b/Support/Objects/Vehicles/RigidBody.cpp index 9b8e314..ab50275 100644 --- a/Support/Objects/Vehicles/RigidBody.cpp +++ b/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 diff --git a/Support/Objects/Vehicles/VehicleObject.cpp b/Support/Objects/Vehicles/VehicleObject.cpp index 68e42ba..8fc5cf8 100644 --- a/Support/Objects/Vehicles/VehicleObject.cpp +++ b/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 diff --git a/Support/Objects/VolumetricLight.cpp b/Support/Objects/VolumetricLight.cpp index 1a0d6ee..7198702 100644 --- a/Support/Objects/VolumetricLight.cpp +++ b/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" diff --git a/Support/Objects/WeaponGauss.cpp b/Support/Objects/WeaponGauss.cpp index e95ff4d..a2402e8 100644 --- a/Support/Objects/WeaponGauss.cpp +++ b/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 diff --git a/Support/Objects/WeaponMHG.cpp b/Support/Objects/WeaponMHG.cpp index b4ba34f..75d5c55 100644 --- a/Support/Objects/WeaponMHG.cpp +++ b/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 diff --git a/Support/Objects/WeaponMutation.cpp b/Support/Objects/WeaponMutation.cpp index c684296..043d3f3 100644 --- a/Support/Objects/WeaponMutation.cpp +++ b/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 diff --git a/Support/Objects/bomb_object.cpp b/Support/Objects/bomb_object.cpp index a812860..87649b4 100644 --- a/Support/Objects/bomb_object.cpp +++ b/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" //============================================================================= diff --git a/Support/Objects/feedbackemitter.cpp b/Support/Objects/feedbackemitter.cpp index f7a9938..23b88de 100644 --- a/Support/Objects/feedbackemitter.cpp +++ b/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" diff --git a/Support/Objects/marker_object.cpp b/Support/Objects/marker_object.cpp index 875d178..543e51c 100644 --- a/Support/Objects/marker_object.cpp +++ b/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 diff --git a/Support/PhysicsMgr/PhysicsInst.cpp b/Support/PhysicsMgr/PhysicsInst.cpp index f31122d..e682250 100644 --- a/Support/PhysicsMgr/PhysicsInst.cpp +++ b/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" diff --git a/Support/Ragdoll/Ragdoll.cpp b/Support/Ragdoll/Ragdoll.cpp index b7d4e5d..c12c440 100644 --- a/Support/Ragdoll/Ragdoll.cpp +++ b/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") ; diff --git a/Support/Render/CMakeLists.txt b/Support/Render/CMakeLists.txt new file mode 100644 index 0000000..5c57fc2 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Support/StateMgr/StateMgr.cpp b/Support/StateMgr/StateMgr.cpp index 3747971..73ccfbe 100644 --- a/Support/StateMgr/StateMgr.cpp +++ b/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 diff --git a/Support/Trigger/Trigger_Actions.hpp b/Support/Trigger/Trigger_Actions.hpp index 6ec116e..8f598bb 100644 --- a/Support/Trigger/Trigger_Actions.hpp +++ b/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; diff --git a/Support/TriggerEx/Actions/action_ai_base.cpp b/Support/TriggerEx/Actions/action_ai_base.cpp index 65898a8..b1090ad 100644 --- a/Support/TriggerEx/Actions/action_ai_base.cpp +++ b/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" diff --git a/Support/TriggerEx/Actions/action_ai_nav_activation.cpp b/Support/TriggerEx/Actions/action_ai_nav_activation.cpp index efc7a87..8dd316c 100644 --- a/Support/TriggerEx/Actions/action_ai_nav_activation.cpp +++ b/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" diff --git a/Support/TriggerEx/Actions/action_change_perception.cpp b/Support/TriggerEx/Actions/action_change_perception.cpp index 307ab86..e320529 100644 --- a/Support/TriggerEx/Actions/action_change_perception.cpp +++ b/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" //========================================================================= diff --git a/Support/TriggerEx/Actions/action_checkpoint.cpp b/Support/TriggerEx/Actions/action_checkpoint.cpp index 0410233..41e9d3c 100644 --- a/Support/TriggerEx/Actions/action_checkpoint.cpp +++ b/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" diff --git a/Support/TriggerEx/Actions/action_display_text.cpp b/Support/TriggerEx/Actions/action_display_text.cpp index cb4b276..28baddb 100644 --- a/Support/TriggerEx/Actions/action_display_text.cpp +++ b/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" diff --git a/Support/TriggerEx/Actions/action_door_logic.cpp b/Support/TriggerEx/Actions/action_door_logic.cpp index ed18484..67d96ad 100644 --- a/Support/TriggerEx/Actions/action_door_logic.cpp +++ b/Support/TriggerEx/Actions/action_door_logic.cpp @@ -10,7 +10,7 @@ #include "action_door_logic.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" #include "Obj_Mgr\Obj_Mgr.hpp" diff --git a/Support/TriggerEx/Actions/action_exit_turret.cpp b/Support/TriggerEx/Actions/action_exit_turret.cpp index c05a446..cb8f959 100644 --- a/Support/TriggerEx/Actions/action_exit_turret.cpp +++ b/Support/TriggerEx/Actions/action_exit_turret.cpp @@ -10,7 +10,7 @@ #include "action_exit_turret.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 "objects\player.hpp" diff --git a/Support/TriggerEx/Actions/action_fade_geometry.cpp b/Support/TriggerEx/Actions/action_fade_geometry.cpp index 2b9e117..c2f2b62 100644 --- a/Support/TriggerEx/Actions/action_fade_geometry.cpp +++ b/Support/TriggerEx/Actions/action_fade_geometry.cpp @@ -10,7 +10,7 @@ #include "action_fade_geometry.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 "Objects\Render\RenderInst.hpp" diff --git a/Support/TriggerEx/Actions/action_man_turret.cpp b/Support/TriggerEx/Actions/action_man_turret.cpp index d93c2a1..70bcdf9 100644 --- a/Support/TriggerEx/Actions/action_man_turret.cpp +++ b/Support/TriggerEx/Actions/action_man_turret.cpp @@ -10,7 +10,7 @@ #include "action_man_turret.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 "objects\player.hpp" diff --git a/Support/TriggerEx/Actions/action_mission_failed.cpp b/Support/TriggerEx/Actions/action_mission_failed.cpp index d9d5809..31b564c 100644 --- a/Support/TriggerEx/Actions/action_mission_failed.cpp +++ b/Support/TriggerEx/Actions/action_mission_failed.cpp @@ -10,7 +10,7 @@ #include "action_mission_failed.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" diff --git a/Support/TriggerEx/Actions/action_music_intensity.cpp b/Support/TriggerEx/Actions/action_music_intensity.cpp index 4fae2bd..96e3339 100644 --- a/Support/TriggerEx/Actions/action_music_intensity.cpp +++ b/Support/TriggerEx/Actions/action_music_intensity.cpp @@ -16,7 +16,7 @@ #include "MusicStateMgr\MusicStateMgr.hpp" #include "Entropy.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" //========================================================================= // MUSIC_INTENSITY diff --git a/Support/TriggerEx/Actions/action_object_activation.cpp b/Support/TriggerEx/Actions/action_object_activation.cpp index 9d188cf..5de759f 100644 --- a/Support/TriggerEx/Actions/action_object_activation.cpp +++ b/Support/TriggerEx/Actions/action_object_activation.cpp @@ -10,7 +10,7 @@ #include "action_object_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 "..\Support\Zonemgr\ZoneMgr.hpp" diff --git a/Support/TriggerEx/Actions/action_object_damage.cpp b/Support/TriggerEx/Actions/action_object_damage.cpp index c5e60cd..b1b8683 100644 --- a/Support/TriggerEx/Actions/action_object_damage.cpp +++ b/Support/TriggerEx/Actions/action_object_damage.cpp @@ -10,7 +10,7 @@ #include "action_object_damage.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 "objects\actor\actor.hpp" diff --git a/Support/TriggerEx/Actions/action_object_destroy.cpp b/Support/TriggerEx/Actions/action_object_destroy.cpp index 25df39b..d6455e4 100644 --- a/Support/TriggerEx/Actions/action_object_destroy.cpp +++ b/Support/TriggerEx/Actions/action_object_destroy.cpp @@ -10,7 +10,7 @@ #include "action_object_destroy.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 "..\TriggerEx_Object.hpp" diff --git a/Support/TriggerEx/Actions/action_player_hud.cpp b/Support/TriggerEx/Actions/action_player_hud.cpp index 750a7a7..398ccbc 100644 --- a/Support/TriggerEx/Actions/action_player_hud.cpp +++ b/Support/TriggerEx/Actions/action_player_hud.cpp @@ -10,7 +10,7 @@ #include "action_player_hud.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\Zonemgr\ZoneMgr.hpp" diff --git a/Support/TriggerEx/Actions/action_portal_activate.cpp b/Support/TriggerEx/Actions/action_portal_activate.cpp index 39bbac1..01fa889 100644 --- a/Support/TriggerEx/Actions/action_portal_activate.cpp +++ b/Support/TriggerEx/Actions/action_portal_activate.cpp @@ -10,7 +10,7 @@ #include "action_portal_activate.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\Zonemgr\ZoneMgr.hpp" diff --git a/Support/TriggerEx/Affecters/conditional_affecter.hpp b/Support/TriggerEx/Affecters/conditional_affecter.hpp index 5da00f2..510a301 100644 --- a/Support/TriggerEx/Affecters/conditional_affecter.hpp +++ b/Support/TriggerEx/Affecters/conditional_affecter.hpp @@ -11,7 +11,7 @@ // INCLUDES //========================================================================= -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "..\Support\TriggerEx\TriggerEx_Conditionals.hpp" //========================================================================= diff --git a/Support/TriggerEx/Affecters/object_affecter.hpp b/Support/TriggerEx/Affecters/object_affecter.hpp index ac8071f..87e2ae3 100644 --- a/Support/TriggerEx/Affecters/object_affecter.hpp +++ b/Support/TriggerEx/Affecters/object_affecter.hpp @@ -11,7 +11,7 @@ // INCLUDES //========================================================================= -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" //========================================================================= // Check Property diff --git a/Support/TriggerEx/Conditions/condition_check_focus_object.cpp b/Support/TriggerEx/Conditions/condition_check_focus_object.cpp index c026cd5..ed16c63 100644 --- a/Support/TriggerEx/Conditions/condition_check_focus_object.cpp +++ b/Support/TriggerEx/Conditions/condition_check_focus_object.cpp @@ -10,7 +10,7 @@ #include "condition_check_focus_object.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" #include "..\Support\Objects\focusobject.hpp" diff --git a/Support/TriggerEx/Conditions/condition_check_global.cpp b/Support/TriggerEx/Conditions/condition_check_global.cpp index 5eb7aa6..e216abe 100644 --- a/Support/TriggerEx/Conditions/condition_check_global.cpp +++ b/Support/TriggerEx/Conditions/condition_check_global.cpp @@ -10,7 +10,7 @@ #include "condition_check_global.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "..\Support\Globals\Global_Variables_Manager.hpp" #include "miscutils\Guid.hpp" #include "Dictionary\global_dictionary.hpp" diff --git a/Support/TriggerEx/Conditions/condition_check_global.hpp b/Support/TriggerEx/Conditions/condition_check_global.hpp index 7a65cc2..b137f47 100644 --- a/Support/TriggerEx/Conditions/condition_check_global.hpp +++ b/Support/TriggerEx/Conditions/condition_check_global.hpp @@ -15,7 +15,7 @@ #include "x_types.hpp" #include "Auxiliary\MiscUtils\PropertyEnum.hpp" #include "..\TriggerEx_Conditionals.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" //========================================================================= // Check Property diff --git a/Support/TriggerEx/Conditions/condition_check_health.cpp b/Support/TriggerEx/Conditions/condition_check_health.cpp index e8735f9..ebca60c 100644 --- a/Support/TriggerEx/Conditions/condition_check_health.cpp +++ b/Support/TriggerEx/Conditions/condition_check_health.cpp @@ -10,7 +10,7 @@ #include "condition_check_health.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" diff --git a/Support/TriggerEx/Conditions/condition_check_property.cpp b/Support/TriggerEx/Conditions/condition_check_property.cpp index 4cc039f..b27774d 100644 --- a/Support/TriggerEx/Conditions/condition_check_property.cpp +++ b/Support/TriggerEx/Conditions/condition_check_property.cpp @@ -10,7 +10,7 @@ #include "condition_check_property.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Obj_mgr\obj_mgr.hpp" #include "Dictionary\global_dictionary.hpp" diff --git a/Support/TriggerEx/Conditions/condition_is_censored.cpp b/Support/TriggerEx/Conditions/condition_is_censored.cpp index d9545e6..d34747f 100644 --- a/Support/TriggerEx/Conditions/condition_is_censored.cpp +++ b/Support/TriggerEx/Conditions/condition_is_censored.cpp @@ -10,7 +10,7 @@ #include "condition_is_censored.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" extern xbool g_bCensoredBuild; diff --git a/Support/TriggerEx/Conditions/condition_line_of_sight.cpp b/Support/TriggerEx/Conditions/condition_line_of_sight.cpp index a0a7d57..9622d79 100644 --- a/Support/TriggerEx/Conditions/condition_line_of_sight.cpp +++ b/Support/TriggerEx/Conditions/condition_line_of_sight.cpp @@ -14,7 +14,7 @@ #include "condition_line_of_sight.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" #include "collisionmgr\collisionmgr.hpp" #include "objects\player.hpp" diff --git a/Support/TriggerEx/Conditions/condition_object_exists.cpp b/Support/TriggerEx/Conditions/condition_object_exists.cpp index 97041a9..494e16c 100644 --- a/Support/TriggerEx/Conditions/condition_object_exists.cpp +++ b/Support/TriggerEx/Conditions/condition_object_exists.cpp @@ -10,7 +10,7 @@ #include "condition_object_exists.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" //========================================================================= diff --git a/Support/TriggerEx/Conditions/condition_player_button_state.cpp b/Support/TriggerEx/Conditions/condition_player_button_state.cpp index c2f67ad..0e37414 100644 --- a/Support/TriggerEx/Conditions/condition_player_button_state.cpp +++ b/Support/TriggerEx/Conditions/condition_player_button_state.cpp @@ -10,7 +10,7 @@ #include "condition_player_button_state.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "..\Support\Objects\Player.hpp" #include "..\triggerex_object.hpp" diff --git a/Support/TriggerEx/Conditions/condition_player_has_item.cpp b/Support/TriggerEx/Conditions/condition_player_has_item.cpp index dbb092f..69c0f32 100644 --- a/Support/TriggerEx/Conditions/condition_player_has_item.cpp +++ b/Support/TriggerEx/Conditions/condition_player_has_item.cpp @@ -10,7 +10,7 @@ #include "condition_player_has_item.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "..\Support\Objects\Player.hpp" #include "Dictionary\global_dictionary.hpp" #include "Inventory/Inventory2.hpp" diff --git a/Support/TriggerEx/Conditions/condition_random_chance.cpp b/Support/TriggerEx/Conditions/condition_random_chance.cpp index 5fd287c..4f4d64c 100644 --- a/Support/TriggerEx/Conditions/condition_random_chance.cpp +++ b/Support/TriggerEx/Conditions/condition_random_chance.cpp @@ -10,7 +10,7 @@ #include "condition_random_chance.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" //========================================================================= // CLASS FUNCTIONS diff --git a/Support/TriggerEx/Conditions/condition_within_range.cpp b/Support/TriggerEx/Conditions/condition_within_range.cpp index ed15d76..b9568bf 100644 --- a/Support/TriggerEx/Conditions/condition_within_range.cpp +++ b/Support/TriggerEx/Conditions/condition_within_range.cpp @@ -10,7 +10,7 @@ #include "condition_within_range.hpp" #include "..\xcore\auxiliary\MiscUtils\Property.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Entropy.hpp" //========================================================================= diff --git a/Support/TriggerEx/TriggerEx_Actions.hpp b/Support/TriggerEx/TriggerEx_Actions.hpp index 9237015..56d8fad 100644 --- a/Support/TriggerEx/TriggerEx_Actions.hpp +++ b/Support/TriggerEx/TriggerEx_Actions.hpp @@ -14,7 +14,7 @@ #include "x_types.hpp" #include "..\Support\Globals\Global_Variables_Manager.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Auxiliary\MiscUtils\PropertyEnum.hpp" class trigger_ex_object; diff --git a/Support/TriggerEx/TriggerEx_Object.hpp b/Support/TriggerEx/TriggerEx_Object.hpp index e75c569..1a0a03e 100644 --- a/Support/TriggerEx/TriggerEx_Object.hpp +++ b/Support/TriggerEx/TriggerEx_Object.hpp @@ -15,7 +15,7 @@ #include "Obj_mgr\obj_mgr.hpp" #include "..\Support\TriggerEx\TriggerEx_Conditionals.hpp" #include "..\Support\TriggerEx\TriggerEx_Actions.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Affecters\conditional_affecter.hpp" #include "..\Support\Objects\focusobject.hpp" diff --git a/Support/UI/CMakeLists.txt b/Support/UI/CMakeLists.txt new file mode 100644 index 0000000..d725e96 --- /dev/null +++ b/Support/UI/CMakeLists.txt @@ -0,0 +1,9 @@ +file(GLOB UI_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +add_library(UI STATIC ${UI_SRC}) +set_support_defaults(UI) + +target_link_libraries(UI Entropy) \ No newline at end of file diff --git a/Support/UI/ui_font.cpp b/Support/UI/ui_font.cpp index f9ae6ef..0e5508d 100644 --- a/Support/UI/ui_font.cpp +++ b/Support/UI/ui_font.cpp @@ -322,7 +322,7 @@ void ui_font::TextSize( irect& Rect, const xwchar* pString, s32 Count ) const if( buttonCode != -1 ) { -#ifdef TARGET_PS2 +#if 1//def TARGET_PS2 if( buttonCode == PS2_BUTTON_START ) { Width += BUTTON_START_SPRITE_WIDTH; @@ -427,7 +427,7 @@ s32 ui_font::TextWidth( const xwchar* pString, s32 Count ) const if( ButtonCode != -1 ) { -#ifdef TARGET_PS2 +#if 1//def TARGET_PS2 // for the start button, double it... if( ButtonCode == PS2_BUTTON_START ) { @@ -763,7 +763,7 @@ void ui_font::TextWrap( const xwchar* pString, const irect& Rect, xwstring& Wrap if( ButtonCode != -1 ) { -#ifdef TARGET_PS2 +#if 1//def TARGET_PS2 // for the start button, double it... if( ButtonCode == PS2_BUTTON_START ) { @@ -967,7 +967,7 @@ void ui_font::RenderHelpText( const irect& Rect, Width += HELP_TEXT_SPACING; } -#ifdef TARGET_PS2 +#if 1//def TARGET_PS2 if( buttonCode == PS2_BUTTON_START ) { Width += BUTTON_START_SPRITE_WIDTH; @@ -1150,7 +1150,8 @@ void ui_font::RenderHelpText( const irect& Rect, sx += BUTTON_SPRITE_WIDTH; } #else - if( buttonCode == XBOX_BUTTON_START ) + //if( buttonCode == XBOX_BUTTON_START ) + if( buttonCode == PS2_BUTTON_START) { draw_Sprite( vector3((f32)sx+1, (f32)sy+1, 0), vector2(BUTTON_SPRITE_WIDTH, BUTTON_SPRITE_WIDTH), xcolor(0,0,0,255) ); draw_Sprite( vector3((f32)sx, (f32)sy, 0), vector2(BUTTON_SPRITE_WIDTH, BUTTON_SPRITE_WIDTH), xcolor(255,255,255) ); @@ -1489,7 +1490,7 @@ void ui_font::RenderText( const irect& Rect, //draw_Sprite( vector3((f32)tx+1, (f32)ty+1, 0), vector2(BUTTON_SPRITE_WIDTH, BUTTON_SPRITE_WIDTH), xcolor(0,0,0,255) ); //draw_Sprite( vector3((f32)tx, (f32)ty, 0), vector2(BUTTON_SPRITE_WIDTH, BUTTON_SPRITE_WIDTH), xcolor(255,255,255) ); -#ifdef TARGET_PS2 +#if 1//def TARGET_PS2 if( buttonCode == PS2_BUTTON_START ) { tx += BUTTON_SPRITE_WIDTH; diff --git a/Support/ZoneMgr/ZoneMgr.hpp b/Support/ZoneMgr/ZoneMgr.hpp index a0ca01a..3620e0c 100644 --- a/Support/ZoneMgr/ZoneMgr.hpp +++ b/Support/ZoneMgr/ZoneMgr.hpp @@ -6,7 +6,7 @@ //========================================================================= #include "Entropy.hpp" #include "auxiliary\miscutils\Guid.hpp" -#include "..\..\MiscUtils\PriorityQueue.hpp" +#include "MiscUtils\PriorityQueue.hpp" #include "x_bitstream.hpp" //========================================================================= diff --git a/Support/navigation/AlarmNode.cpp b/Support/navigation/AlarmNode.cpp index 6869877..e45373c 100644 --- a/Support/navigation/AlarmNode.cpp +++ b/Support/navigation/AlarmNode.cpp @@ -1,6 +1,6 @@ #include "AlarmNode.hpp" #include "entropy\e_draw.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Render\editor_icons.hpp" #include "ng_node2.hpp" #include "Loco\LocoUtil.hpp" diff --git a/Support/navigation/CoverNode.cpp b/Support/navigation/CoverNode.cpp index cf3e556..c1aed1a 100644 --- a/Support/navigation/CoverNode.cpp +++ b/Support/navigation/CoverNode.cpp @@ -1,7 +1,7 @@ #include "CoverNode.hpp" #include "entropy\e_draw.hpp" #include "Entropy\e_ScratchMem.hpp" -#include "..\MiscUtils\SimpleUtils.hpp" +#include "MiscUtils\SimpleUtils.hpp" #include "Render\editor_icons.hpp" #include "ng_node2.hpp" #include "Characters\Character.hpp" diff --git a/Support/navigation/nav_map.cpp b/Support/navigation/nav_map.cpp index 4a4865d..f4d20fd 100644 --- a/Support/navigation/nav_map.cpp +++ b/Support/navigation/nav_map.cpp @@ -7,8 +7,8 @@ #include "ng_node2.hpp" #include "ng_connection2.hpp" #include "Entropy.hpp" -#include "../../MiscUtils/SimpleUtils.hpp" -#include "..\MiscUtils\PriorityQueue.hpp" +#include "MiscUtils/SimpleUtils.hpp" +#include "MiscUtils\PriorityQueue.hpp" #include "AI\AIMgr.hpp" #include "Objects/Actor/Actor.hpp" #include "Characters/Character.hpp" diff --git a/Support/navigation/ng_connection2.cpp b/Support/navigation/ng_connection2.cpp index 55c3c38..7c2e3f8 100644 --- a/Support/navigation/ng_connection2.cpp +++ b/Support/navigation/ng_connection2.cpp @@ -13,7 +13,7 @@ #include "../ZoneMgr/ZoneMgr.hpp" #include "CollisionMgr\CollisionMgr.hpp" -#include "../../MiscUtils/SimpleUtils.hpp" +#include "MiscUtils/SimpleUtils.hpp" #include "..\objects\object.hpp" #include "../objects/Portal.hpp" diff --git a/xCore/3rdParty/DXTLibrary/Cclist.cpp b/xCore/3rdParty/DXTLibrary/Cclist.cpp index d2bf278..6a71eb9 100644 --- a/xCore/3rdParty/DXTLibrary/Cclist.cpp +++ b/xCore/3rdParty/DXTLibrary/Cclist.cpp @@ -417,7 +417,7 @@ static xbool CheckAlpha(ccNode *n, ccNode *nn) void ccList::SortAlpha() { - Sort(&(NodeCheckFlipFunc)CheckAlpha); + Sort((NodeCheckFlipFunc)CheckAlpha); } diff --git a/xCore/3rdParty/DXTLibrary/LoadFromBMP.cpp b/xCore/3rdParty/DXTLibrary/LoadFromBMP.cpp index b425c23..be987bb 100644 --- a/xCore/3rdParty/DXTLibrary/LoadFromBMP.cpp +++ b/xCore/3rdParty/DXTLibrary/LoadFromBMP.cpp @@ -4,179 +4,179 @@ */ -#include "StdAfx.h" -#include "LoadImageFrom.h" -#include - -typedef struct -{ - DWORD Size; - WORD Reserved1; - WORD Reserved2; - DWORD OffBits; -} BMHeader; - -typedef struct -{ - DWORD Size; - long Width; - long Height; - WORD Planes; - WORD BitCount; - DWORD Compression; - DWORD SizeImage; - long XPelsPerMeter; - long YPelsPerMeter; - DWORD ClrUsed; - DWORD ClrImportant; -} BMInfo; - -static long Load8BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest); -static long Load24BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest); - - -long LoadFromBMP(FILE *pFile, Image **pDest) -{ -WORD ID; -BMHeader Head; -BMInfo Info; - - // Parse the header for the format info - if(fread(&ID, 1, 2, pFile) != 2 || ID != 'MB') - return LI_FileError; - - if(fread(&Head, 1, sizeof(Head), pFile) != sizeof(Head)) - return LI_FileError; - - if(fread(&Info, 1, sizeof(Info), pFile) != sizeof(Info)) - return LI_FileError; - - if(Info.Compression != 0) - return LI_UnsupportedFormat; - - if(Info.SizeImage == 0) - Info.SizeImage = Info.BitCount * Info.Width * Info.Height / 8; - - switch(Info.BitCount) - { - case 8: return Load8BitBMP(pFile, &Head, &Info, pDest); - case 24: return Load24BitBMP(pFile, &Head, &Info, pDest); - default: - return LI_UnsupportedFormat; - } -} - - -static long Load8BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest) -{ -Image8 *pImg; -BYTE *pBuf, *pSrc, *pPix; -Color *pPal; -long x, y, XSize, YSize, Cols; -DWORD dwSize; - - pImg = new Image8; - - XSize = pInfo->Width; - YSize = pInfo->Height; - Cols = pInfo->ClrUsed; - if(Cols == 0) Cols = 256; - - pImg->SetNumColors(Cols); - pPal = pImg->GetPalette(); - pBuf = new BYTE[Cols*4]; - if(fread(pBuf, 1, Cols * 4, pFile) != (unsigned)Cols * 4) - { - delete [] pBuf; - delete pImg; - return LI_FileError; - } - - // Convert the palette into ARGB - pSrc = pBuf; - for(y=0; yOffBits, SEEK_SET); - if(fread(pBuf, 1, dwSize, pFile) != dwSize) - { - delete pImg; - delete [] pBuf; - return LI_FileError; - } - - pImg->SetSize(XSize, YSize); - pPix = pImg->GetPixels() + dwSize - XSize; - pSrc = pBuf; - - for(y=0; ySizeImage]; - fseek(pFile, pHead->OffBits, SEEK_SET); - if(fread(pBuf, 1, pInfo->SizeImage, pFile) != pInfo->SizeImage) - { - delete pImg; - delete [] pBuf; - return LI_FileError; - } - - XSize = pInfo->Width; - YSize = pInfo->Height; - - pImg->SetSize(XSize, YSize); - pPix = pImg->GetPixels() + XSize * (YSize-1); - pSrc = pBuf; - - for(y=0; y +// +//typedef struct +//{ +// DWORD Size; +// WORD Reserved1; +// WORD Reserved2; +// DWORD OffBits; +//} BMHeader; +// +//typedef struct +//{ +// DWORD Size; +// long Width; +// long Height; +// WORD Planes; +// WORD BitCount; +// DWORD Compression; +// DWORD SizeImage; +// long XPelsPerMeter; +// long YPelsPerMeter; +// DWORD ClrUsed; +// DWORD ClrImportant; +//} BMInfo; +// +//static long Load8BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest); +//static long Load24BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest); +// +// +//long LoadFromBMP(FILE *pFile, Image **pDest) +//{ +//WORD ID; +//BMHeader Head; +//BMInfo Info; +// +// // Parse the header for the format info +// if(fread(&ID, 1, 2, pFile) != 2 || ID != 'MB') +// return LI_FileError; +// +// if(fread(&Head, 1, sizeof(Head), pFile) != sizeof(Head)) +// return LI_FileError; +// +// if(fread(&Info, 1, sizeof(Info), pFile) != sizeof(Info)) +// return LI_FileError; +// +// if(Info.Compression != 0) +// return LI_UnsupportedFormat; +// +// if(Info.SizeImage == 0) +// Info.SizeImage = Info.BitCount * Info.Width * Info.Height / 8; +// +// switch(Info.BitCount) +// { +// case 8: return Load8BitBMP(pFile, &Head, &Info, pDest); +// case 24: return Load24BitBMP(pFile, &Head, &Info, pDest); +// default: +// return LI_UnsupportedFormat; +// } +//} +// +// +//static long Load8BitBMP(FILE *pFile, BMHeader *pHead, BMInfo *pInfo, Image **pDest) +//{ +//Image8 *pImg; +//BYTE *pBuf, *pSrc, *pPix; +//Color *pPal; +//long x, y, XSize, YSize, Cols; +//DWORD dwSize; +// +// pImg = new Image8; +// +// XSize = pInfo->Width; +// YSize = pInfo->Height; +// Cols = pInfo->ClrUsed; +// if(Cols == 0) Cols = 256; +// +// pImg->SetNumColors(Cols); +// pPal = pImg->GetPalette(); +// pBuf = new BYTE[Cols*4]; +// if(fread(pBuf, 1, Cols * 4, pFile) != (unsigned)Cols * 4) +// { +// delete [] pBuf; +// delete pImg; +// return LI_FileError; +// } +// +// // Convert the palette into ARGB +// pSrc = pBuf; +// for(y=0; yOffBits, SEEK_SET); +// if(fread(pBuf, 1, dwSize, pFile) != dwSize) +// { +// delete pImg; +// delete [] pBuf; +// return LI_FileError; +// } +// +// pImg->SetSize(XSize, YSize); +// pPix = pImg->GetPixels() + dwSize - XSize; +// pSrc = pBuf; +// +// for(y=0; ySizeImage]; +// fseek(pFile, pHead->OffBits, SEEK_SET); +// if(fread(pBuf, 1, pInfo->SizeImage, pFile) != pInfo->SizeImage) +// { +// delete pImg; +// delete [] pBuf; +// return LI_FileError; +// } +// +// XSize = pInfo->Width; +// YSize = pInfo->Height; +// +// pImg->SetSize(XSize, YSize); +// pPix = pImg->GetPixels() + XSize * (YSize-1); +// pSrc = pBuf; +// +// for(y=0; yCMapBPP != 24 && pHead->CMapBPP != 32) - return LI_UnsupportedFormat; - - XSize = pHead->Width; - YSize = pHead->Height; - NCols = pHead->CMapLength; - - DataStart = sizeof(TGAHeader) + pHead->bIDLength; - fseek(pFile, DataStart, SEEK_SET); - DataSize = (pHead->CMapBPP * NCols) / 8; - pBuf = new BYTE[DataSize]; - if(fread(pBuf, 1, DataSize, pFile) != DataSize) - { - delete [] pBuf; - return LI_FileError; - } - - pImg = new Image8; - pImg->SetNumColors(NCols); - pPal = pImg->GetPalette(); - pSrc = pBuf; - - switch(pHead->CMapBPP) - { - case 24: - for(c=0; cSetSize(XSize, YSize); - DataSize = XSize * YSize; - pBuf = new BYTE[DataSize]; - - if(fread(pBuf, 1, DataSize, pFile) != DataSize) - { - delete [] pBuf; - delete pImg; - return LI_FileError; - } - - if(pHead->bImgDescription & OriginMask) - { - YStart = 0; - YDelta = XSize; - } - else - { - YStart = pHead->Height-1; - YDelta = -XSize; - } - - pSrc = pBuf; - pPix = pImg->GetPixels() + (XSize * YStart); - for(y=0; ybIDLength; - fseek(pFile, DataStart, SEEK_SET); - - XSize = pHead->Width; - YSize = pHead->Height; - DataSize = XSize * YSize * 3; - pBuf = new BYTE[DataSize]; - - if(fread(pBuf, 1, DataSize, pFile) != DataSize) - { - delete [] pBuf; - return LI_FileError; - } - - if(pHead->bImgDescription & OriginMask) - { - YStart = 0; - YDelta = XSize; - } - else - { - YStart = pHead->Height-1; - YDelta = -XSize; - } - - pImg = new Image32; - pImg->SetSize(XSize, YSize); - - pSrc = pBuf; - pPix = pImg->GetPixels() + (XSize * YStart); - for(y=0; ybImgDescription & AlphaMask; - - if(AlphaBits != 8 && AlphaBits != 0) - return LI_UnsupportedFormat; - - DataStart = sizeof(TGAHeader) + pHead->bIDLength; - fseek(pFile, DataStart, SEEK_SET); - - XSize = pHead->Width; - YSize = pHead->Height; - DataSize = XSize * YSize * 4; - pBuf = new BYTE[DataSize]; - - if(fread(pBuf, 1, DataSize, pFile) != DataSize) - { - delete [] pBuf; - return LI_FileError; - } - - if(pHead->bImgDescription & OriginMask) - { - YStart = 0; - YDelta = XSize; - bTopDown = true; - } - else - { - YStart = pHead->Height-1; - YDelta = -XSize; - bTopDown = false; - } - - pImg = new Image32; - pImg->SetSize(XSize, YSize); - - pSrc = pBuf; - pPix = pImg->GetPixels() + (XSize * YStart); - for(y=0; yCMapBPP != 24 && pHead->CMapBPP != 32) +// return LI_UnsupportedFormat; +// +// XSize = pHead->Width; +// YSize = pHead->Height; +// NCols = pHead->CMapLength; +// +// DataStart = sizeof(TGAHeader) + pHead->bIDLength; +// fseek(pFile, DataStart, SEEK_SET); +// DataSize = (pHead->CMapBPP * NCols) / 8; +// pBuf = new BYTE[DataSize]; +// if(fread(pBuf, 1, DataSize, pFile) != DataSize) +// { +// delete [] pBuf; +// return LI_FileError; +// } +// +// pImg = new Image8; +// pImg->SetNumColors(NCols); +// pPal = pImg->GetPalette(); +// pSrc = pBuf; +// +// switch(pHead->CMapBPP) +// { +// case 24: +// for(c=0; cSetSize(XSize, YSize); +// DataSize = XSize * YSize; +// pBuf = new BYTE[DataSize]; +// +// if(fread(pBuf, 1, DataSize, pFile) != DataSize) +// { +// delete [] pBuf; +// delete pImg; +// return LI_FileError; +// } +// +// if(pHead->bImgDescription & OriginMask) +// { +// YStart = 0; +// YDelta = XSize; +// } +// else +// { +// YStart = pHead->Height-1; +// YDelta = -XSize; +// } +// +// pSrc = pBuf; +// pPix = pImg->GetPixels() + (XSize * YStart); +// for(y=0; ybIDLength; +// fseek(pFile, DataStart, SEEK_SET); +// +// XSize = pHead->Width; +// YSize = pHead->Height; +// DataSize = XSize * YSize * 3; +// pBuf = new BYTE[DataSize]; +// +// if(fread(pBuf, 1, DataSize, pFile) != DataSize) +// { +// delete [] pBuf; +// return LI_FileError; +// } +// +// if(pHead->bImgDescription & OriginMask) +// { +// YStart = 0; +// YDelta = XSize; +// } +// else +// { +// YStart = pHead->Height-1; +// YDelta = -XSize; +// } +// +// pImg = new Image32; +// pImg->SetSize(XSize, YSize); +// +// pSrc = pBuf; +// pPix = pImg->GetPixels() + (XSize * YStart); +// for(y=0; ybImgDescription & AlphaMask; +// +// if(AlphaBits != 8 && AlphaBits != 0) +// return LI_UnsupportedFormat; +// +// DataStart = sizeof(TGAHeader) + pHead->bIDLength; +// fseek(pFile, DataStart, SEEK_SET); +// +// XSize = pHead->Width; +// YSize = pHead->Height; +// DataSize = XSize * YSize * 4; +// pBuf = new BYTE[DataSize]; +// +// if(fread(pBuf, 1, DataSize, pFile) != DataSize) +// { +// delete [] pBuf; +// return LI_FileError; +// } +// +// if(pHead->bImgDescription & OriginMask) +// { +// YStart = 0; +// YDelta = XSize; +// bTopDown = true; +// } +// else +// { +// YStart = pHead->Height-1; +// YDelta = -XSize; +// bTopDown = false; +// } +// +// pImg = new Image32; +// pImg->SetSize(XSize, YSize); +// +// pSrc = pBuf; +// pPix = pImg->GetPixels() + (XSize * YStart); +// for(y=0; yGetXSize() - 1) & pImg->GetXSize()) != pImg->GetXSize() || - (~(pImg->GetYSize() - 1) & pImg->GetYSize()) != pImg->GetYSize() ) - { - ErrVal = Err_NotPowerOfTwo; - return false; - } - - // Convert the input image to a 32 bit image if it isn't already - if(pImg->GetType() == Type_32Bit) // Straight 32 bit - pImg32 = (Image32 *)pImg; - else - { - Img32 = *pImg; - pImg32 = &Img32; // Convert to 32 bit - } - - - // Floyd/Steinberg (modified) error diffusion - pImg32->DiffuseError(8, 5, 6, 5); - - // Build the DXTC texture - dxtc.FromImage32( pImg32, DC_None ); // Auto-format (DXT1 / DXT3) - - XSize = pImg32->GetXSize(); - YSize = pImg32->GetYSize(); - - // Save it to a file - dwSize = XSize * YSize / 2; - if(WriteFile(hFile, dxtc.GetBlocks(), dwSize, &dwWritten, 0) == FALSE || dwWritten != dwSize) - { - ErrVal = Err_ErrorWritingOutputFile; - bResult = false; - } - - return bResult; -} +//bool ConvertImage(char *pFilename) +//{ +//long lResult; +//bool bResult = true; +//Image *pImg; +//Image32 Img32, *pImg32; +// +// +// // Load the source image and return it via pImg +// lResult = LoadImageFrom(pFilename, &pImg); +// if(lResult != 0) +// { +// if(lResult == LI_UnsupportedFormat || lResult == LI_UnknownType) +// ErrVal = Err_UnsupportedFormat; +// else +// ErrVal = Err_ErrorLoadingImage; +// return false; +// } +// +// // Optional - You can just make this a multiple of 4 check +// if( (~(pImg->GetXSize() - 1) & pImg->GetXSize()) != pImg->GetXSize() || +// (~(pImg->GetYSize() - 1) & pImg->GetYSize()) != pImg->GetYSize() ) +// { +// ErrVal = Err_NotPowerOfTwo; +// return false; +// } +// +// // Convert the input image to a 32 bit image if it isn't already +// if(pImg->GetType() == Type_32Bit) // Straight 32 bit +// pImg32 = (Image32 *)pImg; +// else +// { +// Img32 = *pImg; +// pImg32 = &Img32; // Convert to 32 bit +// } +// +// +// // Floyd/Steinberg (modified) error diffusion +// pImg32->DiffuseError(8, 5, 6, 5); +// +// // Build the DXTC texture +// dxtc.FromImage32( pImg32, DC_None ); // Auto-format (DXT1 / DXT3) +// +// XSize = pImg32->GetXSize(); +// YSize = pImg32->GetYSize(); +// +// // Save it to a file +// dwSize = XSize * YSize / 2; +// if(WriteFile(hFile, dxtc.GetBlocks(), dwSize, &dwWritten, 0) == FALSE || dwWritten != dwSize) +// { +// ErrVal = Err_ErrorWritingOutputFile; +// bResult = false; +// } +// +// return bResult; +//} diff --git a/xCore/Auxiliary/Bitmap/CMakeLists.txt b/xCore/Auxiliary/Bitmap/CMakeLists.txt new file mode 100644 index 0000000..b9f40cc --- /dev/null +++ b/xCore/Auxiliary/Bitmap/CMakeLists.txt @@ -0,0 +1,7 @@ +file(GLOB BITMAP_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +add_library(aux_Bitmap STATIC ${BITMAP_SRC}) +set_xcore_defaults(aux_Bitmap) \ No newline at end of file diff --git a/xCore/Auxiliary/Bitmap/aux_Compress.cpp b/xCore/Auxiliary/Bitmap/aux_Compress.cpp index c6cd3ad..457b29c 100644 --- a/xCore/Auxiliary/Bitmap/aux_Compress.cpp +++ b/xCore/Auxiliary/Bitmap/aux_Compress.cpp @@ -22,9 +22,9 @@ # if _MSC_VER >= 1300 # define WIN32_LEAN_AND_MEAN # ifdef TARGET_PC -# include -# include -# include +//# include +//# include +//# include # endif # endif #else @@ -118,6 +118,7 @@ static AlphaType GetAlphaUsage( xbitmap& Source ) static void PackImage( xbitmap& Dest,const xbitmap& Source,xbool bForceMips,DXTCMethod Method ) { +#if 0 #ifndef TARGET_PC (void)bForceMips; (void)Method; @@ -415,6 +416,7 @@ static void PackImage( xbitmap& Dest,const xbitmap& Source,xbool bForceMips,DXTC H >>= 1; } +#endif #endif } diff --git a/xCore/Auxiliary/CMakeLists.txt b/xCore/Auxiliary/CMakeLists.txt new file mode 100644 index 0000000..4be6dd8 --- /dev/null +++ b/xCore/Auxiliary/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(Bitmap) +add_subdirectory(fx_RunTime) +add_subdirectory(MiscUtils) \ No newline at end of file diff --git a/xCore/Auxiliary/MiscUtils/CMakeLists.txt b/xCore/Auxiliary/MiscUtils/CMakeLists.txt new file mode 100644 index 0000000..e2df4c1 --- /dev/null +++ b/xCore/Auxiliary/MiscUtils/CMakeLists.txt @@ -0,0 +1,9 @@ +file(GLOB MISCUTILS_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +add_library(MiscUtils STATIC ${MISCUTILS_SRC}) +set_xcore_defaults(MiscUtils) +target_include_directories(MiscUtils PRIVATE "${CMAKE_SOURCE_DIR}/Support") +target_link_libraries(MiscUtils Entropy) \ No newline at end of file diff --git a/MiscUtils/CombatAimer.cpp b/xCore/Auxiliary/MiscUtils/CombatAimer.cpp similarity index 100% rename from MiscUtils/CombatAimer.cpp rename to xCore/Auxiliary/MiscUtils/CombatAimer.cpp diff --git a/MiscUtils/CombatAimer.hpp b/xCore/Auxiliary/MiscUtils/CombatAimer.hpp similarity index 100% rename from MiscUtils/CombatAimer.hpp rename to xCore/Auxiliary/MiscUtils/CombatAimer.hpp diff --git a/MiscUtils/PriorityQueue.hpp b/xCore/Auxiliary/MiscUtils/PriorityQueue.hpp similarity index 100% rename from MiscUtils/PriorityQueue.hpp rename to xCore/Auxiliary/MiscUtils/PriorityQueue.hpp diff --git a/MiscUtils/SimpleUtils.cpp b/xCore/Auxiliary/MiscUtils/SimpleUtils.cpp similarity index 100% rename from MiscUtils/SimpleUtils.cpp rename to xCore/Auxiliary/MiscUtils/SimpleUtils.cpp diff --git a/MiscUtils/SimpleUtils.hpp b/xCore/Auxiliary/MiscUtils/SimpleUtils.hpp similarity index 99% rename from MiscUtils/SimpleUtils.hpp rename to xCore/Auxiliary/MiscUtils/SimpleUtils.hpp index 983a2ad..118b3f1 100644 --- a/MiscUtils/SimpleUtils.hpp +++ b/xCore/Auxiliary/MiscUtils/SimpleUtils.hpp @@ -5,7 +5,7 @@ #include #include -#include "Objects\Object.hpp" +#include "..\..\..\Support\Objects\Object.hpp" #include "..\auxiliary\miscutils\property.hpp" #include "..\auxiliary\miscutils\PropertyEnum.hpp" #include "..\support\Characters\AlertPackage.hpp" diff --git a/MiscUtils/TrajectoryGenerator.cpp b/xCore/Auxiliary/MiscUtils/TrajectoryGenerator.cpp similarity index 100% rename from MiscUtils/TrajectoryGenerator.cpp rename to xCore/Auxiliary/MiscUtils/TrajectoryGenerator.cpp diff --git a/MiscUtils/TrajectoryGenerator.hpp b/xCore/Auxiliary/MiscUtils/TrajectoryGenerator.hpp similarity index 100% rename from MiscUtils/TrajectoryGenerator.hpp rename to xCore/Auxiliary/MiscUtils/TrajectoryGenerator.hpp diff --git a/xCore/Auxiliary/fx_RunTime/CMakeLists.txt b/xCore/Auxiliary/fx_RunTime/CMakeLists.txt new file mode 100644 index 0000000..89f31b8 --- /dev/null +++ b/xCore/Auxiliary/fx_RunTime/CMakeLists.txt @@ -0,0 +1,9 @@ +file(GLOB FX_RUNTIME_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +add_library(fx_RunTime STATIC ${FX_RUNTIME_SRC}) +set_xcore_defaults(fx_RunTime) +target_include_directories(fx_RunTime PRIVATE "${CMAKE_SOURCE_DIR}/Support") +target_link_libraries(fx_RunTime Entropy) \ No newline at end of file diff --git a/xCore/CMakeLists.txt b/xCore/CMakeLists.txt new file mode 100644 index 0000000..49a5f7e --- /dev/null +++ b/xCore/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(x_files) +add_subdirectory(Parsing) +add_subdirectory(Entropy) +add_subdirectory(Auxiliary) \ No newline at end of file diff --git a/xCore/Entropy/Audio/audio_mp3_mgr.cpp b/xCore/Entropy/Audio/audio_mp3_mgr.cpp index bee7538..bb90ec8 100644 --- a/xCore/Entropy/Audio/audio_mp3_mgr.cpp +++ b/xCore/Entropy/Audio/audio_mp3_mgr.cpp @@ -6,6 +6,8 @@ #include "x_bytestream.hpp" #include "x_log.hpp" +// #TODO: Rebuild Miles MP3 coder or replace with liblame + //------------------------------------------------------------------------------ #define VALID_STREAM( pStream ) ((pStream >= &g_AudioStreamMgr.m_AudioStreams[0]) && (pStream <= &g_AudioStreamMgr.m_AudioStreams[MAX_AUDIO_STREAMS-1])) @@ -125,7 +127,7 @@ audio_mp3_mgr::~audio_mp3_mgr( void ) void audio_mp3_mgr::Init( void ) { ASSERT( s_Initialized == FALSE ); - ASI_startup(); + // ASI_startup(); s_Initialized = TRUE; } @@ -134,7 +136,7 @@ void audio_mp3_mgr::Init( void ) void audio_mp3_mgr::Kill( void ) { ASSERT( s_Initialized ); - ASI_shutdown(); + // ASI_shutdown(); s_Initialized = FALSE; } @@ -145,7 +147,7 @@ void audio_mp3_mgr::Open( audio_stream* pStream ) ASSERT( s_Initialized ); ASSERT( VALID_STREAM(pStream) ); pStream->CursorMP3 = 0; - pStream->HandleMP3 = (void*)ASI_stream_open( (U32)pStream, mp3_fetch_data, pStream->Samples[0].Sample.WaveformLength ); + // pStream->HandleMP3 = (void*)ASI_stream_open( (U32)pStream, mp3_fetch_data, pStream->Samples[0].Sample.WaveformLength ); } //------------------------------------------------------------------------------ @@ -155,8 +157,8 @@ void audio_mp3_mgr::Close( audio_stream* pStream ) ASSERT( s_Initialized ); ASSERT( VALID_STREAM(pStream) ); - if( pStream->HandleMP3 ) - ASI_stream_close( (s32)pStream->HandleMP3 ); + // if( pStream->HandleMP3 ) + // ASI_stream_close( (s32)pStream->HandleMP3 ); pStream->HandleMP3 = NULL; } @@ -208,7 +210,7 @@ void audio_mp3_mgr::Decode( audio_stream* pStream, s16* pBufferL, s16* pBufferR, } // Decode it. - ASI_stream_process( (s32)pStream->HandleMP3, pDest, nBytes ); + // ASI_stream_process( (s32)pStream->HandleMP3, pDest, nBytes ); // Need to "un-interleave"? if( bIsStereo ) diff --git a/xCore/Entropy/CMakeLists.txt b/xCore/Entropy/CMakeLists.txt new file mode 100644 index 0000000..4bff633 --- /dev/null +++ b/xCore/Entropy/CMakeLists.txt @@ -0,0 +1,101 @@ +set(ENTROPY_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +file(GLOB ENTROPY_SRC + "${ENTROPY_PATH}/*.cpp" + "${ENTROPY_PATH}/*.hpp" +) + +# Common +file(GLOB ENTROPY_COMMON_SRC + "${ENTROPY_PATH}/Common/*.cpp" + "${ENTROPY_PATH}/Common/*.hpp" +) + +# Audio +file(GLOB ENTROPY_AUDIO_SRC + "${ENTROPY_PATH}/Audio/*.cpp" + "${ENTROPY_PATH}/Audio/*.hpp" +) + +# Audio Hardware (PC) +set(ENTROPY_AUDIO_HARDWARE_SRC + "${ENTROPY_PATH}/Audio/Hardware/audio_hardware_pc.cpp" + "${ENTROPY_PATH}/Audio/Hardware/audio_stream_pc.cpp" +) + +# Audio IAL +file(GLOB ENTROPY_AUDIO_IAL_SRC + "${ENTROPY_PATH}/Audio/IAL/*.cpp" + "${ENTROPY_PATH}/Audio/IAL/*.hpp" +) + +# Direct3D Engine +file(GLOB ENTROPY_D3DENGINE_SRC + "${ENTROPY_PATH}/D3DEngine/*.cpp" + "${ENTROPY_PATH}/D3DEngine/*.hpp" +) + +# IOManager +set(ENTROPY_IOMANAGER_SRC + "${ENTROPY_PATH}/IOManager/io_cache.cpp" + "${ENTROPY_PATH}/IOManager/io_cache.hpp" + "${ENTROPY_PATH}/IOManager/io_device.cpp" + "${ENTROPY_PATH}/IOManager/io_device.hpp" + #"${ENTROPY_PATH}/IOManager/io_device_pc.cpp" + "${ENTROPY_PATH}/IOManager/io_dfs.cpp" + "${ENTROPY_PATH}/IOManager/io_dfs.hpp" + "${ENTROPY_PATH}/IOManager/io_filesystem.cpp" + "${ENTROPY_PATH}/IOManager/io_filesystem.hpp" + "${ENTROPY_PATH}/IOManager/io_header.hpp" + "${ENTROPY_PATH}/IOManager/io_mgr.cpp" + "${ENTROPY_PATH}/IOManager/io_mgr.hpp" + "${ENTROPY_PATH}/IOManager/io_request.cpp" + "${ENTROPY_PATH}/IOManager/io_request.hpp" + "${ENTROPY_PATH}/IOManager/io_stdio.cpp" + "${ENTROPY_PATH}/IOManager/io_stdio.hpp" +) + +# IOManager - Device DVD (PC) +set(ENTROPY_IOMANAGER_DEVICE_DVD_SRC + "${ENTROPY_PATH}/IOManager/Device_DVD/io_device_dvd.cpp" + "${ENTROPY_PATH}/IOManager/Device_DVD/io_device_dvd.hpp" + "${ENTROPY_PATH}/IOManager/Device_DVD/io_device_dvd_pc.cpp" +) + +# MemCard +set(ENTROPY_MEMCARD_SRC + "${ENTROPY_PATH}/MemCard/memcard.cpp" + #"${ENTROPY_PATH}/MemCard/memcard_pc.cpp" + "${ENTROPY_PATH}/MemCard/memcard_stub.cpp" +) + +# Network +file(GLOB ENTROPY_NETWORK_SRC + "${ENTROPY_PATH}/Network/*.cpp" + "${ENTROPY_PATH}/Network/*.hpp" +) + +# Network PC +file(GLOB ENTROPY_NETWORK_PC_SRC + "${ENTROPY_PATH}/Network/PC/*.cpp" + "${ENTROPY_PATH}/Network/PC/*.hpp" +) + +add_library(Entropy STATIC ${ENTROPY_SRC} + ${ENTROPY_COMMON_SRC} + ${ENTROPY_AUDIO_SRC} + ${ENTROPY_AUDIO_HARDWARE_SRC} + ${ENTROPY_AUDIO_IAL_SRC} + ${ENTROPY_D3DENGINE_SRC} + ${ENTROPY_IOMANAGER_SRC} + ${ENTROPY_IOMANAGER_DEVICE_DVD_SRC} + ${ENTROPY_MEMCARD_SRC} + ${ENTROPY_NETWORK_SRC} + ${ENTROPY_NETWORK_PC_SRC} + ) + + +target_include_directories(Entropy PUBLIC "${ENTROPY_PATH}" PUBLIC "${ENTROPY_PATH}/Audio" ) +set_xcore_defaults(Entropy) + +target_link_libraries(Entropy x_files) \ No newline at end of file diff --git a/xCore/Entropy/D3DEngine/d3deng.cpp b/xCore/Entropy/D3DEngine/d3deng.cpp index 737bde1..33d16b4 100644 --- a/xCore/Entropy/D3DEngine/d3deng.cpp +++ b/xCore/Entropy/D3DEngine/d3deng.cpp @@ -16,6 +16,8 @@ #pragma comment( lib, "winmm" ) // Auto include DirectX libs in a .NET build +// #NOTE: Moved to the CMake script of GameApp. +#if 0 #if _MSC_VER >= 1300 #ifdef CONFIG_DEBUG #pragma comment( lib, "dsound.lib" ) @@ -31,6 +33,7 @@ #pragma comment( lib, "dinput8.lib" ) #endif #endif +#endif /////////////////////////////////////////////////////////////////////////// // MAKE SUER THAT WE HAVE THE RIGHT VERSION diff --git a/xCore/Entropy/D3DEngine/d3deng_vram.cpp b/xCore/Entropy/D3DEngine/d3deng_vram.cpp index acff0c5..c271dfc 100644 --- a/xCore/Entropy/D3DEngine/d3deng_vram.cpp +++ b/xCore/Entropy/D3DEngine/d3deng_vram.cpp @@ -41,7 +41,10 @@ void vram_Init( void ) // // Initialize the empty list // - for( s32 i=0; i& FileList ) +s32 memcard_hardware::GetFileList( xarray& FileList ) { (void) FileList; return 0; @@ -79,6 +88,11 @@ void memcard_hardware::InvalidateFileList( void ) { } +memcard_error memcard_hardware::GetCardStatus(s32 CardId) +{ + return MEMCARD_FATAL_ERROR; +} + //------------------------------------------------------------------------------ void memcard_hardware::Process( void ) diff --git a/xCore/Entropy/Network/PC/NetLib.cpp b/xCore/Entropy/Network/PC/NetLib.cpp index f34996a..9a1a452 100644 --- a/xCore/Entropy/Network/PC/NetLib.cpp +++ b/xCore/Entropy/Network/PC/NetLib.cpp @@ -14,6 +14,9 @@ #pragma comment( lib, "ws2_32.lib" ) #endif +// Disable old winsock api warnings +#define _WINSOCK_DEPRECATED_NO_WARNINGS + #include #include diff --git a/xCore/Parsing/CMakeLists.txt b/xCore/Parsing/CMakeLists.txt new file mode 100644 index 0000000..307461d --- /dev/null +++ b/xCore/Parsing/CMakeLists.txt @@ -0,0 +1,7 @@ +file(GLOB PARSING_SRC + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +add_library(Parsing STATIC ${PARSING_SRC}) +set_xcore_defaults(Parsing) \ No newline at end of file diff --git a/xCore/x_files/CMakeLists.txt b/xCore/x_files/CMakeLists.txt new file mode 100644 index 0000000..69f9108 --- /dev/null +++ b/xCore/x_files/CMakeLists.txt @@ -0,0 +1,75 @@ +set(X_FILES_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +file(GLOB X_FILES_SRC + "${X_FILES_PATH}/*.cpp" + "${X_FILES_PATH}/*.hpp" +) + +set(X_FILES_IMPLEMENTATION_SRC +"${X_FILES_PATH}/Implementation/x_array_private.hpp" +"${X_FILES_PATH}/Implementation/x_bitmap.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_cmap.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_convert.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_dxtc.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_inline.hpp" +"${X_FILES_PATH}/Implementation/x_bitmap_io.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_quant.cpp" +"${X_FILES_PATH}/Implementation/x_bitmap_resize.cpp" +"${X_FILES_PATH}/Implementation/x_bitstream.cpp" +"${X_FILES_PATH}/Implementation/x_bytestream.cpp" +"${X_FILES_PATH}/Implementation/x_color_inline.hpp" +"${X_FILES_PATH}/Implementation/x_context.cpp" +"${X_FILES_PATH}/Implementation/x_debug.cpp" +"${X_FILES_PATH}/Implementation/x_files.cpp" +"${X_FILES_PATH}/Implementation/x_files_private.hpp" +"${X_FILES_PATH}/Implementation/x_flare.cpp" +"${X_FILES_PATH}/Implementation/x_locale.cpp" +"${X_FILES_PATH}/Implementation/x_log.cpp" +"${X_FILES_PATH}/Implementation/x_log_private.hpp" +"${X_FILES_PATH}/Implementation/x_malloc.cpp" +"${X_FILES_PATH}/Implementation/x_math.cpp" +"${X_FILES_PATH}/Implementation/x_math_basic.cpp" +"${X_FILES_PATH}/Implementation/x_math_bb_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_m4_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_misc.cpp" +"${X_FILES_PATH}/Implementation/x_math_p_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_q_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_r3_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_rect_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_sphere.cpp" +"${X_FILES_PATH}/Implementation/x_math_sph_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_v2_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_v3_inline.hpp" +"${X_FILES_PATH}/Implementation/x_math_v4_inline.hpp" +"${X_FILES_PATH}/Implementation/x_memfile.cpp" +"${X_FILES_PATH}/Implementation/x_memory.cpp" +"${X_FILES_PATH}/Implementation/x_memory_private.hpp" +"${X_FILES_PATH}/Implementation/x_mqueue.cpp" +"${X_FILES_PATH}/Implementation/x_mqueue_private.hpp" +"${X_FILES_PATH}/Implementation/x_mutex.cpp" +"${X_FILES_PATH}/Implementation/x_mutex_private.hpp" +"${X_FILES_PATH}/Implementation/x_plus.cpp" +#"${X_FILES_PATH}/Implementation/x_profile.cpp" +"${X_FILES_PATH}/Implementation/x_semaphore_private.hpp" +"${X_FILES_PATH}/Implementation/x_stdio.cpp" +"${X_FILES_PATH}/Implementation/x_stdio_private.hpp" +"${X_FILES_PATH}/Implementation/x_string.cpp" +"${X_FILES_PATH}/Implementation/x_string_inline.hpp" +"${X_FILES_PATH}/Implementation/x_threads.cpp" +"${X_FILES_PATH}/Implementation/x_threads_pc.cpp" +"${X_FILES_PATH}/Implementation/x_threads_private.hpp" +"${X_FILES_PATH}/Implementation/x_time.cpp" +"${X_FILES_PATH}/Implementation/x_tool.cpp" +"${X_FILES_PATH}/Implementation/x_tool_private.hpp" +"${X_FILES_PATH}/Implementation/x_vsprintf.cpp" +) + +# TODO: Remove to separated CMake script! +file(GLOB X_FILES_DXT_SRC + "${CMAKE_SOURCE_DIR}/xCore/3rdParty/DXTLibrary/*.cpp" + "${CMAKE_SOURCE_DIR}/xCore/3rdParty/DXTLibrary/*.h" +) + +add_library(x_files STATIC ${X_FILES_IMPLEMENTATION_SRC} ${X_FILES_SRC} ${X_FILES_DXT_SRC}) +set_xcore_defaults(x_files) diff --git a/xCore/x_files/Implementation/x_bitmap.cpp b/xCore/x_files/Implementation/x_bitmap.cpp index 176720e..0f25fb5 100644 --- a/xCore/x_files/Implementation/x_bitmap.cpp +++ b/xCore/x_files/Implementation/x_bitmap.cpp @@ -35,9 +35,9 @@ #ifdef TARGET_PC # if _MSC_VER >= 1300 # include -# include -# include -# pragma comment( lib, "xgraphics.lib" ) +//# include +//# include +//# pragma comment( lib, "xgraphics.lib" ) # endif #endif @@ -372,7 +372,7 @@ void xbitmap::XboxSwizzleData( void ) xbitmap Temp( *this ); for( s32 i=0;i>3 ); + GetFormatInfo().BPP>>3 );*/ } m_Flags |= FLAG_XBOX_DATA_SWIZZLED; *this = Temp; diff --git a/xCore/x_files/Implementation/x_bitmap_dxtc.cpp b/xCore/x_files/Implementation/x_bitmap_dxtc.cpp index 10d5652..0278c82 100644 --- a/xCore/x_files/Implementation/x_bitmap_dxtc.cpp +++ b/xCore/x_files/Implementation/x_bitmap_dxtc.cpp @@ -40,7 +40,8 @@ # include # include "..\..\3rdParty\Xbox\Include\D3d8.h" # include "..\..\3rdParty\Xbox\Include\XGraphics.h" -# pragma comment( lib, "xgraphics.lib" ) +//# pragma comment( lib, "xgraphics.lib" ) +//# pragma comment( lib, "..\\..\\3rdParty\\Xbox\\lib\\xgraphics.lib" ) # endif # endif #else