Backups/EGameTools
1
0
Fork 0
mirror of https://github.com/EricPlayZ/EGameTools.git synced 2025-07-18 17:37:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed some player variables issues, implemented camera teleportation

Browse Source
This commit is contained in:
EricPlayZ
2024-05-11 20:27:35 +03:00
parent dae6072423
commit f50c883efc
5 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
EGameTools/source/game/Engine/CBaseCamera.cpp
View File

@ -46,4 +46,16 @@ namespace Engine {
return nullptr; return nullptr;
} }
} }
void CBaseCamera::SetPosition(const Vector3* pos) {
__try {
void* (*pSetPosition)(LPVOID pCBaseCamera, const Vector3* pos) = (decltype(pSetPosition))Utils::Memory::GetProcAddr("engine_x64_rwdi.dll", "?SetPosition@IBaseCamera@@QEAAXAEBVvec3@@@Z");
if (!pSetPosition)
return;
pSetPosition(this, pos);
} __except (EXCEPTION_EXECUTE_HANDLER) {
return;
}
}
} }

2
EGameTools/source/game/Engine/CBaseCamera.h
View File

@ -15,5 +15,7 @@ namespace Engine {
Vector3* GetUpVector(Vector3* outUpVec); Vector3* GetUpVector(Vector3* outUpVec);
Vector3* GetLeftVector(Vector3* outLeftVec); Vector3* GetLeftVector(Vector3* outLeftVec);
Vector3* GetPosition(Vector3* outPos); Vector3* GetPosition(Vector3* outPos);
void SetPosition(const Vector3* pos);
}; };
} }

3
EGameTools/source/game/GamePH/PlayerVariables.cpp
View File

@ -203,6 +203,9 @@ namespace GamePH {
} }
#pragma endregion #pragma endregion
std::unordered_map<std::string, std::any> PlayerVariables::prevPlayerVarValueMap{};
std::unordered_map<std::string, bool> PlayerVariables::prevOptionValueMap{};
PlayerVariables* PlayerVariables::Get() { PlayerVariables* PlayerVariables::Get() {
__try { __try {
PlayerState* pPlayerState = PlayerState::Get(); PlayerState* pPlayerState = PlayerState::Get();

8
EGameTools/source/game/GamePH/PlayerVariables.h
View File

@ -81,13 +81,13 @@ namespace GamePH {
*(varValue + 1) = value; *(varValue + 1) = value;
} }
} }
static std::unordered_map<std::string, std::any> prevPlayerVarValueMap;
static std::unordered_map<std::string, bool> prevOptionValueMap;
template <typename T> static void ManagePlayerVarOption(const std::string& playerVar, const T valueIfTrue, const T valueIfFalse, Option* option, const bool& usePreviousVal = true) { template <typename T> static void ManagePlayerVarOption(const std::string& playerVar, const T valueIfTrue, const T valueIfFalse, Option* option, const bool& usePreviousVal = true) {
if (!gotPlayerVars) if (!gotPlayerVars)
return; return;
static std::unordered_map<std::string, T> prevPlayerVarValueMap;
static std::unordered_map<std::string, bool> prevOptionValueMap;
if (prevPlayerVarValueMap.find(playerVar) == prevPlayerVarValueMap.end()) if (prevPlayerVarValueMap.find(playerVar) == prevPlayerVarValueMap.end())
prevPlayerVarValueMap[playerVar] = GamePH::PlayerVariables::GetPlayerVar<T>(playerVar); prevPlayerVarValueMap[playerVar] = GamePH::PlayerVariables::GetPlayerVar<T>(playerVar);
if (prevOptionValueMap.find(playerVar) == prevOptionValueMap.end()) if (prevOptionValueMap.find(playerVar) == prevOptionValueMap.end())
@ -101,7 +101,7 @@ namespace GamePH {
prevOptionValueMap[playerVar] = true; prevOptionValueMap[playerVar] = true;
} else if (prevOptionValueMap[playerVar]) { } else if (prevOptionValueMap[playerVar]) {
prevOptionValueMap[playerVar] = false; prevOptionValueMap[playerVar] = false;
GamePH::PlayerVariables::ChangePlayerVar(playerVar, usePreviousVal ? prevPlayerVarValueMap[playerVar] : valueIfFalse); GamePH::PlayerVariables::ChangePlayerVar(playerVar, usePreviousVal ? std::any_cast<T>(prevPlayerVarValueMap[playerVar]) : valueIfFalse);
} }
} }

22
EGameTools/source/menu/teleport.cpp
View File

@ -140,27 +140,23 @@ namespace Menu {
Engine::CBulletPhysicsCharacter* playerCharacter = Engine::CBulletPhysicsCharacter::Get(); Engine::CBulletPhysicsCharacter* playerCharacter = Engine::CBulletPhysicsCharacter::Get();
if (Player::freezePlayer.GetValue()) { if (Camera::freeCam.GetValue()) {
if (!playerCharacter)
return false;
playerCharacter->posBeforeFreeze = pos;
playerCharacter->MoveCharacter(pos);
} else if (Camera::freeCam.GetValue()) {
GamePH::FreeCamera* freeCam = GamePH::FreeCamera::Get(); GamePH::FreeCamera* freeCam = GamePH::FreeCamera::Get();
if (!freeCam) if (!freeCam)
return false; return false;
Vector3 camPos{}; freeCam->SetPosition(&pos);
freeCam->GetPosition(&camPos); if (playerCharacter) {
if (camPos.isDefault()) if (Player::freezePlayer.GetValue())
return false; playerCharacter->posBeforeFreeze = pos;
playerCharacter->MoveCharacter(pos);
// need to implement camera teleportation here :( }
} else { } else {
if (!playerCharacter) if (!playerCharacter)
return false; return false;
if (Player::freezePlayer.GetValue())
playerCharacter->posBeforeFreeze = pos;
playerCharacter->MoveCharacter(pos); playerCharacter->MoveCharacter(pos);
} }