From a902b754d5f5a3ffacbe33284b4cb8c9fd400319 Mon Sep 17 00:00:00 2001 From: Zegeri Date: Fri, 14 Sep 2018 23:21:59 +0200 Subject: [PATCH] xrGame: Avoid all the remaining issues by "#ifndef LINUX" --- .../vertex_manager_hash_fixed_inline.h | 4 ++ src/xrGame/GameObject.cpp | 4 ++ src/xrGame/Level_network.cpp | 3 ++ src/xrGame/Level_network_Demo.cpp | 2 + src/xrGame/MainMenu.cpp | 3 +- src/xrGame/RegistryFuncs.cpp | 44 +++++++++++++++++-- src/xrGame/account_manager_script.cpp | 2 + src/xrGame/alife_simulator_script.cpp | 3 ++ src/xrGame/configs_dumper.cpp | 10 +++++ ...me_cl_base_weapon_usage_statistic_save.cpp | 3 +- src/xrGame/game_cl_mp.cpp | 4 ++ src/xrGame/game_cl_mp.h | 2 + src/xrGame/game_sv_deathmatch.cpp | 4 ++ src/xrGame/game_sv_event_queue.cpp | 10 +++++ src/xrGame/game_sv_mp.cpp | 4 ++ src/xrGame/level_script.cpp | 6 ++- src/xrGame/login_manager_script.cpp | 2 + src/xrGame/profile_data_types_script.cpp | 2 + src/xrGame/profile_store.cpp | 2 + src/xrGame/screenshot_manager.cpp | 12 +++++ src/xrGame/screenshot_server.cpp | 9 +++- src/xrGame/stats_submitter.cpp | 9 +++- src/xrGame/ui/UIListBox_script.cpp | 2 + src/xrGame/ui/UIMapList.cpp | 2 + src/xrGame/ui/UITalkWnd.cpp | 2 + src/xrGame/xrGameSpyServer.cpp | 2 + src/xrGame/xrServer.cpp | 6 ++- src/xrNetServer/NET_Messages.h | 4 ++ src/xrServerEntities/script_flags_script.cpp | 6 +++ .../xrServer_Objects_ALife_Items_script.cpp | 2 + .../xrServer_Objects_ALife_Items_script2.cpp | 2 + .../xrServer_Objects_ALife_Items_script3.cpp | 2 + ...xrServer_Objects_ALife_Monsters_script.cpp | 2 + ...rServer_Objects_ALife_Monsters_script2.cpp | 2 + ...rServer_Objects_ALife_Monsters_script3.cpp | 2 + ...rServer_Objects_ALife_Monsters_script4.cpp | 5 ++- .../xrServer_Objects_ALife_script.cpp | 2 + .../xrServer_Objects_ALife_script2.cpp | 2 + .../xrServer_Objects_ALife_script3.cpp | 2 + ...erver_Objects_Alife_Smartcovers_script.cpp | 4 ++ 40 files changed, 183 insertions(+), 12 deletions(-) diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h index ddbae5f9c5f..6f524262656 100644 --- a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h +++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h @@ -67,7 +67,11 @@ inline bool CHashFixedVertexManager::is_opened(const Vertex& vertex) const { ret TEMPLATE_SPECIALIZATION inline u32 CHashFixedVertexManager::hash_index(const Index& vertex_id) const { +#ifdef LINUX // FIXME!! + return 0; +#else return hash_fixed_vertex_manager::to_u32(vertex_id) % HashSize; +#endif } TEMPLATE_SPECIALIZATION diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp index ac93a5aa05a..3ecb5518269 100644 --- a/src/xrGame/GameObject.cpp +++ b/src/xrGame/GameObject.cpp @@ -39,12 +39,14 @@ #include "doors.h" #include "xrNetServer/NET_Messages.h" +#ifndef LINUX // FIXME!!! #pragma warning(push) #pragma warning(disable : 4995) #include #pragma warning(pop) #pragma intrinsic(_InterlockedCompareExchange) +#endif extern MagicBox3 MagicMinBox(int iQuantity, const Fvector* akPoint); @@ -109,8 +111,10 @@ void CGameObject::MakeMeCrow() return; u32 const device_frame_id = Device.dwFrame; u32 const object_frame_id = dwFrame_AsCrow; +#ifndef LINUX // FIXME!!! if ((u32)_InterlockedCompareExchange((long*)&dwFrame_AsCrow, device_frame_id, object_frame_id) == device_frame_id) return; +#endif VERIFY(dwFrame_AsCrow == device_frame_id); Props.crow = 1; g_pGameLevel->Objects.o_crow(this); diff --git a/src/xrGame/Level_network.cpp b/src/xrGame/Level_network.cpp index e8cd4ae580d..c8f0a60c612 100644 --- a/src/xrGame/Level_network.cpp +++ b/src/xrGame/Level_network.cpp @@ -362,6 +362,8 @@ bool CLevel::Connect2Server(const char* options) //--------------------------------------------------------------------------- if (psNET_direct_connect) m_bConnectResultReceived = true; + +#ifndef LINUX // FIXME!!! u32 EndTime = GetTickCount() + ConnectionTimeOut; while (!m_bConnectResultReceived) { @@ -391,6 +393,7 @@ bool CLevel::Connect2Server(const char* options) } //----------------------------------------- } +#endif Msg("%c client : connection %s - <%s>", m_bConnectResult ? '*' : '!', m_bConnectResult ? "accepted" : "rejected", m_sConnectResult.c_str()); if (!m_bConnectResult) diff --git a/src/xrGame/Level_network_Demo.cpp b/src/xrGame/Level_network_Demo.cpp index 4b6b7c1160a..1316e0bce72 100644 --- a/src/xrGame/Level_network_Demo.cpp +++ b/src/xrGame/Level_network_Demo.cpp @@ -18,10 +18,12 @@ void CLevel::PrepareToSaveDemo() R_ASSERT(!m_DemoPlay); string_path demo_name = ""; string_path demo_path; +#ifndef LINUX // FIXME!!! SYSTEMTIME Time; GetLocalTime(&Time); xr_sprintf(demo_name, "xray_%02d-%02d-%02d_%02d-%02d-%02d.demo", Time.wMonth, Time.wDay, Time.wYear, Time.wHour, Time.wMinute, Time.wSecond); +#endif Msg("Demo would be stored in - %s", demo_name); FS.update_path(demo_path, "$logs$", demo_name); m_writer = FS.w_open(demo_path); diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp index 2f10bb2ab5a..d4b64fffafa 100644 --- a/src/xrGame/MainMenu.cpp +++ b/src/xrGame/MainMenu.cpp @@ -608,8 +608,9 @@ void CMainMenu::OnDownloadPatch(CUIWindow*, void*) string4096 FilePath = ""; char* FileName = NULL; +#ifndef LINUX // FIXME!!! GetFullPathName(fileName, 4096, FilePath, &FileName); - +#endif string_path fname; if (FS.path_exist("$downloads$")) { diff --git a/src/xrGame/RegistryFuncs.cpp b/src/xrGame/RegistryFuncs.cpp index b1d281b3821..d0932116a18 100644 --- a/src/xrGame/RegistryFuncs.cpp +++ b/src/xrGame/RegistryFuncs.cpp @@ -6,6 +6,9 @@ bool ReadRegistryValue(LPCSTR rKeyName, DWORD rKeyType, void* value) { +#ifdef LINUX // FIXME!!! + return true; +#else HKEY hKey = 0; long res = RegOpenKeyEx(REGISTRY_BASE, REGISTRY_PATH, 0, KEY_READ, &hKey); @@ -51,10 +54,14 @@ bool ReadRegistryValue(LPCSTR rKeyName, DWORD rKeyType, void* value) memcpy(value, rBuf, KeyValueSize); return true; +#endif }; bool WriteRegistryValue(LPCSTR rKeyName, DWORD rKeyType, const void* value) { +#ifdef LINUX // FIXME!!! + return true; +#else HKEY hKey; long res = RegOpenKeyEx(REGISTRY_BASE, REGISTRY_PATH, 0, KEY_WRITE, &hKey); @@ -93,14 +100,40 @@ bool WriteRegistryValue(LPCSTR rKeyName, DWORD rKeyType, const void* value) if (hKey) RegCloseKey(hKey); return true; +#endif }; -bool ReadRegistry_StrValue(LPCSTR rKeyName, char* value) { return ReadRegistryValue(rKeyName, REG_SZ, value); } -void WriteRegistry_StrValue(LPCSTR rKeyName, const char* value) { WriteRegistryValue(rKeyName, REG_SZ, value); } -void ReadRegistry_DWValue(LPCSTR rKeyName, DWORD& value) { ReadRegistryValue(rKeyName, REG_DWORD, &value); } -void WriteRegistry_DWValue(LPCSTR rKeyName, const DWORD& value) { WriteRegistryValue(rKeyName, REG_DWORD, &value); } +bool ReadRegistry_StrValue(LPCSTR rKeyName, char* value) +{ +#ifdef LINUX // FIXME!!! + return true; +#else + return ReadRegistryValue(rKeyName, REG_SZ, value); +#endif +} +void WriteRegistry_StrValue(LPCSTR rKeyName, const char* value) +{ +#ifndef LINUX // FIXME!!! + WriteRegistryValue(rKeyName, REG_SZ, value); +#endif +} +void ReadRegistry_DWValue(LPCSTR rKeyName, DWORD& value) +{ +#ifndef LINUX // FIXME!!! + ReadRegistryValue(rKeyName, REG_DWORD, &value); +#endif +} +void WriteRegistry_DWValue(LPCSTR rKeyName, const DWORD& value) +{ +#ifndef LINUX // FIXME!! + WriteRegistryValue(rKeyName, REG_DWORD, &value); +#endif +} u32 const ReadRegistry_BinaryValue(LPCSTR rKeyName, u8* buffer_dest, u32 const buffer_size) { +#ifdef LINUX // FIXME!!! + return u32(0); +#else HKEY hKey = 0; long res = RegOpenKeyEx(REGISTRY_BASE, REGISTRY_PATH, 0, KEY_READ, &hKey); @@ -127,10 +160,12 @@ u32 const ReadRegistry_BinaryValue(LPCSTR rKeyName, u8* buffer_dest, u32 const b } return static_cast(tmp_buffer_size); +#endif } void WriteRegistry_BinaryValue(LPCSTR rKeyName, u8 const* buffer_src, u32 const buffer_size) { +#ifndef LINUX // FIXME!!! HKEY hKey; long res = RegOpenKeyEx(REGISTRY_BASE, REGISTRY_PATH, 0, KEY_WRITE, &hKey); @@ -150,4 +185,5 @@ void WriteRegistry_BinaryValue(LPCSTR rKeyName, u8 const* buffer_src, u32 const res = RegSetValueEx(hKey, rKeyName, NULL, REG_BINARY, buffer_src, buffer_size); RegCloseKey(hKey); +#endif } diff --git a/src/xrGame/account_manager_script.cpp b/src/xrGame/account_manager_script.cpp index 1ab95c77593..7ed209ab42c 100644 --- a/src/xrGame/account_manager_script.cpp +++ b/src/xrGame/account_manager_script.cpp @@ -6,6 +6,7 @@ using namespace luabind; using namespace luabind::policy; using namespace gamespy_gp; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(account_manager, (), { module(luaState)[class_("account_manager") .def("suggest_unique_nicks", &account_manager::suggest_unique_nicks) @@ -65,3 +66,4 @@ SCRIPT_EXPORT(found_email_cb, (), { .def("bind", &gamespy_gp::found_email_cb::bind) .def("clear", &gamespy_gp::found_email_cb::clear)]; }); +#endif \ No newline at end of file diff --git a/src/xrGame/alife_simulator_script.cpp b/src/xrGame/alife_simulator_script.cpp index 709e4617e1c..795dda59a5c 100644 --- a/src/xrGame/alife_simulator_script.cpp +++ b/src/xrGame/alife_simulator_script.cpp @@ -331,6 +331,7 @@ SCRIPT_EXPORT(CALifeSimulator, (), { .def("set_interactive", (void (CALifeSimulator::*)(ALife::_OBJECT_ID, bool))(&CALifeSimulator::set_interactive)) .def("kill_entity", &CALifeSimulator::kill_entity) + .def("kill_entity", &kill_entity0) .def("kill_entity", &kill_entity1) .def("add_in_restriction", &add_in_restriction) @@ -347,8 +348,10 @@ 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 //Alundaio: extend alife simulator exports .def("teleport_object", &teleport_object) //Alundaio: END diff --git a/src/xrGame/configs_dumper.cpp b/src/xrGame/configs_dumper.cpp index 5d2580ad40a..54c5e483874 100644 --- a/src/xrGame/configs_dumper.cpp +++ b/src/xrGame/configs_dumper.cpp @@ -32,6 +32,7 @@ configs_dumper::configs_dumper() configs_dumper::~configs_dumper() { +#ifndef LINUX // FIXME!!! if (m_make_start_event) { SetEvent(m_make_start_event); @@ -39,11 +40,13 @@ configs_dumper::~configs_dumper() CloseHandle(m_make_done_event); CloseHandle(m_make_start_event); } +#endif xr_free(m_buffer_for_compress); } void configs_dumper::shedule_Update(u32 dt) { +#ifndef LINUX // FIXME!!! DWORD thread_result = WaitForSingleObject(m_make_done_event, 0); R_ASSERT((thread_result != WAIT_ABANDONED) && (thread_result != WAIT_FAILED)); R_ASSERT(m_state == ds_active); @@ -53,6 +56,7 @@ void configs_dumper::shedule_Update(u32 dt) m_state = ds_not_active; Engine.Sheduler.Unregister(this); } +#endif } struct ExistDumpPredicate @@ -204,6 +208,7 @@ void configs_dumper::dump_config(complete_callback_t complete_cb) } ULONG_PTR process_affinity_mask, tmp_dword; +#ifndef LINUX // FIXME!!! GetProcessAffinityMask(GetCurrentProcess(), &process_affinity_mask, &tmp_dword); bool single_core = (btwCount1(static_cast(process_affinity_mask)) == 1); if (single_core) @@ -227,6 +232,7 @@ void configs_dumper::dump_config(complete_callback_t complete_cb) m_make_done_event = CreateEvent(NULL, FALSE, FALSE, NULL); thread_spawn(&configs_dumper::dumper_thread, "configs_dumper", 0, this); Engine.Sheduler.Register(this, TRUE); +#endif } void configs_dumper::compress_configs() @@ -244,6 +250,7 @@ void configs_dumper::compress_configs() void configs_dumper::dumper_thread(void* my_ptr) { configs_dumper* this_ptr = static_cast(my_ptr); +#ifndef LINUX // FIXME!!! DWORD wait_result = WaitForSingleObject(this_ptr->m_make_start_event, INFINITE); while ((wait_result != WAIT_ABANDONED) || (wait_result != WAIT_FAILED)) { @@ -262,6 +269,7 @@ void configs_dumper::dumper_thread(void* my_ptr) wait_result = WaitForSingleObject(this_ptr->m_make_start_event, INFINITE); } SetEvent(this_ptr->m_make_done_event); +#endif } void __stdcall configs_dumper::yield_cb(long progress) @@ -274,8 +282,10 @@ void __stdcall configs_dumper::yield_cb(long progress) void __stdcall configs_dumper::switch_thread() { +#ifndef LINUX // FIXME!!! if (!SwitchToThread()) Sleep(10); +#endif } void configs_dumper::realloc_compress_buffer(u32 need_size) diff --git a/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp b/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp index 6ba47a7b721..e40210411e8 100644 --- a/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp +++ b/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp @@ -70,6 +70,7 @@ void WeaponUsageStatistic::SaveData() return; string64 GameType; +#ifndef LINUX // FIXME!!! SYSTEMTIME Time; switch (GameID()) { @@ -82,7 +83,7 @@ void WeaponUsageStatistic::SaveData() GetLocalTime(&Time); xr_sprintf(mFileName, "(%s)_(%s)_%02d.%02d.%02d_%02d.%02d.%02d.wus", *(Level().name()), GameType, Time.wMonth, Time.wDay, Time.wYear, Time.wHour, Time.wMinute, Time.wSecond); - +#endif //--------------------------------------------------------- FS.update_path(mFileName, "$logs$", mFileName); FILE* SFile = fopen(mFileName, "wb"); diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp index 6f45eccf0fc..a249a0685a7 100644 --- a/src/xrGame/game_cl_mp.cpp +++ b/src/xrGame/game_cl_mp.cpp @@ -1535,11 +1535,13 @@ void game_cl_mp::SendCollectedData(u8 const* buffer, u32 buffer_size, u32 uncomp upload_memory_writer.pointer(), upload_memory_writer.size(), sending_cb, uncompressed_size); }; +#ifndef LINUX // FIXME!!! void game_cl_mp::generate_file_name(string_path& file_name, LPCSTR file_suffix, SYSTEMTIME const& date_time) { xr_sprintf(file_name, "%02d%02d%02d-%02d%02d%02d_%s", date_time.wYear % 100, date_time.wMonth, date_time.wDay, date_time.wHour, date_time.wMinute, date_time.wSecond, file_suffix); } +#endif LPCSTR game_cl_mp::make_file_name(LPCSTR session_id, string_path& dest) { @@ -1582,9 +1584,11 @@ void game_cl_mp::PrepareToReceiveFile( string_path screen_shot_fn; LPCSTR dest_file_name = NULL; STRCONCAT(dest_file_name, make_file_name(client_session_id.c_str(), screen_shot_fn)); +#ifndef LINUX // FIXME!!! SYSTEMTIME date_time; GetLocalTime(&date_time); generate_file_name(screen_shot_fn, dest_file_name, date_time); +#endif fr_callback_binder* tmp_binder = get_receiver_cb_binder(); if (!tmp_binder) diff --git a/src/xrGame/game_cl_mp.h b/src/xrGame/game_cl_mp.h index 188bcfd58f7..7b35fcce585 100644 --- a/src/xrGame/game_cl_mp.h +++ b/src/xrGame/game_cl_mp.h @@ -328,7 +328,9 @@ class game_cl_mp : public game_cl_GameState void __stdcall sending_screenshot_callback(file_transfer::sending_status_t status, u32 bytes_sent, u32 data_size); //------------------------------------------------------------------------------------------------- +#ifndef LINUX static void generate_file_name(string_path& file_name, LPCSTR file_suffix, SYSTEMTIME const& date_time); +#endif static LPCSTR make_file_name(LPCSTR session_id, string_path& dest); //------------------------------------------------------------------------------------------------- #include "game_cl_mp_messages_menu.h" diff --git a/src/xrGame/game_sv_deathmatch.cpp b/src/xrGame/game_sv_deathmatch.cpp index 8782ea03db7..1c0e5282a37 100644 --- a/src/xrGame/game_sv_deathmatch.cpp +++ b/src/xrGame/game_sv_deathmatch.cpp @@ -104,7 +104,11 @@ void game_sv_Deathmatch::Create(shared_str& options) switch_Phase(GAME_PHASE_PENDING); +#ifdef LINUX // FIXME!!! + ::Random.seed(0); +#else ::Random.seed(GetTickCount()); +#endif m_CorpseList.clear(); m_AnomaliesPermanent.clear(); diff --git a/src/xrGame/game_sv_event_queue.cpp b/src/xrGame/game_sv_event_queue.cpp index ce3963a44c7..b2b9a1892f8 100644 --- a/src/xrGame/game_sv_event_queue.cpp +++ b/src/xrGame/game_sv_event_queue.cpp @@ -38,7 +38,9 @@ GameEvent* GameEventQueue::Create() #ifdef _DEBUG // Msg ("* GameEventQueue::Create - ready %d, unused %d", ready.size(), unused.size()); #endif +#ifndef LINUX // FIXME!!! LastTimeCreate = GetTickCount(); +#endif //--------------------------------------------- } else @@ -72,6 +74,7 @@ GameEvent* GameEventQueue::Create(NET_Packet& P, u16 type, u32 time, ClientID cl pcs->Enter(); if (unused.empty()) { +#ifndef LINUX // FIXME!!! ready.push_back(new GameEvent()); ge = ready.back(); //--------------------------------------------- @@ -80,6 +83,7 @@ GameEvent* GameEventQueue::Create(NET_Packet& P, u16 type, u32 time, ClientID cl #endif LastTimeCreate = GetTickCount(); //--------------------------------------------- +#endif } else { @@ -104,6 +108,7 @@ GameEvent* GameEventQueue::Retreive() //--------------------------------------------- else { +#ifndef LINUX // FIXME!! u32 tmp_time = GetTickCount() - 60000; u32 size = unused.size(); if ((LastTimeCreate < tmp_time) && (size > 32)) @@ -114,6 +119,7 @@ GameEvent* GameEventQueue::Retreive() // Msg ("GameEventQueue::Retreive - ready %d, unused %d", ready.size(), unused.size()); #endif } +#endif } //--------------------------------------------- pcs->Leave(); @@ -125,6 +131,7 @@ void GameEventQueue::Release() pcs->Enter(); R_ASSERT(!ready.empty()); //--------------------------------------------- +#ifndef LINUX // FIXME!!! u32 tmp_time = GetTickCount() - 60000; u32 size = unused.size(); if ((LastTimeCreate < tmp_time) && (size > 32)) @@ -136,6 +143,7 @@ void GameEventQueue::Release() } else unused.push_back(ready.front()); +#endif //--------------------------------------------- ready.pop_front(); pcs->Leave(); @@ -175,6 +183,7 @@ u32 GameEventQueue::EraseEvents(event_predicate to_del) while (need_to_erase != ready.end()) { //----- +#ifndef LINUX // FIXME!!! u32 tmp_time = GetTickCount() - 60000; u32 size = unused.size(); if ((LastTimeCreate < tmp_time) && (size > 32)) @@ -188,6 +197,7 @@ u32 GameEventQueue::EraseEvents(event_predicate to_del) { unused.push_back(*need_to_erase); } +#endif //----- #ifdef DEBUG Msg("! GameEventQueue::EraseEvents - destroying event type[%d], sender[0x%08x]", (*need_to_erase)->type, diff --git a/src/xrGame/game_sv_mp.cpp b/src/xrGame/game_sv_mp.cpp index 5fd6b725446..9727507353b 100644 --- a/src/xrGame/game_sv_mp.cpp +++ b/src/xrGame/game_sv_mp.cpp @@ -219,7 +219,11 @@ struct real_sender NET_Packet* P; u32 flags_to_send; +#ifdef LINUX // FIXME!!! + real_sender(xrServer* server, NET_Packet* Packet, u32 flags = 0) +#else real_sender(xrServer* server, NET_Packet* Packet, u32 flags = DPNSEND_GUARANTEED) +#endif { server_for_send = server; P = Packet; diff --git a/src/xrGame/level_script.cpp b/src/xrGame/level_script.cpp index 1533ce30198..14d70bafd23 100644 --- a/src/xrGame/level_script.cpp +++ b/src/xrGame/level_script.cpp @@ -780,7 +780,10 @@ IC static void CLevel_Export(lua_State* luaState) ] ]; - module(luaState)[def("command_line", &command_line), def("IsGameTypeSingle", &IsGameTypeSingle), + module(luaState)[def("command_line", &command_line), +#ifndef LINUX // FIXME!!! + def("IsGameTypeSingle", &IsGameTypeSingle), +#endif def("IsDynamicMusic", &IsDynamicMusic), def("render_get_dx_level", &render_get_dx_level), def("IsImportantSave", &IsImportantSave)]; @@ -829,6 +832,7 @@ IC static void CLevel_Export(lua_State* luaState) def("has_active_tutorial", &has_active_tutotial), def("translate_string", &translate_string) ]; + }; SCRIPT_EXPORT_FUNC(CLevel, (), CLevel_Export); diff --git a/src/xrGame/login_manager_script.cpp b/src/xrGame/login_manager_script.cpp index 3d3c5376822..38c11c31776 100644 --- a/src/xrGame/login_manager_script.cpp +++ b/src/xrGame/login_manager_script.cpp @@ -37,6 +37,8 @@ SCRIPT_EXPORT(login_operation_cb, (), { .def(constructor<>()) .def(constructor()) +#ifndef LINUX // FIXME!!! .def("bind", &gamespy_gp::login_operation_cb::bind) +#endif .def("clear", &gamespy_gp::login_operation_cb::clear)]; }); diff --git a/src/xrGame/profile_data_types_script.cpp b/src/xrGame/profile_data_types_script.cpp index cebe5b534bb..72b00c1d889 100644 --- a/src/xrGame/profile_data_types_script.cpp +++ b/src/xrGame/profile_data_types_script.cpp @@ -25,6 +25,8 @@ SCRIPT_EXPORT(store_operation_cb, (), { .def(constructor<>()) .def(constructor()) +#ifndef LINUX // FIXME!!! .def("bind", &gamespy_profile::store_operation_cb::bind) +#endif .def("clear", &gamespy_profile::store_operation_cb::clear)]; }); diff --git a/src/xrGame/profile_store.cpp b/src/xrGame/profile_store.cpp index d19cc2c5864..1d3f9540aeb 100644 --- a/src/xrGame/profile_store.cpp +++ b/src/xrGame/profile_store.cpp @@ -263,6 +263,7 @@ void profile_store::check_sake_actuality() { if (!m_awards_store->is_sake_equal_to_file() || !m_best_scores_store->is_sake_equal_to_file()) { +#ifndef LINUX // FIXME!!! __time32_t current_time; _time32(¤t_time); @@ -274,6 +275,7 @@ void profile_store::check_sake_actuality() VERIFY(tmp_submit_queue); tmp_submit_queue->submit_all(); } +#endif } } diff --git a/src/xrGame/screenshot_manager.cpp b/src/xrGame/screenshot_manager.cpp index 397c8d8e0f1..4c5280426f2 100644 --- a/src/xrGame/screenshot_manager.cpp +++ b/src/xrGame/screenshot_manager.cpp @@ -53,10 +53,12 @@ screenshot_manager::~screenshot_manager() xr_free(m_buffer_for_compress); if (m_make_start_event) { +#ifndef LINUX // FIXME!!! SetEvent(m_make_start_event); WaitForSingleObject(m_make_done_event, INFINITE); // thread stoped CloseHandle(m_make_done_event); CloseHandle(m_make_start_event); +#endif } } @@ -162,6 +164,7 @@ void screenshot_manager::shedule_Update(u32 dt) } else { +#ifndef LINUX // FIXME!!! DWORD thread_result = WaitForSingleObject(m_make_done_event, 0); R_ASSERT((thread_result != WAIT_ABANDONED) && (thread_result != WAIT_FAILED)); if (thread_result == WAIT_OBJECT_0) @@ -169,6 +172,7 @@ void screenshot_manager::shedule_Update(u32 dt) m_complete_callback(m_buffer_for_compress, m_buffer_for_compress_size, m_jpeg_buffer_size); m_state &= ~making_screenshot; } +#endif } if (!is_making_screenshot() && !is_drawing_downloads()) { @@ -193,8 +197,10 @@ void screenshot_manager::shedule_Update(u32 dt) } #endif //#ifdef DEBUG*/ ULONG_PTR process_affinity_mask, tmp_dword; +#ifndef LINUX // FIXME!!! GetProcessAffinityMask(GetCurrentProcess(), &process_affinity_mask, &tmp_dword); process_screenshot(btwCount1(static_cast(process_affinity_mask)) == 1); +#endif } if (is_drawing_downloads()) { @@ -247,6 +253,7 @@ void screenshot_manager::set_draw_downloads(bool draw) void screenshot_manager::process_screenshot(bool singlecore) { +#ifndef LINUX // FIXME!!! if (m_make_start_event) { SetEvent(m_make_start_event); @@ -255,6 +262,7 @@ void screenshot_manager::process_screenshot(bool singlecore) m_make_start_event = CreateEvent(NULL, FALSE, TRUE, NULL); m_make_done_event = CreateEvent(NULL, FALSE, FALSE, NULL); thread_spawn(&screenshot_manager::screenshot_maker_thread, "screenshot_maker", 0, this); +#endif } void __stdcall screenshot_manager::jpeg_compress_cb(long progress) { @@ -263,14 +271,17 @@ void __stdcall screenshot_manager::jpeg_compress_cb(long progress) #endif*/ if (progress % 5 == 0) { +#ifndef LINUX // FIXME!!! if (!SwitchToThread()) Sleep(10); +#endif } } void screenshot_manager::screenshot_maker_thread(void* arg_ptr) { screenshot_manager* this_ptr = static_cast(arg_ptr); +#ifndef LINUX // FIXME!! DWORD wait_result = WaitForSingleObject(this_ptr->m_make_start_event, INFINITE); while ((wait_result != WAIT_ABANDONED) || (wait_result != WAIT_FAILED)) { @@ -292,6 +303,7 @@ void screenshot_manager::screenshot_maker_thread(void* arg_ptr) wait_result = WaitForSingleObject(this_ptr->m_make_start_event, INFINITE); } SetEvent(this_ptr->m_make_done_event); +#endif } void screenshot_manager::realloc_compress_buffer(u32 need_size) diff --git a/src/xrGame/screenshot_server.cpp b/src/xrGame/screenshot_server.cpp index 84ebdb3cb49..7b3109725ea 100644 --- a/src/xrGame/screenshot_server.cpp +++ b/src/xrGame/screenshot_server.cpp @@ -136,9 +136,11 @@ void clientdata_proxy::save_proxy_screenshot() LPCSTR dest_file_name = NULL; STRCONCAT(dest_file_name, clgame->make_file_name(m_cheater_name.c_str(), screenshot_fn), "_", (m_cheater_digest.size() ? clgame->make_file_name(m_cheater_digest.c_str(), str_digest) : "nulldigest")); +#ifndef LINUX // FIXME!!! SYSTEMTIME date_time; GetLocalTime(&date_time); clgame->generate_file_name(screenshot_fn, dest_file_name, date_time); +#endif clgame->decompress_and_save_screenshot( screenshot_fn, my_proxy_mem_file.pointer(), my_proxy_mem_file.size(), m_receiver->get_user_param()); @@ -155,10 +157,11 @@ void clientdata_proxy::save_proxy_config() string_path dest_file_name; STRCONCAT(fn_suffix, clgame->make_file_name(m_cheater_name.c_str(), config_fn), ".cltx"); - +#ifndef LINUX // FIXME!!! SYSTEMTIME date_time; GetLocalTime(&date_time); clgame->generate_file_name(dest_file_name, fn_suffix, date_time); +#endif IWriter* tmp_writer = FS.w_open("$screenshots$", dest_file_name); if (!tmp_writer) return; @@ -190,12 +193,14 @@ void clientdata_proxy::download_screenshot_callback(file_transfer::receiving_sta break; case file_transfer::receiving_aborted_by_peer: { +#ifndef LINUX // FIXME!!! Msg("* download screenshot aborted by peer [%u]", m_chearer_id); LPCSTR error_msg; char bufforint[16]; STRCONCAT( error_msg, "download screenshot terminated by peer [", ultoa(m_chearer_id.value(), bufforint, 10), "]"); notify_admin(e_screenshot_error_notif, error_msg); +#endif } break; case file_transfer::receiving_timeout: @@ -248,11 +253,13 @@ void clientdata_proxy::download_config_callback(file_transfer::receiving_status_ break; case file_transfer::receiving_aborted_by_peer: { +#ifndef LINUX // FIXME!!! Msg("* download config aborted by peer [%u]", m_chearer_id); LPCSTR error_msg; char bufforint[16]; STRCONCAT(error_msg, "download config terminated by peer [", ultoa(m_chearer_id.value(), bufforint, 10), "]"); notify_admin(e_configs_error_notif, error_msg); +#endif } break; case file_transfer::receiving_timeout: diff --git a/src/xrGame/stats_submitter.cpp b/src/xrGame/stats_submitter.cpp index d25b896d3c0..46cd55e3c69 100644 --- a/src/xrGame/stats_submitter.cpp +++ b/src/xrGame/stats_submitter.cpp @@ -293,6 +293,9 @@ bool stats_submitter::add_player_name_to_report() bool stats_submitter::create_award_inc_report() { +#ifdef LINUX // FIXME!! + return false; +#else __time32_t tmp_time = 0; _time32(&tmp_time); @@ -309,6 +312,7 @@ bool stats_submitter::create_award_inc_report() return false; return add_player_name_to_report(); +#endif } bool stats_submitter::create_best_scores_report() @@ -368,9 +372,11 @@ void stats_submitter::quick_reward_with_award(enum_awards_t award_id, gamespy_gp all_awards_t::iterator award_iter = tmp_awards.find(award_id); R_ASSERT(award_iter != tmp_awards.end()); ++award_iter->second.m_count; +#ifndef LINUX // FIXME!!! __time32_t tmp_time = 0; _time32(&tmp_time); award_iter->second.m_last_reward_date = static_cast(tmp_time); +#endif save_file(profile); } @@ -422,12 +428,13 @@ void stats_submitter::save_file(gamespy_gp::profile const* profile) ltx_to_write.w_u32(tmp_bs_name, best_score_value_line, i->second); } +#ifndef LINUX // FIXME!!! __time32_t tmp_time = 0; _time32(&tmp_time); ltx_to_write.w_s32(profile_data_section, profile_id_line, profile->m_profile_id); ltx_to_write.w_u32(profile_data_section, profile_last_submit_time, static_cast(tmp_time)); - +#endif IWriter* tmp_writer = FS.w_open("$app_data_root$", profile_store_file_name); m_ltx_file.sign_and_save(*tmp_writer); FS.w_close(tmp_writer); diff --git a/src/xrGame/ui/UIListBox_script.cpp b/src/xrGame/ui/UIListBox_script.cpp index 4f588174463..e7f5ba1538c 100644 --- a/src/xrGame/ui/UIListBox_script.cpp +++ b/src/xrGame/ui/UIListBox_script.cpp @@ -68,7 +68,9 @@ SCRIPT_EXPORT(connect_error_cb, (), { module(luaState)[class_("connect_error_cb") .def(constructor<>()) .def(constructor()) +#ifndef LINUX // FIXME!!! .def("bind", &connect_error_cb::bind) +#endif .def("clear", &connect_error_cb::clear)]; }); diff --git a/src/xrGame/ui/UIMapList.cpp b/src/xrGame/ui/UIMapList.cpp index 9a442afd39a..c18202f152f 100644 --- a/src/xrGame/ui/UIMapList.cpp +++ b/src/xrGame/ui/UIMapList.cpp @@ -67,6 +67,7 @@ CUIMapList::~CUIMapList() {} void CUIMapList::StartDedicatedServer() { string_path ModuleFileName; +#ifndef LINUX // FIXME!!! GetModuleFileName(NULL, ModuleFileName, sizeof(ModuleFileName)); char* ModuleName = NULL; @@ -83,6 +84,7 @@ void CUIMapList::StartDedicatedServer() Msg("Going to quit before starting dedicated server"); Msg("Working folder is:%s", g_sLaunchWorkingFolder); Msg("%s %s", g_sLaunchOnExit_app, g_sLaunchOnExit_params); +#endif Console->Execute("quit"); } diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp index c8fddf2cc15..6bae4f162af 100644 --- a/src/xrGame/ui/UITalkWnd.cpp +++ b/src/xrGame/ui/UITalkWnd.cpp @@ -384,8 +384,10 @@ void CUITalkWnd::PlaySnd(LPCSTR text) } strncpy_s(fn, sizeof(fn), path, xr_strlen(path)); +#ifndef LINUX // FIXME!!! strncat_s(fn, sizeof(fn), text, text_len); strncat_s(fn, sizeof(fn), ext, xr_strlen(ext)); +#endif // strconcat( sizeof(fn), fn, "characters_voice\\dialogs\\", text2, ".ogg" ); diff --git a/src/xrGame/xrGameSpyServer.cpp b/src/xrGame/xrGameSpyServer.cpp index fd27c155a75..feaed2ade70 100644 --- a/src/xrGame/xrGameSpyServer.cpp +++ b/src/xrGame/xrGameSpyServer.cpp @@ -60,8 +60,10 @@ xrGameSpyServer::EConnect xrGameSpyServer::Connect(shared_str& session_name, Gam { string1024 CompName; DWORD CompNameSize = 1024; +#ifndef LINUX // FIXME!!! if (GetComputerName(CompName, &CompNameSize)) HostName = CompName; +#endif } else HostName = game->get_option_s(*session_name, "hname", NULL); diff --git a/src/xrGame/xrServer.cpp b/src/xrGame/xrServer.cpp index 21324a2f4b9..006047e3eb0 100644 --- a/src/xrGame/xrServer.cpp +++ b/src/xrGame/xrServer.cpp @@ -829,7 +829,7 @@ void xrServer::Server_Client_Check(IClient* CL) { return; }; - +#ifndef LINUX // FIXME!!! if (CL->process_id == GetCurrentProcessId()) { CL->flags.bLocal = 1; @@ -840,6 +840,7 @@ void xrServer::Server_Client_Check(IClient* CL) { CL->flags.bLocal = 0; } +#endif }; bool xrServer::OnCL_QueryHost() @@ -985,8 +986,9 @@ void xrServer::create_direct_client() SClientConnectData cl_data; cl_data.clientID.set(1); xr_strcpy(cl_data.name, "single_player"); +#ifndef LINUX // FIXME!!! cl_data.process_id = GetCurrentProcessId(); - +#endif new_client(&cl_data); } diff --git a/src/xrNetServer/NET_Messages.h b/src/xrNetServer/NET_Messages.h index 521840eb839..0ad33be63ec 100644 --- a/src/xrNetServer/NET_Messages.h +++ b/src/xrNetServer/NET_Messages.h @@ -6,8 +6,12 @@ IC u32 net_flags( bool bReliable = false, bool bSequental = true, bool bHighPriority = false, bool bSendImmediatelly = false) { +#ifdef LINUX // FIXME!!! + return 0; +#else return (bReliable ? DPNSEND_GUARANTEED : DPNSEND_NOCOMPLETE) | (bSequental ? 0 : DPNSEND_NONSEQUENTIAL) | (bHighPriority ? DPNSEND_PRIORITY_HIGH : 0) | (bSendImmediatelly ? DPNSEND_IMMEDIATELLY : 0); +#endif } struct MSYS_CONFIG diff --git a/src/xrServerEntities/script_flags_script.cpp b/src/xrServerEntities/script_flags_script.cpp index c399d858214..48b5749646d 100644 --- a/src/xrServerEntities/script_flags_script.cpp +++ b/src/xrServerEntities/script_flags_script.cpp @@ -59,9 +59,11 @@ SCRIPT_EXPORT(Flags8, (), [ class_("flags8") .def(constructor<>()) +#ifndef LINUX // FIXME!!! .def("get", &Flags8::get) .def("zero", &Flags8::zero) .def("one", &one) +#endif .def("invert", (Flags8 & (Flags8::*)())(&Flags8::invert)) .def("invert", (Flags8 & (Flags8::*)(const Flags8&))(&Flags8::invert)) .def("invert", (Flags8 & (Flags8::*)(const Flags8::TYPE))(&Flags8::invert)) @@ -86,9 +88,11 @@ SCRIPT_EXPORT(Flags16, (), [ class_("flags16") .def(constructor<>()) +#ifndef LINUX // FIXME!!! .def("get", &Flags16::get) .def("zero", &Flags16::zero) .def("one", &one) +#endif .def("invert", (Flags16 & (Flags16::*)())(&Flags16::invert)) .def("invert", (Flags16 & (Flags16::*)(const Flags16&))(&Flags16::invert)) .def("invert", (Flags16 & (Flags16::*)(const Flags16::TYPE))(&Flags16::invert)) @@ -113,9 +117,11 @@ SCRIPT_EXPORT(Flags32, (), [ class_("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)) diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items_script.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Items_script.cpp index cd5e7aa2ee8..e60919d4ff7 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items_script.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeInventoryItem, (), { module(luaState)[class_("cse_alife_inventory_item") // .def( constructor()) @@ -51,3 +52,4 @@ SCRIPT_EXPORT(CSE_ALifeItemDetector, (CSE_ALifeItem), SCRIPT_EXPORT(CSE_ALifeItemArtefact, (CSE_ALifeItem), { module(luaState)[luabind_class_item1(CSE_ALifeItemArtefact, "cse_alife_item_artefact", CSE_ALifeItem)]; }); +#endif \ No newline at end of file diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items_script2.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Items_script2.cpp index 6d0caa48fb3..b9cb0312f76 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items_script2.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items_script2.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeItemPDA, (CSE_ALifeItem), { module(luaState)[luabind_class_item1(CSE_ALifeItemPDA, "cse_alife_item_pda", CSE_ALifeItem)]; }); @@ -39,3 +40,4 @@ SCRIPT_EXPORT(CSE_ALifeItemWeaponMagazined, (CSE_ALifeItemWeapon), { module(luaState)[luabind_class_item1( CSE_ALifeItemWeaponMagazined, "cse_alife_item_weapon_magazined", CSE_ALifeItemWeapon)]; }); +#endif \ No newline at end of file diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items_script3.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Items_script3.cpp index 4a41d880215..fef5ec45afa 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items_script3.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items_script3.cpp @@ -13,7 +13,9 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeItemWeaponMagazinedWGL, (CSE_ALifeItemWeaponMagazined), { module(luaState)[luabind_class_item1( CSE_ALifeItemWeaponMagazinedWGL, "cse_alife_item_weapon_magazined_w_gl", CSE_ALifeItemWeaponMagazined)]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp index 5fa262cf754..6e6857b85bb 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! #ifdef XRGAME_EXPORTS LPCSTR profile_name_script(CSE_ALifeTraderAbstract* ta) { return *ta->character_profile(); } SCRIPT_EXPORT(CSE_ALifeTraderAbstract, (), { @@ -53,3 +54,4 @@ SCRIPT_EXPORT(CSE_ALifeMonsterRat, (CSE_ALifeMonsterAbstract, CSE_ALifeInventory module(luaState)[luabind_class_monster2( CSE_ALifeMonsterRat, "cse_alife_monster_rat", CSE_ALifeMonsterAbstract, CSE_ALifeInventoryItem)]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script2.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script2.cpp index 60b877ed407..468a88f9979 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script2.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script2.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeCreatureCrow, (CSE_ALifeCreatureAbstract), { module(luaState) @@ -44,3 +45,4 @@ SCRIPT_EXPORT(CSE_ALifeHumanStalker, (CSE_ALifeHumanAbstract, CSE_PHSkeleton), luabind_class_monster2(CSE_ALifeHumanStalker, "cse_alife_human_stalker", CSE_ALifeHumanAbstract, CSE_PHSkeleton) ]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script3.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script3.cpp index 4e76ff97047..9441efc516e 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script3.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script3.cpp @@ -14,6 +14,7 @@ using namespace luabind; using namespace luabind::policy; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeCreatureActor, (CSE_ALifeCreatureAbstract, CSE_ALifeTraderAbstract, CSE_PHSkeleton), { module(luaState) @@ -87,3 +88,4 @@ static void CSE_ALifeOnlineOfflineGroup_Export(lua_State* luaState) } SCRIPT_EXPORT_FUNC(CSE_ALifeOnlineOfflineGroup, (CSE_ALifeDynamicObject, CSE_ALifeSchedulable), CSE_ALifeOnlineOfflineGroup_Export); +#endif \ No newline at end of file diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script4.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script4.cpp index 70dd14b32d6..368a7b17108 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script4.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters_script4.cpp @@ -69,6 +69,7 @@ void ForceSetGoodwill(CSE_ALifeMonsterAbstract* self, int goodwill, ALife::_OBJE static void CSE_ALifeMonsterAbstract_Export(lua_State* luaState) { +#ifndef LINUX // FIXME!!! module(luaState)[luabind_class_monster2( CSE_ALifeMonsterAbstract, "cse_alife_monster_abstract", CSE_ALifeCreatureAbstract, CSE_ALifeSchedulable) .def("smart_terrain_id", &smart_terrain_id) @@ -89,8 +90,9 @@ static void CSE_ALifeMonsterAbstract_Export(lua_State* luaState) .def("force_set_goodwill", &ForceSetGoodwill) #endif ]; +#endif } - +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT_FUNC( CSE_ALifeMonsterAbstract, (CSE_ALifeCreatureAbstract, CSE_ALifeSchedulable), CSE_ALifeMonsterAbstract_Export); @@ -112,3 +114,4 @@ SCRIPT_EXPORT_FUNC( SCRIPT_EXPORT(CSE_ALifePsyDogPhantom, (CSE_ALifeMonsterBase), { module(luaState)[luabind_class_monster1(CSE_ALifePsyDogPhantom, "cse_alife_psydog_phantom", CSE_ALifeMonsterBase)]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_script.cpp b/src/xrServerEntities/xrServer_Objects_ALife_script.cpp index b7da830df69..921999ca17e 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_script.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeSchedulable, (), { module(luaState)[class_("ipure_schedulable_object"), // .def( constructor<>()), @@ -76,3 +77,4 @@ SCRIPT_EXPORT(CSE_ALifeInventoryBox, (CSE_ALifeDynamicObjectVisual), { module(luaState)[luabind_class_dynamic_alife1( CSE_ALifeInventoryBox, "cse_alife_inventory_box", CSE_ALifeDynamicObjectVisual)]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_script2.cpp b/src/xrServerEntities/xrServer_Objects_ALife_script2.cpp index 2209a5c6a73..ef698823d5a 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_script2.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_script2.cpp @@ -13,6 +13,7 @@ using namespace luabind; +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeObjectProjector, (CSE_ALifeDynamicObjectVisual), { module(luaState)[luabind_class_dynamic_alife1( CSE_ALifeObjectProjector, "cse_alife_object_projector", CSE_ALifeDynamicObjectVisual)]; @@ -47,3 +48,4 @@ SCRIPT_EXPORT(CSE_ALifeTeamBaseZone, (CSE_ALifeSpaceRestrictor), { module(luaState)[luabind_class_dynamic_alife1( CSE_ALifeTeamBaseZone, "cse_alife_team_base_zone", CSE_ALifeSpaceRestrictor)]; }); +#endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_script3.cpp b/src/xrServerEntities/xrServer_Objects_ALife_script3.cpp index b2c9730e8c8..b6ad2f84917 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_script3.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_script3.cpp @@ -14,6 +14,7 @@ using namespace luabind; void set_yaw(CSE_ALifeObjectPhysic* obj, const float yaw) { obj->o_Angle.y = yaw; } +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT(CSE_ALifeObjectHangingLamp, (CSE_ALifeDynamicObjectVisual, CSE_PHSkeleton), { module(luaState)[luabind_class_dynamic_alife2( CSE_ALifeObjectHangingLamp, "cse_alife_object_hanging_lamp", CSE_ALifeDynamicObjectVisual, CSE_PHSkeleton)]; @@ -29,3 +30,4 @@ SCRIPT_EXPORT(CSE_ALifeSmartZone, (CSE_ALifeSpaceRestrictor, CSE_ALifeSchedulabl module(luaState)[luabind_class_zone2( CSE_ALifeSmartZone, "cse_alife_smart_zone", CSE_ALifeSpaceRestrictor, CSE_ALifeSchedulable)]; }); +#endif \ No newline at end of file diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp index 858c59c1654..4c28c71b79d 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp @@ -15,6 +15,7 @@ using namespace luabind; static void CSE_SmartCover_Export(lua_State* luaState) { +#ifndef LINUX // FIXME!!! module(luaState)[luabind_class_dynamic_alife1(CSE_SmartCover, "cse_smart_cover", CSE_ALifeDynamicObject) .def("description", &CSE_SmartCover::description) #ifndef AI_COMPILER @@ -24,6 +25,9 @@ static void CSE_SmartCover_Export(lua_State* luaState) .def("set_loopholes_table_checker", &CSE_SmartCover::set_loopholes_table_checker) #endif ]; +#endif } +#ifndef LINUX // FIXME!!! SCRIPT_EXPORT_FUNC(CSE_SmartCover, (CSE_ALifeDynamicObject), CSE_SmartCover_Export); +#endif