Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BACKEND: renamed flatbuffer root message to AIRootMessage 

windows and some preprocessor crap renames this to GetMessageA - which is of course neither linked nor
available. The proper fix would be to ban <windows.h> from ... everything. But unfortunately this is
not very easy
master
Martin Gerhardy 2021-04-27 23:22:41 +02:00
parent 08223e4b25
commit ab59a4d2ae
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/ai-shared/protocol/AIMessages.fbs
View File

@ -160,8 +160,8 @@ union MsgType {
ExecuteCommand
}
table Message {
table AIRootMessage {
data:MsgType;
}
root_type Message;
root_type AIRootMessage;

4
src/modules/backend/entity/ai/server/AIMessageSender.cpp
View File

@ -21,8 +21,8 @@ ENetPacket* AIMessageSender::createServerPacket(ai::MsgType type, const void * d
}
ENetPacket* AIMessageSender::createServerPacket(FlatBufferBuilder& fbb, ai::MsgType type, Offset<void> data, uint32_t flags) {
auto msg = CreateMessage(fbb, type, data);
FinishMessageBuffer(fbb, msg);
auto msg = CreateAIRootMessage(fbb, type, data);
FinishAIRootMessageBuffer(fbb, msg);
return createServerPacket(type, fbb.GetBufferPointer(), fbb.GetSize(), flags);
}

4
src/modules/backend/entity/ai/server/AIServerNetwork.cpp
View File

@ -17,11 +17,11 @@ AIServerNetwork::AIServerNetwork(const ProtocolHandlerRegistryPtr& protocolHandl
bool AIServerNetwork::packetReceived(ENetEvent& event) {
flatbuffers::Verifier v(event.packet->data, event.packet->dataLength);
if (!ai::VerifyMessageBuffer(v)) {
if (!ai::VerifyAIRootMessageBuffer(v)) {
Log::error("Illegal ai packet received with length: %i", (int)event.packet->dataLength);
return false;
}
const ai::Message *req = ai::GetMessage(event.packet->data);
const ai::AIRootMessage *req = ai::GetAIRootMessage(event.packet->data);
ai::MsgType type = req->data_type();
const char *clientMsgType = ai::EnumNameMsgType(type);
ProtocolHandlerPtr handler = _protocolHandlerRegistry->getHandler(type);

4
src/tools/aidebug/network/AINetwork.cpp
View File

@ -18,11 +18,11 @@ AINetwork::AINetwork(const ProtocolHandlerRegistryPtr& protocolHandlerRegistry,
bool AINetwork::packetReceived(ENetEvent& event) {
flatbuffers::Verifier v(event.packet->data, event.packet->dataLength);
if (!ai::VerifyMessageBuffer(v)) {
if (!ai::VerifyAIRootMessageBuffer(v)) {
Log::error("Illegal server packet received with length: %i", (int)event.packet->dataLength);
return false;
}
const ai::Message *req = ai::GetMessage(event.packet->data);
const ai::AIRootMessage *req = ai::GetAIRootMessage(event.packet->data);
ai::MsgType type = req->data_type();
const char *typeName = ai::EnumNameMsgType(type);
const ProtocolHandlerPtr& handler = _protocolHandlerRegistry->getHandler(type);

4
src/tools/aidebug/network/MessageSender.cpp
View File

@ -9,8 +9,8 @@
namespace network {
inline ENetPacket* createPacket(FlatBufferBuilder& fbb, ai::MsgType type, Offset<void> data, uint32_t flags) {
auto msg = CreateMessage(fbb, type, data);
FinishMessageBuffer(fbb, msg);
auto msg = CreateAIRootMessage(fbb, type, data);
FinishAIRootMessageBuffer(fbb, msg);
ENetPacket* packet = enet_packet_create(fbb.GetBufferPointer(), fbb.GetSize(), flags);
Log::trace("Create package: %s - size %u", EnumNameMsgType(type), fbb.GetSize());
return packet;