kelson8/CheatMenuSA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug with teleporter

Browse Source
This commit is contained in:
Grinch_ 2021-02-15 14:49:01 +06:00
parent 4a5e5c6c9d
commit 61786f34a3
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Game.cpp
View File

@ -207,6 +207,7 @@ void SetPlayerMission(std::string& rootkey, std::string& name, std::string& id)
int interior = 0; int interior = 0;
Command<0x09E8>(hplayer,&interior); Command<0x09E8>(hplayer,&interior);
if ( Util::IsOnMission() && interior == 0) if ( Util::IsOnMission() && interior == 0)
{ {
player->SetWantedLevel(0); player->SetWantedLevel(0);

2
src/MenuInfo.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#define MENU_NAME "Cheat Menu" #define MENU_NAME "Cheat Menu"
#define MENU_VERSION "2.6-beta" #define MENU_VERSION "2.6-beta"
#define BUILD_NUMBER "20210210" #define BUILD_NUMBER "20210215"
#define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")" #define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")"

13
src/Teleport.cpp
View File

@ -71,15 +71,16 @@ Teleport::Teleport()
CEntity* player_entity = FindPlayerEntity(-1); CEntity* player_entity = FindPlayerEntity(-1);
STeleport::pos.z = CWorld::FindGroundZFor3DCoord(Teleport::STeleport::pos.x, Teleport::STeleport::pos.y, STeleport::pos.z + 100.0f, 0, &player_entity) + 1.0f; STeleport::pos.z = CWorld::FindGroundZFor3DCoord(Teleport::STeleport::pos.x, Teleport::STeleport::pos.y, STeleport::pos.z + 100.0f, 0, &player_entity) + 1.0f;
CVehicle *pVeh = player->m_pVehicle;
if (player->m_pVehicle) if (pVeh && player->m_nPedFlags.bInVehicle)
player->m_pVehicle->Teleport(STeleport::pos, false); pVeh->Teleport(STeleport::pos, false);
else else
player->Teleport(STeleport::pos, false); player->Teleport(STeleport::pos, false);
STeleport::_bool = false; STeleport::_bool = false;
Command<Commands::FREEZE_CHAR_POSITION_AND_DONT_LOAD_COLLISION>(CPools::GetPedRef(player), false); Command<Commands::FREEZE_CHAR_POSITION_AND_DONT_LOAD_COLLISION>(CPools::GetPedRef(player), false);
Command<Commands::SET_CAMERA_BEHIND_PLAYER>(); Command<Commands::RESTORE_CAMERA_JUMPCUT>();
TheCamera.Fade(0,1); TheCamera.Fade(0,1);
} }
@ -124,8 +125,8 @@ void Teleport::TeleportPlayer(bool get_marker, CVector* pos, short interior_id)
CStreaming::LoadScene(&Teleport::STeleport::pos); CStreaming::LoadScene(&Teleport::STeleport::pos);
CStreaming::LoadSceneCollision(&Teleport::STeleport::pos); CStreaming::LoadSceneCollision(&Teleport::STeleport::pos);
CStreaming::LoadAllRequestedModels(false); CStreaming::LoadAllRequestedModels(false);
if (pVeh) if (pVeh && player->m_nPedFlags.bInVehicle)
{ {
pVeh->Teleport(CVector(pos->x, pos->y, pos->z), false); pVeh->Teleport(CVector(pos->x, pos->y, pos->z), false);
@ -137,7 +138,7 @@ void Teleport::TeleportPlayer(bool get_marker, CVector* pos, short interior_id)
pVeh->m_nAreaCode = interior_id; pVeh->m_nAreaCode = interior_id;
} }
else else
player->Teleport(CVector(pos->x, pos->y, pos->z), false); player->Teleport(STeleport::pos, false);
player->m_nAreaCode = interior_id; player->m_nAreaCode = interior_id;
Command<Commands::SET_AREA_VISIBLE>(interior_id); Command<Commands::SET_AREA_VISIBLE>(interior_id);

2
src/Ui.cpp
View File

@ -826,7 +826,7 @@ bool Ui::HotKey(const char* label, HotKeyData& key_data)
if (!active) if (!active)
current_hotkey = label; current_hotkey = label;
if (active && (ImGui::IsMouseClicked(ImGuiMouseButton_Left) || ImGui::IsItemClicked(ImGuiMouseButton_Left))) if (active && (ImGui::IsMouseClicked(ImGuiMouseButton_Left) || ImGui::IsItemClicked(ImGuiMouseButton_Right)))
{ {
current_hotkey = ""; current_hotkey = "";
state = true; state = true;

23
tests/Test.cpp
View File

@ -1,16 +1,31 @@
#include "plugin.h" #include "plugin.h"
#include "CHud.h"
using namespace plugin; using namespace plugin;
void DoStuff();
class Test class Test
{ {
public: public:
Test() Test()
{ {
Events::initGameEvent += [] Events::processScriptsEvent += DoStuff;
{ }
patch::PutRetn0(0x4B35A4); ~Test()
}; {
Events::processScriptsEvent -= DoStuff;
} }
} test; } test;
void DoStuff()
{
CHud::SetMessage((char*)"Test");
if (KeyPressed(VK_TAB))
{
test.~Test();
}
}