make it less shit

Author: jupyterkat

crates/byondapi-rs-test/dm_project/bindings.dm

@@ -11,9 +11,9 @@
 
 #define BYONDAPI_TEST (__byondapi_test || __detect_byondapi_test())
 
+var/static/__loaded_byondapi_test_test_new_obj_macro_ffi = load_ext(BYONDAPI_TEST, "byond:test_new_obj_macro_ffi")
 ///Tests macro style binds
-var/static/loaded_byondapi_test_test_new_obj_macro_ffi = load_ext(BYONDAPI_TEST, "byond:test_new_obj_macro_ffi")
-#define test_new_obj_macro_ffi(_object, _number, _thing) call_ext(loaded_byondapi_test_test_new_obj_macro_ffi)(_object, _number, _thing)
+#define test_new_obj_macro_byondapi_test(_object, _number, _thing) call_ext(__loaded_byondapi_test_test_new_obj_macro_ffi)(_object, _number, _thing)
 
 ///Tests new
 /proc/test_new_obj()

crates/byondapi-rs/src/binds.rs

@@ -57,17 +57,18 @@ pub fn generate_bindings(libname: &str) {
             .replace("src", "");
         match thing.function_type {
             FunctionType::Macro => {
+                let func_name_libname = func_name.replace("_ffi", &format!("_{libname}"));
                 if cfg!(feature = "byond-515-1621") {
                     file.write_fmt(format_args!(
-                r#"{docs}#define {func_name}({func_arguments}) call_ext({libname_upper}, "byond:{func_name}")({func_arguments})
+                r#"{docs}#define {func_name_libname}({func_arguments}) call_ext({libname_upper}, "byond:{func_name}")({func_arguments})
 
 "#
             ))
             .unwrap();
                 } else {
                     file.write_fmt(format_args!(
-                r#"{docs}var/static/loaded_{libname}_{func_name} = load_ext({libname_upper}, "byond:{func_name}")
-#define {func_name}({func_arguments}) call_ext(loaded_{libname}_{func_name})({func_arguments})
+                r#"var/static/__loaded_{libname}_{func_name} = load_ext({libname_upper}, "byond:{func_name}")
+{docs}#define {func_name_libname}({func_arguments}) call_ext(__loaded_{libname}_{func_name})({func_arguments})
 
 "#
             ))