Skip to content

Commit

Permalink
fix: fix debuggermessages function signatures (#214)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikitalita
nikitalita authored Nov 1, 2023
1 parent 11cc7c2 commit cfe0069
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions CommonLibSF/include/RE/D/DebuggerMessages.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "RE/B/BSFixedString.h"
#include "RE/B/BSLog.h"

static_assert(sizeof(std::string) == 0x20); // If this fails, _ITERATOR_DEBUG_LEVEL is greater than 0
static_assert(sizeof(std::vector<int>) == 0x18);
Expand All @@ -24,8 +25,8 @@ namespace RE::GameScript

~ProtocolMessage() = default; // 00

virtual void Serialize(const Json::Value& a_val) = 0; // 01
virtual void HandleMessage(const RemoteDebugger& a_debugger); // 02
virtual void Serialize(const Json::Value& a_val) = 0; // 01
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger); // 02

int seq; // 08
std::uint32_t gap_C; // 0C
Expand All @@ -42,8 +43,8 @@ namespace RE::GameScript
virtual void Serialize(const Json::Value& a_val) override; // 01

// start Request
virtual void SerializeBody(Json::Value& r_val); // 03 - { r_val.Value(0); return; }
virtual void DeserializeArgs(const Json::Value& a_val); // 04
virtual void SerializeBody(Json::Value& r_val); // 03 - { r_val.Value(0); return; }
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger); // 04

// members
std::string command; // 30
Expand Down Expand Up @@ -95,8 +96,8 @@ namespace RE::GameScript
~SetBreakpointsRequest(); // 00

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val) override; // 04
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04

// members
std::string source; // 50
Expand All @@ -109,7 +110,7 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__ThreadsRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
};
static_assert(sizeof(ThreadsRequest) == 0x50);

Expand All @@ -118,8 +119,8 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__StepInRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02

virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04
// members
std::uint32_t threadId; // 50
};
Expand All @@ -130,8 +131,8 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__StepOutRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02

virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04
// members
std::uint32_t threadId; // 50
};
Expand All @@ -142,8 +143,8 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__NextRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02

virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04
// members
std::uint32_t threadId; // 50
};
Expand All @@ -154,7 +155,7 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__ContinueRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
};
static_assert(sizeof(ContinueRequest) == 0x50);

Expand All @@ -163,7 +164,7 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__PauseRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
};
static_assert(sizeof(PauseRequest) == 0x50);

Expand All @@ -172,7 +173,7 @@ namespace RE::GameScript
SF_RTTI_VTABLE(GameScript__DebuggerMessages__DisconnectRequest);

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
};
static_assert(sizeof(DisconnectRequest) == 0x50);

Expand All @@ -183,8 +184,8 @@ namespace RE::GameScript
~StackTraceRequest(); // 00

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val) override; // 04
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04

// members
int threadId;
Expand Down Expand Up @@ -223,8 +224,8 @@ namespace RE::GameScript
~ValueRequest(); // 00

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val) override; // 04
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04

// members
std::vector<std::string> path; // 50
Expand All @@ -239,8 +240,8 @@ namespace RE::GameScript
~VariablesRequest(); // 00

// override Request
virtual void HandleMessage(const RemoteDebugger& a_debugger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val) override; // 04
virtual void HandleMessage(const RemoteDebugger& a_debugger, const BSLog& logger) override; // 02
virtual void DeserializeArgs(const Json::Value& a_val, const BSLog& logger) override; // 04

// members
std::vector<std::string> path; // 50
Expand Down

0 comments on commit cfe0069

Please sign in to comment.