From 5cfe00df82a69f44187b1cd77fe3d6865cf3425f Mon Sep 17 00:00:00 2001 From: fusion32 Date: Tue, 1 Jul 2025 09:26:06 -0300 Subject: `reader.cc` --- src/writer.cc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/writer.cc') diff --git a/src/writer.cc b/src/writer.cc index f4d5589..dbe0cb0 100644 --- a/src/writer.cc +++ b/src/writer.cc @@ -197,8 +197,7 @@ void InsertOrder(TWriterThreadOrderType OrderType, const void *Data){ void GetOrder(TWriterThreadOrder *Order){ OrderBufferFull.down(); - int ReadPos = OrderPointerRead % NARRAY(OrderBuffer); - *Order = OrderBuffer[ReadPos]; + *Order = OrderBuffer[OrderPointerRead % NARRAY(OrderBuffer)]; OrderPointerRead += 1; OrderBufferEmpty.up(); } @@ -857,6 +856,15 @@ void InsertReply(TWriterThreadReplyType ReplyType, const void *Data){ ReplyPointerWrite += 1; } +bool GetReply(TWriterThreadReply *Reply){ + bool Result = (ReplyPointerRead < ReplyPointerWrite); + if(Result){ + *Reply = ReplyBuffer[ReplyPointerRead % NARRAY(ReplyBuffer)]; + ReplyPointerRead += 1; + } + return Result; +} + void BroadcastReply(const char *Text, ...){ if(Text == NULL){ error("BroadcastReply: Kein Text angegeben.\n"); @@ -905,15 +913,6 @@ void LogoutReply(const char *PlayerName){ InsertReply(WRITER_REPLY_LOGOUT, Data); } -bool GetReply(TWriterThreadReply *Reply){ - bool Result = (ReplyPointerRead < ReplyPointerWrite); - if(Result){ - *Reply = ReplyBuffer[ReplyPointerRead % NARRAY(ReplyBuffer)]; - ReplyPointerRead += 1; - } - return Result; -} - void ProcessBroadcastReply(TBroadcastReplyData *Data){ if(Data == NULL){ error("ProcessBroadcastReply: Keine Daten übergeben.\n"); @@ -981,7 +980,7 @@ void ProcessWriterThreadReplies(void){ } } -// Writer Initialization +// Initialization // ============================================================================= void ClearPlayers(void){ int NumberOfAffectedPlayers; -- cgit v1.2.3