Port to SDL3

Author: HexDecimal

.github/workflows/cmake.yml

@@ -34,13 +34,18 @@ jobs:
             triplet: x64-linux
             platform-name: linux.x64
             butler-url: https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default
+            # libltdl-dev needed to build libxcrypt sub-dependency, others needed for sdl3
+            apt-packages: libltdl-dev libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev
 
     env:
       # Indicates the CMake build directory where project files and binaries are being produced.
       CMAKE_BUILD_DIR: ${{ github.workspace }}/build
       archive-name:
 
     steps:
+      - name: Install APT packages
+        if: matrix.apt-packages
+        run: sudo apt-get install ${{ matrix.apt-packages }}
       # fetch-depth=0 and v1 are needed for 'git describe' to work correctly.
       - uses: actions/checkout@v4
         with:

.vscode/settings.json

@@ -86,6 +86,24 @@
     "xtree": "cpp",
     "*.rh": "cpp",
     "set": "cpp",
-    "random": "cpp"
+    "random": "cpp",
+    "any": "cpp",
+    "bitset": "cpp",
+    "complex": "cpp",
+    "condition_variable": "cpp",
+    "coroutine": "cpp",
+    "expected": "cpp",
+    "fstream": "cpp",
+    "mutex": "cpp",
+    "source_location": "cpp",
+    "stop_token": "cpp",
+    "thread": "cpp",
+    "typeindex": "cpp",
+    "variant": "cpp",
+    "cfenv": "cpp",
+    "queue": "cpp",
+    "ranges": "cpp",
+    "span": "cpp",
+    "stack": "cpp"
   }
 }

CMakeLists.txt

@@ -39,13 +39,12 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE NO_LUA)
 
 add_subdirectory(umbra)
 
-find_package(SDL2 CONFIG REQUIRED)
+find_package(SDL3 CONFIG REQUIRED)
 find_package(libtcod CONFIG REQUIRED)
 target_link_libraries(
     ${PROJECT_NAME}
     PRIVATE
-        SDL2::SDL2
-        SDL2::SDL2main
+        SDL3::SDL3
         libtcod::libtcod
         umbra::umbra
 )

src/bas_aidirector.cpp

@@ -47,7 +47,7 @@ void AiDirector::setLevelCoef(float coef) {
 	levelCoef=coef;
 	waitTimer=0.0f;
 	float maxHorde=config.getIntProperty("config.aidirector.hordeDelay")* (1.0f-0.5f*coef);
-	hordeTimer=MIN(maxHorde,hordeTimer);
+	hordeTimer=std::min(maxHorde,hordeTimer);
 }
 void AiDirector::update(float elapsed) {
 	static float waveLength=config.getFloatProperty("config.aidirector.waveLength");
@@ -126,7 +126,7 @@ void AiDirector::spawnMiniBoss(Creature *cr, bool withItem) {
 void AiDirector::spawnMiniBosses() {
 	#define MAXNUM 2
 	int level=gameEngine->dungeon->level;
-	level=MIN(MAXNUM,level);
+	level=std::min(MAXNUM,level);
 	int typ=TCODRandom::getInstance()->getInt(0,level);
 	Creature *cr=NULL;
 	switch (typ) {

src/bas_entity.cpp

@@ -86,8 +86,8 @@ DynamicEntity::CollisionType DynamicEntity::updateMove(float elapsed, float boun
 					//  ##
 					//  ##
 					// .
-					float fdx=ABS(dx);
-					float fdy=ABS(dy);
+					float fdx=std::abs(dx);
+					float fdy=std::abs(dy);
 					if ( fdx >= fdy ) dy=-dy;
 					if ( fdy >= fdx ) dx=-dx;
 				} else if (! xwalk ) {
@@ -107,8 +107,8 @@ DynamicEntity::CollisionType DynamicEntity::updateMove(float elapsed, float boun
 			}
 		} else {
 			// on a walkable cell
-			if ( hitPlayer && ABS(curoldx - (int)gameEngine->player->x) < 2
-					&& ABS(curoldy - (int)gameEngine->player->y) < 2 ) {
+			if ( hitPlayer && std::abs(curoldx - (int)gameEngine->player->x) < 2
+					&& std::abs(curoldy - (int)gameEngine->player->y) < 2 ) {
 				x=oldx;y=oldy;
 				speed=0;
 				return PLAYER;

src/bas_entity.hpp

@@ -88,21 +88,21 @@ public :
 	}
 	// smallest rectangle containing this and r
 	void merge(const Rect &r) {
-		float minx = MIN(x,r.x);
-		float maxx = MAX(x+w,r.x+r.w);
-		float miny = MIN(y,r.y);
-		float maxy = MAX(y+h,r.y+r.h);
+		float minx = std::min(x,r.x);
+		float maxx = std::max(x+w,r.x+r.w);
+		float miny = std::min(y,r.y);
+		float maxy = std::max(y+h,r.y+r.h);
 		x = minx;
 		w = (int)(maxx-minx);
 		y = miny;
 		h = (int)(maxy-miny);
 	}
 	// intersection of this and r
 	void intersect(const Rect &r) {
-		float minx = MAX(x,r.x);
-		float maxx = MIN(x+w,r.x+r.w);
-		float miny = MAX(y,r.y);
-		float maxy = MIN(y+h,r.y+r.h);
+		float minx = std::max(x,r.x);
+		float maxx = std::min(x+w,r.x+r.w);
+		float miny = std::max(y,r.y);
+		float maxy = std::min(y+h,r.y+r.h);
 		x=minx;
 		y=miny;
 		w=(int)(maxx-minx);

src/bas_gameengine.cpp

@@ -96,10 +96,10 @@ void GameEngine::recomputeCanopy(Item *it) {
 		if (it) {
 			// reset only for one tree
 			Rect r(it->x*2-treeRadius-1,it->y*2-treeRadius-1,treeRadius*2+2,treeRadius*2+2);
-			r.x=MAX(0,r.x);
-			r.y=MAX(0,r.y);
-			r.w=(int)MIN(dungeon->width*2-1-r.x,r.w);
-			r.h=(int)MIN(dungeon->height*2-1-r.y,r.h);
+			r.x=std::max(0.0f,r.x);
+			r.y=std::max(0.0f,r.y);
+			r.w=std::min<int>(dungeon->width * 2 - 1 - r.x, r.w);
+			r.h=std::min<int>(dungeon->height * 2 - 1 - r.y, r.h);
 			for (int x=(int)r.x; x < (int)(r.x+r.w); x++) {
 				for (int y=(int)r.y; y < (int)(r.y+r.h); y++) {
 					if ( IN_RECTANGLE(x,y,dungeon->width*2,dungeon->height*2)) {
@@ -186,7 +186,7 @@ void GameEngine::computeAspectRatio() {
 void GameEngine::hitFlash() {
 	static float hitFlashDelay=config.getFloatProperty("config.display.hitFlashDelay");
 	hitFlashAmount+=hitFlashDelay;
-	hitFlashAmount=MIN(5*hitFlashDelay,hitFlashAmount);
+	hitFlashAmount=std::min(5*hitFlashDelay,hitFlashAmount);
 }
 
 TCODColor GameEngine::setSepia(const TCODColor &col, float coef) {

src/effects.cpp

@@ -263,7 +263,7 @@ bool DamageEffect::execute(int x, int y, Creature *cr, Creature *caster, Skill *
 			//new Bubble(cr->x,cr->y-1, cr->isPlayer ? TCODColor::lightRed : TCODColor::lightBlue, "blocked");
 			dmg=0;
 			//cr->curSta+=5;
-			//cr->curSta = MIN(cr->maxSta,cr->curSta);
+			//cr->curSta = std::min(cr->maxSta,cr->curSta);
 		}
 	}
 	if ( dmg > 0 ) {

src/input_movement.hpp

@@ -2,7 +2,7 @@
 #include <array>
 #include <tuple>
 
-#include <SDL.h>
+#include <SDL3/SDL_events.h>
 
 /// @brief Simple mapping of movement keys to directions.
 struct MoveKey {

src/item.cpp

@@ -985,11 +985,11 @@ Item *Item::getRandomWeapon(const char *typeName,ItemClass itemClass) {
         switch(modType) {
             case MOD_RELOAD :
                 weapon->reloadDelay -= rng->getFloat(0.05f, MAX_RELOAD_BONUS);
-                weapon->reloadDelay = MAX(0.1f,weapon->reloadDelay);
+                weapon->reloadDelay = std::max(0.1f,weapon->reloadDelay);
             break;
             case MOD_CAST :
                 weapon->castDelay -= rng->getFloat(0.05f, MAX_CAST_BONUS);
-                weapon->castDelay = MAX(0.1f,weapon->reloadDelay);
+                weapon->castDelay = std::max(0.1f,weapon->reloadDelay);
             break;
             case MOD_MODIFIER :
                 ItemModifierId id=(ItemModifierId)0;
@@ -1007,7 +1007,7 @@ Item *Item::getRandomWeapon(const char *typeName,ItemClass itemClass) {
         }
 	}
 	weapon->damages += weapon->damages * (int)(itemClass)*0.2f; // 20% increase per color level
-	weapon->damages = MIN(1.0f,weapon->damages);
+	weapon->damages = std::min(1.0f,weapon->damages);
 	// build components
 	weapon->generateComponents();
     return weapon;
@@ -1308,8 +1308,8 @@ void Item::renderGenericDescription(int x, int y, bool below, bool frame) {
 		float maxDamages = 15 * (featAttack->maxCastDelay + featAttack->maxReloadDelay ) * featAttack->maxDamagesCoef;
     	minDamages += minDamages * (int)(itemClass)*0.2f;
     	maxDamages += maxDamages * (int)(itemClass)*0.2f;
-    	minDamages=(int)MIN(1.0f,minDamages);
-    	maxDamages=(int)MIN(1.0f,maxDamages);
+    	minDamages=std::min<int>(1.0f,minDamages);
+    	maxDamages=std::min<int>(1.0f,maxDamages);
 
 		if ( minDamages != maxDamages ) {
 			descCon->print(CON_W/4,cy++,"%d-%d damages/hit", (int)minDamages,(int)maxDamages);
@@ -1530,8 +1530,8 @@ bool Item::update(float elapsed, TCOD_key_t key, TCOD_mouse_t *mouse) {
 						//  ##
 						//  ##
 						// .
-						float fdx=ABS(dx);
-						float fdy=ABS(dy);
+						float fdx=std::abs(dx);
+						float fdy=std::abs(dy);
 						if ( fdx >= fdy ) dy=-dy;
 						if ( fdy >= fdx ) dx=-dx;
 					} else if (! xwalk ) {
@@ -1552,8 +1552,8 @@ bool Item::update(float elapsed, TCOD_key_t key, TCOD_mouse_t *mouse) {
 			} else {
 				ItemFeatureAttack *feat=(ItemFeatureAttack *)getFeature(ItemFeature::ATTACK);
 				if ( feat ) {
-					if (!owner->isPlayer() && ABS(curoldx - (int)gameEngine->player->x) < 2
-						&& ABS(curoldy - (int)gameEngine->player->y) < 2 ) {
+					if (!owner->isPlayer() && std::abs(curoldx - (int)gameEngine->player->x) < 2
+						&& std::abs(curoldy - (int)gameEngine->player->y) < 2 ) {
 							// a projectile hits the player
 							gameEngine->player->takeDamage(TCODRandom::getInstance()->getFloat(feat->minDamagesCoef,feat->maxDamagesCoef));
 							x=oldx;y=oldy;