diff --git a/configure.py b/configure.py index 1ff13eb..1e60d11 100755 --- a/configure.py +++ b/configure.py @@ -922,7 +922,7 @@ def MatchingFor(*versions): Object(NonMatching, "Engine/GameRtc_Z.cpp"), Object(NonMatching, "Engine/EmiterDraw_Z.cpp"), Object(Matching, "Engine/AnimationManagerSkel_Z.cpp"), - Object(NonMatching, "Engine/CameraEngineZoneColl_Z.cpp"), + Object(Matching, "Engine/CameraEngineZoneColl_Z.cpp"), Object(NonMatching, "Engine/Breakable_Z.cpp"), Object(NonMatching, "Engine/Material_Z.cpp"), Object(NonMatching, "Engine/ObjectsGameSkel_Z.cpp"), diff --git a/src/Engine/CameraEngineZoneColl_Z.cpp b/src/Engine/CameraEngineZoneColl_Z.cpp index e69de29..49ee197 100644 --- a/src/Engine/CameraEngineZoneColl_Z.cpp +++ b/src/Engine/CameraEngineZoneColl_Z.cpp @@ -0,0 +1,9 @@ +#include "CameraEngineZoneColl_Z.h" +Vec3f CameraEngineZone_Z::CameraGameColl( + World_Z *i_World, + Vec3f i_CamPos, + Vec3f i_CamTarget, + float i_DeltaTime) +{ + return i_CamPos; +} diff --git a/src/Engine/GameManagerCmd_Z.cpp b/src/Engine/GameManagerCmd_Z.cpp index ec648cc..b190a00 100644 --- a/src/Engine/GameManagerCmd_Z.cpp +++ b/src/Engine/GameManagerCmd_Z.cpp @@ -3,6 +3,12 @@ #include "Console_Z.h" #include "Parameters_Z.h" #include "DebugTools_Z.h" +#include "Memory_Z.h" +#include "ConsoleInterp_Z.h" +#include "Program_Z.h" +#include "Console_Z.h" +#include "StreamManager_Z.h" +#include "SetLanguage.h" Extern_Z void RegisterGameMgrCommand() { RegisterGameCommand(); @@ -15,7 +21,7 @@ Extern_Z void RegisterGameMgrCommand() { REGISTERCOMMANDC("SwitchGameToMUlti", SwitchGameToMulti, " WorldName NbVp"); REGISTERCOMMANDC("AddGamePlayer", AddGamePlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS) PlayerName [TeamId=0]"); REGISTERCOMMANDC("AddMenuPlayer", AddMenuPlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS) PlayerName [TeamId=0]"); - REGISTERCOMMANDC("ReMoveGamePlayer", RemoveGamePlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS)"); + REGISTERCOMMANDC("RemoveGamePlayer", RemoveGamePlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS)"); REGISTERCOMMANDC("REsetGame", ResetGame, " VpId(1-MAX_VIEWPORT)"); REGISTERCOMMANDC("DeactivateGamePlayer", DeactivateGamePlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS)"); REGISTERCOMMANDC("ACtivateGamePlayer", ActivateGamePlayer, " WorldName PlayerId(1-MAX_NUMBER_OF_PLAYERS)"); @@ -36,11 +42,11 @@ Extern_Z void RegisterGameMgrCommand() { } Bool SetMultiGame() { - return TRUE; + SetGame(false); } Bool SetMonoGame() { - return TRUE; + SetGame(true); } Bool SetGame(Bool i_IsMono) { @@ -48,7 +54,7 @@ Bool SetGame(Bool i_IsMono) { } Bool AddGamePlayer() { - return TRUE; + return AddPlayer(false); } Bool AddMenuPlayer() { @@ -60,11 +66,11 @@ Bool AddPlayer(Bool i_IsMenu) { } Bool RemoveGamePlayer() { - return TRUE; + return TRUE; } Bool ActivateGamePlayer() { - return TRUE; + return TRUE; } Bool DeactivateGamePlayer() { @@ -134,7 +140,12 @@ Bool AddTransText() { return TRUE; } -Bool SetLanguage() { +Bool SetLanguage() +{ + if (gData.Cons->GetNbParam() < 2) { + return TRUE; + } + SetLanguage((int)gData.Cons->GetParamFloat(1), -1, 0); return TRUE; } @@ -168,9 +179,11 @@ Bool ReadParameters() { } Bool MarkMemory() { + s_MarkMem(1); return TRUE; } Bool ShowUnmarkedMemory() { + s_ShowUnMarkedMem(); return TRUE; } diff --git a/src/Engine/includes/CameraEngineZoneColl_Z.h b/src/Engine/includes/CameraEngineZoneColl_Z.h index dc75a81..7f31cef 100644 --- a/src/Engine/includes/CameraEngineZoneColl_Z.h +++ b/src/Engine/includes/CameraEngineZoneColl_Z.h @@ -1,4 +1,22 @@ #ifndef _CAMERAENGINEZONECOLL_Z_H_ #define _CAMERAENGINEZONECOLL_Z_H_ #include "Types_Z.h" +#include "World_ZHdl.h" +#include "AnimationNode_Z.h" +#include "AnimationMesh_Z.h" +#include "AnimationMaterial_Z.h" +#include "AnimationMorph_Z.h" +#include "ResourceObject_Z.h" +#include "BoneNode_Z.h" + + +class CameraEngineZone_Z { +public: + Vec3f CameraGameColl( + World_Z *i_World, + Vec3f i_CamPos, + Vec3f i_CamTarget, + float i_DeltaTime + ); +}; #endif // _CAMERAENGINEZONECOLL_Z_H_ diff --git a/src/Engine/includes/SetLanguage.h b/src/Engine/includes/SetLanguage.h new file mode 100644 index 0000000..3188841 --- /dev/null +++ b/src/Engine/includes/SetLanguage.h @@ -0,0 +1,3 @@ + + + int SetLanguage(int, int, int);