Revert "Added INVOKE_CLASS_MEMBER"

This reverts commit 00c6a8a.
twist84 · Sep 11, 2023 · a64ad3e · a64ad3e
1 parent 8726a3e
commit a64ad3e
Show file tree

Hide file tree

Showing 25 changed files with 96 additions and 103 deletions.
diff --git a/game/source/cache/cache_files.cpp b/game/source/cache/cache_files.cpp
@@ -436,9 +436,9 @@ dword __cdecl compute_realtime_checksum(char* a1, int a2)
 	return INVOKE(0x00502300, compute_realtime_checksum, a1, a2);
 }
 
-void __thiscall s_cache_file_reports::load(s_cache_file_header* header)
+void __cdecl cache_file_load_reports(s_cache_file_reports* reports, s_cache_file_header* header)
 {
-	INVOKE_CLASS_MEMBER(0x00502500, s_cache_file_reports::load, header);
+	DECLFUNC(0x00502500, void, __thiscall, s_cache_file_reports*, s_cache_file_header*)(reports, header);
 }
 
 void __cdecl cache_file_tags_load_resource_gestalt_resource_offsets_from_disk(c_wrapped_array<long>* resource_offsets)
@@ -816,7 +816,7 @@ bool __cdecl scenario_tags_load(char const* scenario_path)
 
 		cache_file_load_tags_section();
 
-		g_cache_file_globals.reports.load(&g_cache_file_globals.header);
+		cache_file_load_reports(&g_cache_file_globals.reports, &g_cache_file_globals.header);
 		cache_file_tags_load_allocate();
 
 		dword total_instance_size = sizeof(cache_file_tag_instance*) * g_cache_file_globals.tag_total_count;

diff --git a/game/source/cache/cache_files.hpp b/game/source/cache/cache_files.hpp
@@ -166,15 +166,15 @@ struct s_file_reference_persist
 	tag signture;
 	word_flags flags;
 	short location;
-	c_static_string<108> path;
+	char path[108];
 	dword handle;
 	long position;
 };
 static_assert(sizeof(s_file_reference_persist) == 0x7C);
 
 struct s_cache_file_report
 {
-	c_static_string<32> __string0;
+	char __unknown0[32];
 	dword hash[5];
 	s_file_reference_persist file_reference;
 	dword __unknownB0[20];
@@ -188,8 +188,6 @@ static_assert(sizeof(s_cache_file_report) == 0x114);
 
 struct s_cache_file_reports
 {
-	void __thiscall load(s_cache_file_header* header);
-
 	long count;
 	s_cache_file_report* elements;
 };

diff --git a/game/source/camera/debug_director.cpp b/game/source/camera/debug_director.cpp
@@ -15,7 +15,7 @@ e_camera_mode k_debug_camera_modes[] = { _camera_mode_flying, _camera_mode_follo
 void c_debug_director::constructor(long user_index)
 {
 	changed_camera();
-	INVOKE_CLASS_MEMBER(0x007260D0, c_debug_director::constructor, user_index);
+	DECLFUNC(0x007260D0, void, __thiscall, c_director*, long)(this, user_index);
 }
 
 void c_debug_director::changed_camera()

diff --git a/game/source/cseries/cseries.hpp b/game/source/cseries/cseries.hpp
@@ -7,7 +7,6 @@
 #include "math/integer_math.hpp"
 #include "math/matrix_math.hpp"
 #include "math/real_math.hpp"
-#include "memory/member_to_static.hpp"
 
 #include <stdarg.h>
 #include <type_traits>
@@ -20,10 +19,6 @@
 #define DECLFUNC(ADDR, R, CC, ...) reinterpret_cast<R(CC*)(__VA_ARGS__)>(ADDR)
 #define INVOKE(ADDR, TYPE, ...) reinterpret_cast<decltype(TYPE)*>(ADDR)(__VA_ARGS__)
 
-// give the full function name including class
-#define INVOKE_CLASS_MEMBER(ADDR, NAME, ...) (this->*static_to_member_t<decltype(&NAME)>{ .address = ADDR }.function)(__VA_ARGS__)
-
-
 #define OFFSETOF(s,m) __builtin_offsetof(s,m)
 #define NUMBEROF(_array) (sizeof(_array) / sizeof(_array[0]))
 #define IN_RANGE_INCLUSIVE(value, begin, end) (((value) >= (begin)) && ((value) <= (end)))

diff --git a/game/source/memory/bitstream.cpp b/game/source/memory/bitstream.cpp
@@ -441,32 +441,32 @@ void __cdecl c_bitstream::write_secure_address(char const* name, s_transport_sec
 	DECLFUNC(0x0055A410, void, __thiscall, c_bitstream const*, char const*, s_transport_secure_address const*)(this, name, address);
 }
 
-void __cdecl c_bitstream::write_string(char const* name, char const* string, long max_string_size)
+void __cdecl c_bitstream::write_string(char const* name, char const* _string, long max_string_size)
 {
 	ASSERT(writing());
-	ASSERT(string);
+	ASSERT(_string);
 	ASSERT(max_string_size > 0);
-	ASSERT((long)csstrnlen(string, (dword)max_string_size) < max_string_size);
+	//ASSERT(strnlen(_string, max_string_size) < max_string_size);
 
-	DECLFUNC(0x0055A430, void, __thiscall, c_bitstream const*, char const*, char const*, long)(this, name, string, max_string_size);
+	DECLFUNC(0x0055A430, void, __thiscall, c_bitstream const*, char const*, char const*, long)(this, name, _string, max_string_size);
 }
 
 void __cdecl c_bitstream::write_string_utf8(char const* name, utf8 const* char_string, long max_string_size)
 {
 	ASSERT(writing());
 	ASSERT(char_string);
 	ASSERT(max_string_size > 0);
-	ASSERT((long)csstrnlen(char_string, (dword)max_string_size) < max_string_size);
+	//ASSERT(strnlen(char_string, max_string_size) < max_string_size);
 
 	DECLFUNC(0x0055A650, void, __thiscall, c_bitstream const*, char const*, utf8 const*, long)(this, name, char_string, max_string_size);
 }
 
-void __cdecl c_bitstream::write_string_wchar(char const* name, wchar_t const* string, long max_string_size)
+void __cdecl c_bitstream::write_string_wchar(char const* name, wchar_t const* _string, long max_string_size)
 {
 	ASSERT(writing());
-	ASSERT(string);
+	ASSERT(_string);
 	ASSERT(max_string_size > 0);
 
-	DECLFUNC(0x0055A6D0, void, __thiscall, c_bitstream const*, char const*, wchar_t const*, long)(this, name, string, max_string_size);
+	DECLFUNC(0x0055A6D0, void, __thiscall, c_bitstream const*, char const*, wchar_t const*, long)(this, name, _string, max_string_size);
 }
 
diff --git a/game/source/memory/bitstream.hpp b/game/source/memory/bitstream.hpp
@@ -142,9 +142,9 @@ struct c_bitstream
 	void __cdecl write_quantized_real(char const* name, real* value, real min_value, real max_value, long size_in_bits, bool exact_midpoint, bool exact_endpoints);
 	void __cdecl write_qword_internal(qword value, long size_in_bits);
 	void __cdecl write_secure_address(char const* name, s_transport_secure_address const* address);
-	void __cdecl write_string(char const* name, char const* string, long max_string_size);
-	void __cdecl write_string_utf8(char const* name, utf8 const* char_string, long max_string_size);
-	void __cdecl write_string_wchar(char const* name, wchar_t const* string, long max_string_size);
+	void __cdecl write_string(char const* name, char const* _string, long max_string_size);
+	void __cdecl write_string_utf8(char const* name, utf8 const* _string, long max_string_size);
+	void __cdecl write_string_wchar(char const* name, wchar_t const* _string, long max_string_size);
 
 	template<typename t_enum, long size_in_bits>
 	void __cdecl write_enum(char const* name, t_enum value)

diff --git a/game/source/memory/hashtable.cpp b/game/source/memory/hashtable.cpp
@@ -17,7 +17,7 @@ c_hash::~c_hash()
 
 dword __cdecl c_hash::add_byte(byte byte_to_add)
 {
-	return INVOKE_CLASS_MEMBER(0x00967EA0, c_hash::add_byte, byte_to_add);
+	return DECLFUNC(0x00967EA0, dword, __thiscall, c_hash*, byte)(this, byte_to_add);
 
 	//ASSERT((m_polynomial_index >= 0) && (m_polynomial_index < k_hash_polynomial_count));
 	//
@@ -32,7 +32,7 @@ dword __cdecl c_hash::add_byte(byte byte_to_add)
 
 dword __cdecl c_hash::add_data_range(void const* data, long data_size)
 {
-	return INVOKE_CLASS_MEMBER(0x00967EE0, c_hash::add_data_range, data, data_size);
+	return DECLFUNC(0x00967EE0, dword, __thiscall, c_hash*, void const*, long)(this, data, data_size);
 
 	//for (long i = 0; i < data_size; i++)
 	//	add_byte(static_cast<byte const*>(data)[i]);
@@ -42,7 +42,7 @@ dword __cdecl c_hash::add_data_range(void const* data, long data_size)
 
 dword __cdecl c_hash::get_hash() const
 {
-	return INVOKE_CLASS_MEMBER(0x00967F30, c_hash::get_hash);
+	return DECLFUNC(0x00967F30, dword, __thiscall, c_hash const*)(this);
 
 	//return m_hash;
 }

diff --git a/game/source/memory/read_write_lock.cpp b/game/source/memory/read_write_lock.cpp
@@ -16,27 +16,27 @@ c_read_write_lock::~c_read_write_lock()
 
 void __cdecl c_read_write_lock::read_lock()
 {
-	INVOKE_CLASS_MEMBER(0x006EF4D0, c_read_write_lock::read_lock);
+	DECLFUNC(0x006EF4D0, void, __thiscall, c_read_write_lock*)(this);
 }
 
 void __cdecl c_read_write_lock::read_unlock()
 {
-	INVOKE_CLASS_MEMBER(0x006EF4E0, c_read_write_lock::read_unlock);
+	DECLFUNC(0x006EF4E0, void, __thiscall, c_read_write_lock*)(this);
 }
 
 
 void __cdecl c_read_write_lock::setup(long critcal_section_index, long semaphore_index)
 {
-	INVOKE_CLASS_MEMBER(0x006EF4F0, c_read_write_lock::setup, critcal_section_index, semaphore_index);
+	DECLFUNC(0x006EF4F0, void, __thiscall, c_read_write_lock*, long, long)(this, critcal_section_index, semaphore_index);
 }
 
 void __cdecl c_read_write_lock::write_lock()
 {
-	INVOKE_CLASS_MEMBER(0x006EF530, c_read_write_lock::write_lock);
+	DECLFUNC(0x006EF530, void, __thiscall, c_read_write_lock*)(this);
 }
 
 void __cdecl c_read_write_lock::write_unlock()
 {
-	INVOKE_CLASS_MEMBER(0x006EF570, c_read_write_lock::write_unlock);
+	DECLFUNC(0x006EF570, void, __thiscall, c_read_write_lock*)(this);
 }
 
diff --git a/game/source/networking/delivery/network_channel.cpp b/game/source/networking/delivery/network_channel.cpp
@@ -183,7 +183,7 @@ void __cdecl c_network_channel::close(e_network_channel_closure_reason closure_r
 
 void __cdecl c_network_channel::open(transport_address const* remote_address, bool send_connect_packets, long channel_identifier)
 {
-	INVOKE_CLASS_MEMBER(0x004603B0, c_network_channel::open, remote_address, send_connect_packets, channel_identifier);
+	DECLFUNC(0x004603B0, void, __thiscall, c_network_channel*, transport_address const*, bool, long)(this, remote_address, send_connect_packets, channel_identifier);
 
 	//ASSERT(remote_address && transport_address_valid(remote_address));
 	//ASSERT(allocated());

diff --git a/game/source/networking/delivery/network_link.cpp b/game/source/networking/delivery/network_link.cpp
@@ -112,7 +112,7 @@ bool __cdecl c_network_link::create_endpoints()
 
 bool c_network_link::decode_packet(long data_buffer_size, byte const* data_buffer, s_link_packet* packet) const
 {
-	return INVOKE_CLASS_MEMBER(0x0043B820, c_network_link::decode_packet, data_buffer_size, data_buffer, packet);
+	return DECLFUNC(0x0043B820, bool, __thiscall, c_network_link const*, long, byte const*, s_link_packet*)(this, data_buffer_size, data_buffer, packet);
 }
 
 void __cdecl c_network_link::destroy_endpoints()
@@ -143,5 +143,5 @@ void __cdecl c_network_link::send_out_of_band(c_bitstream const* game_data, tran
 	ASSERT(game_data);
 	ASSERT(address);
 
-	INVOKE_CLASS_MEMBER(0x0043C250, c_network_link::send_out_of_band, game_data, address, out_size_on_wire);
+	DECLFUNC(0x0043C250, void, __thiscall, c_network_link*, c_bitstream const*, transport_address const*, long*)(this, game_data, address, out_size_on_wire);
 }
diff --git a/game/source/networking/logic/network_recruiting_search.cpp b/game/source/networking/logic/network_recruiting_search.cpp
@@ -9,7 +9,7 @@ REFERENCE_DECLARE(0x0228E6E0, s_network_recruiting_search_globals, g_recruiting_
 
 void __cdecl c_recruiting_seeker::update()
 {
-	INVOKE_CLASS_MEMBER(0x004E6E20, c_recruiting_seeker::update);
+	DECLFUNC(0x004E6E20, void, __thiscall, c_recruiting_seeker*)(this);
 }
 
 bool __cdecl network_recruiting_search_begin(long controller_index,long squad_search_flags,long maximum_session_count, s_available_session* session_storage)