Update twbl

Author: ChillerDragon

CMakeLists.txt

@@ -2815,22 +2815,30 @@ if(SERVER)
   set(TWBL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src/external/TeeworldsBotLib)
   include_directories(${TWBL_ROOT}/src)
   FILE(GLOB TWBL_SRC
-    ${TWBL_ROOT}/src/shared/*.cpp
-    ${TWBL_ROOT}/src/shared/*.h
+    ${TWBL_ROOT}/src/twbl/*/*.cpp
+    ${TWBL_ROOT}/src/twbl/*/*.h
+    ${TWBL_ROOT}/src/twbl/*.cpp
+    ${TWBL_ROOT}/src/twbl/*.h
+    ${TWBL_ROOT}/src/bots/*/*.cpp
+    ${TWBL_ROOT}/src/bots/*/*.h
     ${TWBL_ROOT}/src/bots/*.cpp
     ${TWBL_ROOT}/src/bots/*.h
+    ${TWBL_ROOT}/src/engines/*/*.cpp
+    ${TWBL_ROOT}/src/engines/*/*.h
+    ${TWBL_ROOT}/src/engines/*.cpp
+    ${TWBL_ROOT}/src/engines/*.h
+    ${TWBL_ROOT}/src/server/*.cpp
+    ${TWBL_ROOT}/src/server/*.h
   )
 
-  add_library(twbl_bottick_lite SHARED ${TWBL_SRC})
-  target_compile_options(twbl_bottick_lite PRIVATE -std=gnu++20)
-
   set(SERVER_SRC ${SERVER_SRC} ${TWBL_SRC})
   add_library(twbl_bottick SHARED
     ${GAME_SHARED}
     ${TWBL_SRC}
     ${GAME_GENERATED_SHARED})
 
   target_compile_options(twbl_bottick PRIVATE -std=gnu++20)
+  target_compile_options(twbl_bottick PRIVATE -Wno-deprecated-enum-float-conversion) # c++20 arithmetic between floating-point type and enumeration type
   target_compile_definitions(twbl_bottick PRIVATE TWBL_SHARED_OBJECT=1)
 
   target_include_directories(twbl_bottick PRIVATE src)

src/external/TeeworldsBotLib

@@ -4,6 +4,7 @@
 #include "laser.h"
 #include "pickup.h"
 #include "projectile.h"
+#include "twbl/state.h"
 
 #include <antibot/antibot_data.h>
 
@@ -21,10 +22,10 @@
 #include <game/server/score.h>
 #include <game/server/teams.h>
 
-#include <bots/sample.h>
+#include <bots/sample/sample.h>
 #include <server/set_state.h>
-#include <shared/hotreload.h>
-#include <shared/types.h>
+#include <twbl/hotreload.h>
+#include <twbl/types.h>
 
 MACRO_ALLOC_POOL_ID_IMPL(CCharacter, MAX_CLIENTS)
 
@@ -776,21 +777,28 @@ void CCharacter::Tick()
 {
 	if(GetPlayer()->GetCid() > 60)
 	{
-		CServerBotStateOut Bot;
 		CServerBotStateIn State;
+		CServerBotStateOut Bot;
 
 		TWBL::SetState(this, &State);
+		State.m_GameTick = GameServer()->Server()->Tick();
 		State.m_pCollision = Collision();
 		State.m_ppPlayers = GameServer()->m_apPlayers;
+		State.m_pCallbackCtx = &GameServer()->m_TwblCallbackCtx;
+
+		// nicer would be a member variable and not calling Init every tick
+		static TWBL::CHotreloader s_Hotreloader;
+		s_Hotreloader.Init("./libtwbl_bottick.so", "Follow");
 
-		static TWBL::CHotreloader Hotreloader("./libtwbl_bottick.so", "Follow");
 		FTwbl_BotTick BotTick;
-		void *pHandle = Hotreloader.LoadTick(&BotTick);
+		void *pHandle = s_Hotreloader.LoadTick(&BotTick);
+
+		CTwblPersistentState *pPersistentState = &GameServer()->m_aTwblPersistentState[GetPlayer()->GetCid()];
 
 		if(pHandle)
-			BotTick(&State, &Bot);
+			BotTick(&State, &Bot, pPersistentState, sizeof(*pPersistentState));
 		else
-			Twbl_SampleTick(&State, &Bot);
+			Twbl_SampleTick(&State, &Bot, pPersistentState, sizeof(*pPersistentState));
 
 		BotTick = nullptr;
 		TWBL_SET_INPUT(m_SavedInput, Bot);

src/game/server/entities/character.cpp

@@ -12,6 +12,11 @@
 #include <game/mapbugs.h>
 #include <game/voting.h>
 
+// twbl
+#include <server/ddnet_callback_ctx.h>
+#include <twbl/state.h>
+
+#include "engine/shared/protocol.h"
 #include "eventhandler.h"
 #include "gameworld.h"
 #include "teehistorian.h"
@@ -624,6 +629,9 @@ class CGameContext : public IGameServer
 	void OnSetAuthed(int ClientId, int Level) override;
 
 	void ResetTuning();
+
+	TWBL::CDDNetCallbackCtx m_TwblCallbackCtx;
+	CTwblPersistentState m_aTwblPersistentState[MAX_CLIENTS];
 };
 
 static inline bool CheckClientId(int ClientId)