Merge pull request #7479 from Goober5000/fix/more_misc_bugs

miscellaneous fixes

Author: Goober5000

code/cfile/cfilesystem.cpp

@@ -2437,7 +2437,9 @@ int cf_create_default_path_string(SCP_string& path, int pathtype, const char* fi
 		}
 
 		if (!root) {
-			Assert( filename != NULL );
+			if (filename == nullptr) {
+				return 0;
+			}
 			path.assign(filename);
 			return 1;
 		}

code/mission/missionparse.cpp

@@ -5702,19 +5702,23 @@ void parse_event(mission *pm)
 
 	if ( optional_string("+Trigger Count:")){
 		stuff_int( &(event->trigger_count) );
-		event->flags |= MEF_USING_TRIGGER_COUNT; 
 
-		// if we have a trigger count but no repeat count, we want the event to loop until it has triggered enough times
-		if (event->repeat_count == 1) {
-			event->repeat_count = -1;
-		}
-
-		// sanity check on the trigger count variable
+		// sanity check on the trigger count variable; do this first so the != 1 check below is correct
 		// negative trigger count is also legal
 		if ( event->trigger_count == 0 ){
 			parse_warning_or_record("Trigger count for mission event %s is 0 — must be >= 1 or negative; corrected to 1.", event->name.c_str());
 			event->trigger_count = 1;
 		}
+
+		// a trigger count of 1 is the default, so the field only has runtime effect when it's something else
+		if (event->trigger_count != 1) {
+			event->flags |= MEF_USING_TRIGGER_COUNT;
+
+			// if we have a trigger count but no repeat count, we want the event to loop until it has triggered enough times
+			if (event->repeat_count == 1) {
+				event->repeat_count = -1;
+			}
+		}
 	}
 
 	if ( optional_string("+Interval:")){

code/weapon/weapons.cpp

@@ -9802,12 +9802,12 @@ SCP_map<SCP_string, weapon_stat_value> weapon_get_stats(const weapon_info &wi)
 	stats["is_beam"] = is_beam;
 	stats["allowed_for_player"] = (bool)wi.wi_flags[Weapon::Info_Flags::Player_allowed];
 
-	// Velocity and range
+	// max_speed and range
 	if (is_beam) {
-		stats["velocity"] = 0.0f;
+		stats["max_speed"] = 0.0f;
 		stats["standard_range"] = wi.b_info.range;
 	} else {
-		stats["velocity"] = wi.max_speed;
+		stats["max_speed"] = wi.max_speed;
 		stats["standard_range"] = wi.max_speed * wi.lifetime;
 	}
 
@@ -9914,7 +9914,7 @@ SCP_string weapon_get_stats_text(const weapon_info &wi)
 	if (is_beam) {
 		sprintf(buf, "\tVelocity: N/A        Range: %.0f\n", std::get<float>(stats["standard_range"]));
 	} else {
-		sprintf(buf, "\tVelocity: %-11.0fRange: %.0f\n", std::get<float>(stats["velocity"]), std::get<float>(stats["standard_range"]));
+		sprintf(buf, "\tVelocity: %-11.0fRange: %.0f\n", std::get<float>(stats["max_speed"]), std::get<float>(stats["standard_range"]));
 	}
 	result += buf;
 
@@ -9981,7 +9981,7 @@ void weapon_spew_stats(WeaponSpewType type)
 	static const csv_column columns[] = {
 		{"Name",              nullptr},
 		{"Type",              "type"},
-		{"Velocity",          "velocity"},
+		{"Velocity",          "max_speed"},
 		{"Range",             "standard_range"},
 		{"Damage Hull",       "damage_hull"},
 		{"DPS Hull",          "dps_hull"},
@@ -10018,7 +10018,7 @@ void weapon_spew_stats(WeaponSpewType type)
 	auto is_blank = [](const char *key, bool primary, bool is_beam) -> bool {
 		if (!key)
 			return false;
-		if (is_beam && !strcmp(key, "velocity"))
+		if (is_beam && !strcmp(key, "max_speed"))
 			return true;
 		if (primary && (!strcmp(key, "reload_rate") || !strcmp(key, "reload_rate_reciprocal")))
 			return true;