diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-10 12:04:40 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-10 12:04:40 +0000 |
commit | f95eeaf7db6ca1bfbb34c05fdad9ed9bb603b1c8 (patch) | |
tree | 1648438f1ddf9c11ea7cc5f7825a8d19266f00a5 /games-action/dxx-rebirth/files | |
parent | 27ecae7b5eb4c80903720ae76a54a68af3447c31 (diff) |
gentoo auto-resync : 10:03:2023 - 12:04:40
Diffstat (limited to 'games-action/dxx-rebirth/files')
-rw-r--r-- | games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch new file mode 100644 index 000000000000..3681385976a6 --- /dev/null +++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/894678 +https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49 + +From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001 +From: Kp <kp@valhallalegends.com> +Date: Sat, 28 May 2022 21:04:37 +0000 +Subject: [PATCH] Use static_cast<> to convert player_marker_num to + game_marker_index + +gcc-12 rejects the list initialization syntax. Switch to static_cast<>, +which generates equivalent code. + +Reported-by: dbermond <https://github.com/dxx-rebirth/dxx-rebirth/issues/638> +--- a/similar/main/automap.cpp ++++ b/similar/main/automap.cpp +@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo + return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COOP) + static_cast<unsigned>(player_marker_num)); + if (game_mode & GM_MULTI) + return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast<unsigned>(player_marker_num)); +- return game_marker_index{player_marker_num}; ++ return static_cast<game_marker_index>(player_marker_num); + } + + unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers) + |