Remove macros inside of SCRIPT_EXPORT macro

Author: Zegeri

src/xrGame/alife_simulator_script.cpp

@@ -348,10 +348,9 @@ SCRIPT_EXPORT(CALifeSimulator, (), {
                          .def("actor", &get_actor)
                          .def("has_info", &has_info)
                          .def("dont_has_info", &dont_has_info)
-#ifndef LINUX // FIXME!!!
-                         .def("switch_distance", &CALifeSimulator::switch_distance)
-                         .def("set_switch_distance", &CALifeSimulator::set_switch_distance) //Alundaio: renamed to set_switch_distance from switch_distance
-#endif
+                         .def("switch_distance", (float (CALifeSimulator::*)())(&CALifeSimulator::switch_distance))
+                         .def("set_switch_distance", (void (CALifeSimulator::*)(float))
+                            (&CALifeSimulator::set_switch_distance)) //Alundaio: renamed to set_switch_distance from switch_distance
                          //Alundaio: extend alife simulator exports
                          .def("teleport_object", &teleport_object)
                          //Alundaio: END

src/xrGame/level_script.cpp

@@ -781,9 +781,7 @@ IC static void CLevel_Export(lua_State* luaState)
     ];
 
     module(luaState)[def("command_line", &command_line),
-#ifndef LINUX // FIXME!!!
-        def("IsGameTypeSingle", &IsGameTypeSingle),
-#endif
+        def("IsGameTypeSingle", (bool (*)())&IsGameTypeSingle),
         def("IsDynamicMusic", &IsDynamicMusic), def("render_get_dx_level", &render_get_dx_level),
         def("IsImportantSave", &IsImportantSave)];
 

src/xrGame/login_manager_script.cpp

@@ -32,13 +32,13 @@ SCRIPT_EXPORT(profile, (), {
         luaState)[class_<profile>("profile").def("unique_nick", &profile::unique_nick).def("online", &profile::online)];
 });
 
+#ifndef LINUX // FIXME!!!
 SCRIPT_EXPORT(login_operation_cb, (), {
     module(luaState)[class_<gamespy_gp::login_operation_cb>("login_operation_cb")
                          .def(constructor<>())
                          .def(constructor<gamespy_gp::login_operation_cb::lua_object_type,
                              gamespy_gp::login_operation_cb::lua_function_type>())
-#ifndef LINUX // FIXME!!!
                          .def("bind", &gamespy_gp::login_operation_cb::bind)
-#endif
                          .def("clear", &gamespy_gp::login_operation_cb::clear)];
 });
+#endif

src/xrGame/profile_data_types_script.cpp

@@ -20,13 +20,13 @@ SCRIPT_EXPORT(profile_data_script_registrator, (), {
             .def_readonly("second", &all_best_scores_t::value_type::second)];
 });
 
+#ifndef LINUX // FIXME!!!
 SCRIPT_EXPORT(store_operation_cb, (), {
     module(luaState)[class_<gamespy_profile::store_operation_cb>("store_operation_cb")
                          .def(constructor<>())
                          .def(constructor<gamespy_profile::store_operation_cb::lua_object_type,
                              gamespy_profile::store_operation_cb::lua_function_type>())
-#ifndef LINUX // FIXME!!!
                          .def("bind", &gamespy_profile::store_operation_cb::bind)
-#endif
                          .def("clear", &gamespy_profile::store_operation_cb::clear)];
 });
+#endif

src/xrGame/ui/UIListBox_script.cpp

@@ -64,15 +64,15 @@ SCRIPT_EXPORT(SServerFilters, (), {
                          .def_readwrite("listen_servers", &SServerFilters::listen_servers)];
 });
 
+#ifndef LINUX // FIXME!!!
 SCRIPT_EXPORT(connect_error_cb, (), {
     module(luaState)[class_<connect_error_cb>("connect_error_cb")
                          .def(constructor<>())
                          .def(constructor<connect_error_cb::lua_object_type, connect_error_cb::lua_function_type>())
-#ifndef LINUX // FIXME!!!
                          .def("bind", &connect_error_cb::bind)
-#endif
                          .def("clear", &connect_error_cb::clear)];
 });
+#endif
 
 SCRIPT_EXPORT(CServerList, (CUIWindow), {
     module(luaState)[class_<CServerList, CUIWindow>("CServerList")

src/xrServerEntities/script_flags_script.cpp

@@ -53,17 +53,16 @@ void one(T* self)
     self->assign(typename T::TYPE(-1));
 }
 
+#ifndef LINUX // FIXME!!!
 SCRIPT_EXPORT(Flags8, (),
 {
     module(luaState)
     [
         class_<Flags8>("flags8")
             .def(constructor<>())
-#ifndef LINUX // FIXME!!!
             .def("get", &Flags8::get)
             .def("zero", &Flags8::zero)
             .def("one", &one<Flags8>)
-#endif
             .def("invert", (Flags8 & (Flags8::*)())(&Flags8::invert))
             .def("invert", (Flags8 & (Flags8::*)(const Flags8&))(&Flags8::invert))
             .def("invert", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::invert))
@@ -88,11 +87,9 @@ SCRIPT_EXPORT(Flags16, (),
     [
         class_<Flags16>("flags16")
             .def(constructor<>())
-#ifndef LINUX // FIXME!!!
             .def("get", &Flags16::get)
             .def("zero", &Flags16::zero)
             .def("one", &one<Flags16>)
-#endif
             .def("invert", (Flags16 & (Flags16::*)())(&Flags16::invert))
             .def("invert", (Flags16 & (Flags16::*)(const Flags16&))(&Flags16::invert))
             .def("invert", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::invert))
@@ -117,11 +114,9 @@ SCRIPT_EXPORT(Flags32, (),
     [
         class_<Flags32>("flags32")
             .def(constructor<>())
-#ifndef LINUX // FIXME!!!
             .def("get", &Flags32::get)
             .def("zero", &Flags32::zero)
             .def("one", &Flags32::one)
-#endif
             .def("invert", (Flags32 & (Flags32::*)())(&Flags32::invert))
             .def("invert", (Flags32 & (Flags32::*)(const Flags32&))(&Flags32::invert))
             .def("invert", (Flags32 & (Flags32::*)(const Flags32::TYPE))(&Flags32::invert))
@@ -139,3 +134,4 @@ SCRIPT_EXPORT(Flags32, (),
             .def("equal", (bool(*)(Flags32*, const Flags32&, const Flags32::TYPE))(&equal<Flags32>))
     ];
 });
+#endif