mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-05 08:26:32 +00:00
Code Issues Releases Wiki Activity

Revert "Merge branch '0.7.1-window-input' into 0.7.1"

Browse source 
This reverts commit 94f5b169e6, reversing
changes made to 43e7df6df8.

# Conflicts:
#	apps/openmw-mp/handleInput.cpp
This commit is contained in:
David Cernat 2022-02-10 16:15:49 +02:00
parent d7044db179
commit 15fdac3f6c
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/openmw-mp/Networking.cpp
View file

@ -25,8 +25,6 @@
#include "processors/ObjectProcessor.hpp" #include "processors/ObjectProcessor.hpp"
#include "processors/WorldstateProcessor.hpp" #include "processors/WorldstateProcessor.hpp"
#include "handleInput.cpp"
using namespace mwmp; using namespace mwmp;
Networking *Networking::sThis = 0; Networking *Networking::sThis = 0;
@ -497,20 +495,6 @@ void signalHandler(int signum)
} }
} }
#ifdef _WIN32
BOOL WINAPI sigIntHandler(_In_ DWORD dwCtrlType) {
switch (dwCtrlType)
{
case CTRL_C_EVENT:
signalHandler(15);
return TRUE;
default:
// Pass signal on to the next handler
return FALSE;
}
}
#endif
int Networking::mainLoop() int Networking::mainLoop()
{ {
RakNet::Packet *packet; RakNet::Packet *packet;
@ -521,15 +505,16 @@ int Networking::mainLoop()
sigIntHandler.sa_handler = signalHandler; sigIntHandler.sa_handler = signalHandler;
sigemptyset(&sigIntHandler.sa_mask); sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0; sigIntHandler.sa_flags = 0;
sigaction(SIGTERM, &sigIntHandler, NULL);
sigaction(SIGINT, &sigIntHandler, NULL);
#else
SetConsoleCtrlHandler(sigIntHandler, TRUE);
#endif #endif
while (running and !killLoop) while (running and !killLoop)
{ {
mwmp_input::handler(); #ifndef _WIN32
sigaction(SIGTERM, &sigIntHandler, NULL);
sigaction(SIGINT, &sigIntHandler, NULL);
#endif
if (kbhit() && getch() == '\n')
break;
for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive()) for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive())
{ {
if (getMasterClient()->Process(packet)) if (getMasterClient()->Process(packet))

3
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

@ -220,8 +220,7 @@ public:
{"OnClientScriptLocal", Callback<unsigned short, const char*>()}, {"OnClientScriptLocal", Callback<unsigned short, const char*>()},
{"OnClientScriptGlobal", Callback<unsigned short>()}, {"OnClientScriptGlobal", Callback<unsigned short>()},
{"OnMpNumIncrement", Callback<int>()}, {"OnMpNumIncrement", Callback<int>()},
{"OnRequestDataFileList", Callback<>()}, {"OnRequestDataFileList", Callback<>()}
{"OnServerWindowInput", Callback<const char *>()}
}; };
}; };