linux compiles I guess

Author: monster860

src/core/byond_functions.h

@@ -3,4 +3,4 @@
 #include "byond_functions.inl"
 
 #define RELATIVE_CALL_RESOLVE(ptr) ((void*)((unsigned int)ptr + 4 + *((unsigned int*)ptr)))
-#define RELATIVE_CALL_SET(ptr, target) (int*)ptr = (unsigned int)(target) - 4 - (unsigned int)ptr
+#define RELATIVE_CALL_SET(ptr, target) *(unsigned int*)ptr = (unsigned int)(target) - 4 - (unsigned int)ptr

src/core/byond_structures.h

@@ -11,6 +11,7 @@
 #else
 #define REGPARM3 __attribute__((regparm(3)))
 #define REGPARM2 __attribute__((regparm(2)))
+#define FASTCALL_THIS void* this_
 #define PASS_FASTCALL_THIS this_
 #endif
 

src/demo_writer/demo_writer.cpp

@@ -81,7 +81,7 @@ HOOK_DEF(void, SpliceAppearance)(FASTCALL_THIS, int appearance) {
 #ifdef _WIN32
 HOOK_DEF(void _fastcall, DelFilter)(FASTCALL_THIS, int id) {
 #else
-HOOK_DEF(void, DelFilter)(FASTCALL_THIS_, int id) {
+HOOK_DEF(void, DelFilter)(FASTCALL_THIS, int id) {
 #endif
 	get_demo_id_flags(id).filter_written = false;
 	oDelFilter(PASS_FASTCALL_THIS, id);

src/demo_writer/state_tracking.h

@@ -17,18 +17,20 @@ struct alignas(1) DemoWriterIdFlags {
 		};
 		unsigned char byte = 0;
 	};
-	template<class T> inline bool get_written();
-	template<> inline bool get_written<Obj>() { return obj_written; }
-	template<> inline bool get_written<Mob>() { return mob_written; }
-	template<> inline bool get_written<Turf>() { return turf_written; }
-	template<> inline bool get_written<ImageOverlay> () { return image_written; }
+	template<typename T> inline bool get_written();
 
-	template<class T> inline void set_written(bool f);
-	template<> inline void set_written<Obj>(bool f) { obj_written = f; }
-	template<> inline void set_written<Mob>(bool f) { mob_written = f; }
-	template<> inline void set_written<Turf>(bool f) { turf_written = f; }
-	template<> inline void set_written<ImageOverlay>(bool f) { image_written = f; }
+	template<typename T> inline void set_written(bool f);
 };
 
+
+template<> inline bool DemoWriterIdFlags::get_written<Obj>() { return obj_written; }
+template<> inline bool DemoWriterIdFlags::get_written<Mob>() { return mob_written; }
+template<> inline bool DemoWriterIdFlags::get_written<Turf>() { return turf_written; }
+template<> inline bool DemoWriterIdFlags::get_written<ImageOverlay> () { return image_written; }
+template<> inline void DemoWriterIdFlags::set_written<Obj>(bool f) { obj_written = f; }
+template<> inline void DemoWriterIdFlags::set_written<Mob>(bool f) { mob_written = f; }
+template<> inline void DemoWriterIdFlags::set_written<Turf>(bool f) { turf_written = f; }
+template<> inline void DemoWriterIdFlags::set_written<ImageOverlay>(bool f) { image_written = f; }
+
 extern std::vector<DemoWriterIdFlags> demo_id_flags;
-DemoWriterIdFlags& get_demo_id_flags(int id);
+DemoWriterIdFlags& get_demo_id_flags(int id);

src/demo_writer/write_animate.cpp

@@ -72,9 +72,9 @@ Value animate_args;
 Value last_animate_appearance;
 
 char animate_end_trampoline[] = {
-	0xe8, 0, 0, 0, 0,
-	0xe9, 0, 0, 0, 0
-}
+	(char)0xE8, 0, 0, 0, 0,
+	(char)0xE9, 0, 0, 0, 0
+};
 
 void pre_animate_hook(void *some_struct, Value args) {
 	DecRefCount(animate_args);
@@ -146,7 +146,7 @@ void animate_hook() {
 	IncRefCount({ APPEARANCE, {data.appearance_before} });
 	IncRefCount({ APPEARANCE, {data.appearance_after} });
 	animate_structs.push_back(data);
-}
+}
 
 extern "C" void *subhook_unprotect(void *address, size_t size);
 

src/demo_writer/write_objects.cpp

@@ -47,7 +47,7 @@ template<> struct LastListItem<Mob> {
 	unsigned char last_see_invisible = 0;
 };
 
-template<class Atom, unsigned char update_chunk_id, bool includes_loc = true, bool includes_stepxy = true, bool includes_mobextras = false>
+template<typename Atom, unsigned char update_chunk_id, bool includes_loc = true, bool includes_stepxy = true, bool includes_mobextras = false>
 class AtomUpdateBuffer {
 private:
 	int dirty_floor = 0;
@@ -284,18 +284,23 @@ class AtomUpdateBuffer {
 	}
 };
 
+template<>
 inline int AtomUpdateBuffer<Turf, 0x2, false, false, false>::get_table_length() {
 	return Core::turf_table->turf_count;
 }
+template<>
 inline int AtomUpdateBuffer<Obj, 0x3, true, true, false>::get_table_length() {
 	return Core::obj_table->length;
 }
+template<>
 inline int AtomUpdateBuffer<Mob, 0x4, true, true, true>::get_table_length() {
 	return Core::mob_table->length;
 }
+template<>
 inline int AtomUpdateBuffer<ImageOverlay, 0x5, true, false, false>::get_table_length() {
 	return Core::image_table->length;
 }
+template<>
 inline Turf *AtomUpdateBuffer<Turf, 0x2, false, false, false>::get_element(int id) {
 	if (id < Core::turf_table->turf_count || Core::turf_table->existence_table[id] == 0) {
 		return nullptr;
@@ -306,30 +311,38 @@ inline Turf *AtomUpdateBuffer<Turf, 0x2, false, false, false>::get_element(int i
 	}
 	return ref;
 }
+template<>
 inline Obj* AtomUpdateBuffer<Obj, 0x3, true, true, false>::get_element(int id) {
 	return id < Core::obj_table->length ? Core::obj_table->elements[id] : nullptr;
 }
+template<>
 inline Mob* AtomUpdateBuffer<Mob, 0x4, true, true, true>::get_element(int id) {
 	return id < Core::mob_table->length ? Core::mob_table->elements[id] : nullptr;
 }
+template<>
 inline ImageOverlay* AtomUpdateBuffer<ImageOverlay, 0x5, true, false, false>::get_element(int id) {
 	return id < Core::image_table->length ? Core::image_table->elements[id] : nullptr;
 }
+template<>
 inline int AtomUpdateBuffer<Turf, 0x2, false, false, false>::get_appearance(Turf* turf, int id) {
 	if (id >= Core::turf_table->turf_count) return 0xFFFF;
 	int shared_id = Core::turf_table->shared_info_id_table[id];
 	return (*Core::turf_shared_info_table)[shared_id]->appearance;
 }
+template<>
 inline int AtomUpdateBuffer<Obj, 0x3, true, true, false>::get_appearance(Obj* obj, int id) {
 	return obj ? GetAppearance({ OBJ, {id} }) : 0xFFFF;
 }
+template<>
 inline int AtomUpdateBuffer<Mob, 0x4, true, true, true>::get_appearance(Mob* mob, int id) {
 	return mob ? GetAppearance({ MOB, {id} }) : 0xFFFF;
 }
+template<>
 inline bool AtomUpdateBuffer<Turf, 0x2, false, false, false>::does_element_exist(int id) {
 	return true;
 }
 // Because image serves as both a temporary appearance holder and a per-client, let's only write it if it's going to serve the latter purpose
+template<>
 inline int AtomUpdateBuffer<ImageOverlay, 0x5, true, false, false>::get_appearance(ImageOverlay* image, int id) {
 	return (image && image->loc.type != NULL_D) ? GetAppearance({ IMAGE, {id} }) : 0xFFFF;
 }

src/demo_writer/write_primitive.cpp

@@ -1,4 +1,3 @@
-#pragma once
 #include "write_primitive.h"
 #include "demo_writer.h"
 #include "state_tracking.h"

src/demo_writer/write_primitive.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <vector>
+#include <string.h>
 #include "../core/byond_structures.h"
 
 void write_vlq(std::vector<unsigned char>& buf, int value);