martysama0134

GC_QUEST_INFO refactory

Apr 17th, 2022
1,127
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.60 KB | None | 0 0
  1.  s3ll_server/Srcs/Server/game/src/questpc.cpp | 50 +++++++++++++---------------
  2.  1 file changed, 23 insertions(+), 27 deletions(-)
  3.  
  4. diff --git a/s3ll_server/Srcs/Server/game/src/questpc.cpp b/s3ll_server/Srcs/Server/game/src/questpc.cpp
  5. index 499603a..4f30d26 100644
  6. --- a/s3ll_server/Srcs/Server/game/src/questpc.cpp
  7. +++ b/s3ll_server/Srcs/Server/game/src/questpc.cpp
  8. @@ -244,64 +244,60 @@ namespace quest
  9.  #endif
  10.  
  11.         TEMP_BUFFER buf;
  12. -       buf.write(&qi, sizeof(qi));
  13. -
  14.         if (m_iSendToClient & QUEST_SEND_ISBEGIN)
  15.         {
  16.             BYTE temp = m_RunningQuestState->bStart?1:0;
  17.             buf.write(&temp,1);
  18. -           qi.size+=1;
  19. -
  20. +           qi.size+=sizeof(temp);
  21.             sys_log(1, "QUEST BeginFlag %d", (int)temp);
  22.         }
  23.         if (m_iSendToClient & QUEST_SEND_TITLE)
  24.         {
  25. -           m_RunningQuestState->_title.reserve(30+1);
  26. -           buf.write(m_RunningQuestState->_title.c_str(), 30+1);
  27. -           qi.size+=30+1;
  28. -
  29. +           constexpr auto TitleSize = 30+1;
  30. +           m_RunningQuestState->_title.reserve(TitleSize);
  31. +           buf.write(m_RunningQuestState->_title.c_str(), TitleSize);
  32. +           qi.size+=TitleSize;
  33.             sys_log(1, "QUEST Title %s", m_RunningQuestState->_title.c_str());
  34.         }
  35.         if (m_iSendToClient & QUEST_SEND_CLOCK_NAME)
  36.         {
  37. -           m_RunningQuestState->_clock_name.reserve(16+1);
  38. -           buf.write(m_RunningQuestState->_clock_name.c_str(), 16+1);
  39. -           qi.size+=16+1;
  40. -
  41. +           constexpr auto ClockSize = 16+1;
  42. +           m_RunningQuestState->_clock_name.reserve(ClockSize);
  43. +           buf.write(m_RunningQuestState->_clock_name.c_str(), ClockSize);
  44. +           qi.size+=ClockSize;
  45.             sys_log(1, "QUEST Clock Name %s", m_RunningQuestState->_clock_name.c_str());
  46.         }
  47.         if (m_iSendToClient & QUEST_SEND_CLOCK_VALUE)
  48.         {
  49. -           buf.write(&m_RunningQuestState->_clock_value, sizeof(int));
  50. -           qi.size+=4;
  51. -
  52. +           buf.write(&m_RunningQuestState->_clock_value, sizeof(m_RunningQuestState->_clock_value));
  53. +           qi.size+=sizeof(m_RunningQuestState->_clock_value);
  54.             sys_log(1, "QUEST Clock Value %d", m_RunningQuestState->_clock_value);
  55.         }
  56.         if (m_iSendToClient & QUEST_SEND_COUNTER_NAME)
  57.         {
  58. -           m_RunningQuestState->_counter_name.reserve(16+1);
  59. -           buf.write(m_RunningQuestState->_counter_name.c_str(), 16+1);
  60. -           qi.size+=16+1;
  61. -
  62. +           constexpr auto CounterSize = 16+1;
  63. +           m_RunningQuestState->_counter_name.reserve(CounterSize);
  64. +           buf.write(m_RunningQuestState->_counter_name.c_str(), CounterSize);
  65. +           qi.size+=CounterSize;
  66.             sys_log(1, "QUEST Counter Name %s", m_RunningQuestState->_counter_name.c_str());
  67.         }
  68.         if (m_iSendToClient & QUEST_SEND_COUNTER_VALUE)
  69.         {
  70. -           buf.write(&m_RunningQuestState->_counter_value, sizeof(int));
  71. -           qi.size+=4;
  72. -
  73. +           buf.write(&m_RunningQuestState->_counter_value, sizeof(m_RunningQuestState->_counter_value));
  74. +           qi.size+=sizeof(m_RunningQuestState->_counter_value);
  75.             sys_log(1, "QUEST Counter Value %d", m_RunningQuestState->_counter_value);
  76.         }
  77.         if (m_iSendToClient & QUEST_SEND_ICON_FILE)
  78.         {
  79. -           m_RunningQuestState->_icon_file.reserve(24+1);
  80. -           buf.write(m_RunningQuestState->_icon_file.c_str(), 24+1);
  81. -           qi.size+=24+1;
  82. -
  83. +           constexpr auto IconSize = 24+1;
  84. +           m_RunningQuestState->_icon_file.reserve(IconSize);
  85. +           buf.write(m_RunningQuestState->_icon_file.c_str(), IconSize);
  86. +           qi.size+=IconSize;
  87.             sys_log(1, "QUEST Icon File %s", m_RunningQuestState->_icon_file.c_str());
  88.         }
  89.  
  90. -       CQuestManager::instance().GetCurrentCharacterPtr()->GetDesc()->Packet(buf.read_peek(),buf.size());
  91. +       CQuestManager::instance().GetCurrentCharacterPtr()->GetDesc()->BufferedPacket(&qi, sizeof(qi));
  92. +       CQuestManager::instance().GetCurrentCharacterPtr()->GetDesc()->Packet(buf.read_peek(), buf.size());
  93.  
  94.         m_iSendToClient = 0;
  95.  
  96.  
Advertisement
Add Comment
Please, Sign In to add comment