Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
9 changes: 9 additions & 0 deletions src/Engine/CameraEngineZoneColl_Z.cpp
Original file line number Diff line number Diff line change
@@ -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;
}
27 changes: 20 additions & 7 deletions src/Engine/GameManagerCmd_Z.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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)");
Expand All @@ -36,19 +42,19 @@ Extern_Z void RegisterGameMgrCommand() {
}

Bool SetMultiGame() {
return TRUE;
SetGame(false);
}

Bool SetMonoGame() {
return TRUE;
SetGame(true);
}

Bool SetGame(Bool i_IsMono) {
return TRUE;
}

Bool AddGamePlayer() {
return TRUE;
return AddPlayer(false);
}

Bool AddMenuPlayer() {
Expand All @@ -60,11 +66,11 @@ Bool AddPlayer(Bool i_IsMenu) {
}

Bool RemoveGamePlayer() {
return TRUE;
return TRUE;
}

Bool ActivateGamePlayer() {
return TRUE;
return TRUE;
}

Bool DeactivateGamePlayer() {
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -168,9 +179,11 @@ Bool ReadParameters() {
}

Bool MarkMemory() {
s_MarkMem(1);
return TRUE;
}

Bool ShowUnmarkedMemory() {
s_ShowUnMarkedMem();
return TRUE;
}
18 changes: 18 additions & 0 deletions src/Engine/includes/CameraEngineZoneColl_Z.h
Original file line number Diff line number Diff line change
@@ -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_
3 changes: 3 additions & 0 deletions src/Engine/includes/SetLanguage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@


int SetLanguage(int, int, int);
Loading