Merge pull request #444 from DragonAura/dev

fix(CAPI): 🐛 fix windows get message define

CAPI/cpp/API/include/AI.h

@@ -4,6 +4,10 @@
 
 #include "API.h"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 class IAI
 {
 public:

CAPI/cpp/API/include/API.h

@@ -22,6 +22,10 @@
 
 #include "structures.h"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 const constexpr int numOfGridPerCell = 1000;
 
 class IAI;

CAPI/cpp/API/include/Communication.h

@@ -14,6 +14,10 @@
 #include <queue>
 #include <atomic>
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 class Logic;
 
 class Communication

CAPI/cpp/API/include/ConcurrentQueue.hpp

@@ -8,6 +8,10 @@
 #include <utility>
 #include <optional>
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 template<typename Elem>
 class ConcurrentQueue
 {

CAPI/cpp/API/include/constants.h

@@ -6,6 +6,10 @@
 #define SCCI static const constexpr inline
 #endif
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 namespace Constants
 {
     SCCI int frameDuration = 50;  // 每帧毫秒数

CAPI/cpp/API/include/logic.h

@@ -31,6 +31,10 @@
 #include "Communication.h"
 #include "ConcurrentQueue.hpp"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 // 封装了通信组件和对AI对象进行操作
 class Logic : public ILogic
 {

CAPI/cpp/API/include/state.h

@@ -9,6 +9,10 @@
 
 #include "structures.h"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 // 存储场上的状态
 struct State
 {

CAPI/cpp/API/include/structures.h

@@ -8,6 +8,10 @@
 #include <vector>
 #include <string>
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 namespace THUAI6
 {
 

CAPI/cpp/API/include/utils.hpp

@@ -13,6 +13,10 @@
 
 #include "structures.h"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 namespace AssistFunction
 {
 

CAPI/cpp/API/src/API.cpp

@@ -1,6 +1,11 @@
 #include <optional>
 #include "AI.h"
 #include "API.h"
+
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 #define PI 3.14159265358979323846
 
 int StudentAPI::GetFrameCount() const

CAPI/cpp/API/src/Communication.cpp

@@ -5,6 +5,10 @@
 #include <mutex>
 #include <condition_variable>
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 using grpc::ClientContext;
 
 Communication::Communication(std::string sIP, std::string sPort)

CAPI/cpp/API/src/DebugAPI.cpp

@@ -4,6 +4,11 @@
 #include "API.h"
 #include "utils.hpp"
 #include "structures.h"
+
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 #define PI 3.14159265358979323846
 
 StudentDebugAPI::StudentDebugAPI(ILogic& logic, bool file, bool print, bool warnOnly, int64_t playerID) :

CAPI/cpp/API/src/logic.cpp

@@ -8,6 +8,10 @@
 #include "utils.hpp"
 #include "Communication.h"
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 extern const bool asynchronous;
 
 Logic::Logic(THUAI6::PlayerType type, int64_t ID, THUAI6::TrickerType tricker, THUAI6::StudentType student) :

CAPI/cpp/API/src/main.cpp

@@ -4,6 +4,10 @@
 #include <tclap/CmdLine.h>
 #include <array>
 
+#undef GetMessage
+#undef SendMessage
+#undef PeekMessage
+
 #ifdef _MSC_VER
 #pragma warning(disable : 4996)
 #endif

CAPI/python/run.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 0 -d -o&
-python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 1 -o&
+python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 0&
+# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 1 -o&
 # python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 2&
 # python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 3&
-# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 4&
+python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 4 -d&