Automated build commit

* push back instead of direct assignment

* remove i

ci/post/release.mako

@@ -9,7 +9,7 @@ PLACEHOLDER
 
 Deprecations are a mechanism in FSO where a certain feature or aspect of the engine has changed or is no longer supported. Since this would normally break existing mods, we have the mod table feature "[tt]$Target Version:[/tt]" with which a mod can specify what version of FSO it was developed with. Any features listed under Deprecations will be removed or changed when the target version of a mod is at least the version released in this post.
 
-[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=99015.0]23.2.1 Release Thread[/url][/size]
+[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=99166.0]24.0.0 Release Thread[/url][/size]
 
 Launchers, if you don't have one already:
 [b]All platforms: [/b] For every day use, we recommend [url=https://knossosnet.github.io/Knossos-Release-Page/]Knossos.NET[/url], an integrated solution for downloading and launching mods.

code/globalincs/globals.h

@@ -72,6 +72,7 @@
 #define MAX_POLYGON_MODELS  300
 
 // object.h
+//If this value exceeds 2^16-1, this will break collision pair caching as is. Proceed with caution.
 #define MAX_OBJECTS			5000	//Increased from 3500 to 5000 in 2022	
 
 // from weapon.h (and beam.h)

code/graphics/2d.cpp

@@ -460,7 +460,7 @@ static auto PostProcessOption __UNUSED = options::OptionBuilder<bool>("Graphics.
                      std::pair<const char*, int>{"Controls whether post processing is enabled in the engine.", 1727})
                      .category("Graphics")
                      .level(options::ExpertLevel::Advanced)
-                     .default_val(false)
+                     .default_val(true)
                      .bind_to_once(&Gr_post_processing_enabled)
                      .importance(69)
                      .finish();

code/hud/hudartillery.cpp

@@ -328,7 +328,7 @@ void ssm_create(object *target, vec3d *start, size_t ssm_index, ssm_firing_info
 
 	count = Ssm_info[ssm_index].count;
 	if (Ssm_info[ssm_index].max_count != -1 && (Ssm_info[ssm_index].max_count - count) > 0) {
-		count += Random::next(count, Ssm_info[ssm_index].max_count);
+		count = Random::next(count, Ssm_info[ssm_index].max_count);
 	}
 
 	// override in multiplayer

code/hud/hudconfig.cpp

@@ -1323,10 +1323,8 @@ void hud_config_button_do(int n)
 			break;
 		}
 
-		if (HC_current_file >= (int)HC_preset_filenames.size()) {
+		if ((++HC_current_file) >= static_cast<int> (HC_preset_filenames.size())) {
 			HC_current_file = 0;
-		} else {
-			HC_current_file++;
 		}
 
 		// load em up		

code/missionui/missiondebrief.cpp

@@ -1963,7 +1963,9 @@ void debrief_init(bool API_Access)
 	// be backed out if used chooses to replace them.
 	scoring_level_close();
 
-	debrief_ui_init(); // init UI items
+	if (!API_Access) {
+		debrief_ui_init(); // init UI items
+	}
 	debrief_award_init();
 	show_stats_init();
 	debrief_voice_init();

code/model/animation/modelanimation.cpp

@@ -299,13 +299,15 @@ namespace animation {
 		
 		if (direction == ModelAnimationDirection::RWD) {
 			instanceData.state = ModelAnimationState::RUNNING;
-			instanceData.time -= timeOffset;
+			instanceData.time -= timeOffset; 
+			instanceData.canonicalDirection = ModelAnimationDirection::RWD;
 			if (force)
 				instanceData.time = instant ? 0 : instanceData.duration - timeOffset;
 		}
 		else {
 			instanceData.state = ModelAnimationState::RUNNING;
 			instanceData.time += timeOffset;
+			instanceData.canonicalDirection = ModelAnimationDirection::FWD;
 			if (force)
 				instanceData.time = instant ? instanceData.duration : 0 + timeOffset;
 		}

code/object/objcollide.cpp

@@ -27,6 +27,8 @@ int Num_pairs_checked = 0;
 
 SCP_vector<int> Collision_sort_list;
 
+static_assert(1 << collision_cache_bitshift > MAX_OBJECTS, "Collision pair caching currently relies on the highest possible objnum being less than 2^collision_cache_bitshift.");
+
 class collider_pair
 {
 public:
@@ -867,7 +869,7 @@ void obj_collide_pair(object *A, object *B)
     }
 
     bool valid = false;
-    uint key = (OBJ_INDEX(A) << 12) + OBJ_INDEX(B);
+    uint key = (OBJ_INDEX(A) << collision_cache_bitshift) + OBJ_INDEX(B);
 
     collider_pair* collision_info = &Collision_cached_pairs[key];
 

code/object/objcollide.h

@@ -43,6 +43,8 @@ struct collision_info_struct {
 #define MIN_LANDING_SOUND_VEL			2.0f
 #define LANDING_POS_OFFSET				0.05f
 
+constexpr uint32_t collision_cache_bitshift = 16;
+
 //===============================================================================
 // GENERAL COLLISION DETECTION HELPER FUNCTIONS 
 // These are in CollideGeneral.cpp and are used by one or more of the collision-

code/parse/sexp.cpp

@@ -5216,7 +5216,8 @@ int eval_num(int n, bool &is_nan, bool &is_nan_forever)
 	Assert(n >= 0);
 
 	int op_n = CAR(n);
-	if (op_n >= 0)				// if argument is a sexp
+	// CAR() of a container data node is the container modifier
+	if (op_n >= 0 && Sexp_nodes[n].subtype != SEXP_ATOM_CONTAINER_DATA) // if argument is a sexp
 	{
 		int val = eval_sexp(op_n);
 
@@ -16130,14 +16131,12 @@ void sexp_set_asteroid_field(int n)
 
 	SCP_vector<SCP_string> targets;
 	if (n >= 0) {
-		int i = 0;
 		for (; n >= 0; true ? n = CDR(n) : n = -1) {
 			auto ship_entry = eval_ship(n);
 			if (!ship_entry)
 				continue;
 
-			targets[i] = ship_entry->name;
-			i++;
+			targets.push_back(ship_entry->name);
 		}
 	}
 

fred2/sexp_tree.cpp

@@ -916,7 +916,8 @@ void sexp_tree::right_clicked(int mode)
 							// Replace Container Data submenu
 							// disallowed on variable-type SEXP args, to prevent FSO/FRED crashes
 							// also disallowed for special argument options (not supported for now)
-							if (op_type != OPF_VARIABLE_NAME && !is_argument_provider_op(Operators[op].value)) {
+							// op < 0 means we're on a container modifier, and nested Replace Container Data is allowed
+							if (op_type != OPF_VARIABLE_NAME && (op < 0 || !is_argument_provider_op(Operators[op].value))) {
 								int container_data_index = 0;
 								for (const auto &container : get_all_sexp_containers()) {
 									UINT flags = MF_STRING | MF_GRAYED;

fred2/shipeditordlg.cpp

@@ -1085,7 +1085,7 @@ int CShipEditorDlg::update_data(int redraw)
 		m_ship_name.TrimRight(); 
 		ptr = GET_FIRST(&obj_used_list);
 		while (ptr != END_OF_LIST(&obj_used_list)) {
-			if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (cur_object_index != OBJ_INDEX(ptr))) {
+			if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (single_ship != ptr->instance)) {
 				str = Ships[ptr->instance].ship_name;
 				if (!stricmp(m_ship_name, str)) {
 					if (bypass_errors)

qtfred/src/mission/dialogs/ShipEditorDialogModel.cpp

@@ -429,7 +429,7 @@ namespace fso {
 					drop_white_space(_m_ship_name);
 					ptr = GET_FIRST(&obj_used_list);
 					while (ptr != END_OF_LIST(&obj_used_list)) {
-						if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (_editor->currentObject != OBJ_INDEX(ptr))) {
+						if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (single_ship != ptr->instance)) {
 							str = Ships[ptr->instance].ship_name;
 							if (!stricmp(_m_ship_name.c_str(), str)) {
 								auto button = _viewport->dialogProvider->showButtonDialog(DialogType::Error,

qtfred/src/ui/widgets/sexp_tree.cpp

@@ -5946,7 +5946,8 @@ std::unique_ptr<QMenu> sexp_tree::buildContextMenu(QTreeWidgetItem* h) {
 				// Replace Container Data submenu
 				// disallowed on variable-type SEXP args, to prevent FSO/FRED crashes
 				// also disallowed for special argument options (not supported for now)
-				if (op_type != OPF_VARIABLE_NAME && !is_argument_provider_op(Operators[op].value)) {
+				// op < 0 means we're on a container modifier, and nested Replace Container Data is allowed
+				if (op_type != OPF_VARIABLE_NAME && (op < 0 || !is_argument_provider_op(Operators[op].value))) {
 					const auto &containers = get_all_sexp_containers();
 					for (int idx = 0; idx < (int)containers.size(); ++idx) {
 						const auto &container = containers[idx];

version_override.cmake

@@ -0,0 +1,5 @@
+set(FSO_VERSION_MAJOR 24)
+set(FSO_VERSION_MINOR 0)
+set(FSO_VERSION_BUILD 1)
+set(FSO_VERSION_REVISION 0)
+set(FSO_VERSION_REVISION_STR RC2)