sanitize reserved_tiles

simconvoi.cc

@@ -4165,3 +4165,30 @@ void convoi_t::request_longblock_signal_judge(signal_t *sig, uint16 next_block)
 	longblock_signal_request.next_block = next_block;
 	longblock_signal_request.valid = true;
 }
+
+void convoi_t::clear_reserved_tiles(){
+	if(  reserved_tiles.get_count()==0  ) {
+		// nothing to do.
+		return;
+	}
+	// determine next_reservation_index
+	for(  sint32 i=route.get_count()-1;  i>=0;  i--  ) {
+		if(  reserved_tiles.is_contained(route.at(i))  ) {
+			// set next_reservation_index
+			set_next_reservation_index(i);
+			break;
+		}
+	}
+	// unreserve all tiles that are not in route
+	for(  uint32 i=0;  i<reserved_tiles.get_count();  i++  ) {
+		if(  !route.is_contained(reserved_tiles[i])  ) {
+			// unreserve the tile
+			grund_t* gr = welt->lookup(reserved_tiles[i]);
+			schiene_t* sch = gr ? (schiene_t*)gr->get_weg(front()->get_waytype()) : NULL;
+			if(  sch  ) {
+				sch->unreserve(self);
+			}
+		}
+	}
+	reserved_tiles.clear();
+}

simconvoi.h

@@ -900,6 +900,7 @@ class convoi_t : public sync_steppable, public overtaker_t
 	void reserve_pos(koord3d pos) {reserved_tiles.append_unique(pos); }
 	bool is_reservation_empty() const { return reserved_tiles.empty(); }
 	vector_tpl<koord3d>& get_reserved_tiles() { return reserved_tiles; }
+	void clear_reserved_tiles();
 
 	/* the current state of the convoi */
 	PIXVAL get_status_color() const;

simversion.h

@@ -22,7 +22,7 @@
 // NOTE: increment before next release to enable save/load of new features
 
 #define OTRP_VERSION_MAJOR 19
-#define OTRP_VERSION_MINOR  1
+#define OTRP_VERSION_MINOR  2
 // NOTE: increment OTRP_VERSION_MAJOR when the save data structure changes.
 
 #define MAKEOBJ_VERSION "60.2"

vehicle/simvehicle.cc

@@ -3657,6 +3657,11 @@ bool rail_vehicle_t::is_signal_clear(uint16 next_block, sint32 &restart_speed)
 	// action depend on the next signal
 	const roadsign_desc_t *sig_desc=sig->get_desc();
 
+	// If the next signal is not a longblock signal, reservation must be handled by next_reservation_index.
+	if(  !sig_desc->is_longblock_signal()  ) {
+		cnv->clear_reserved_tiles();
+	}
+
 	// simple signal: drive on, if next block is free
 	if(  !sig_desc->is_longblock_signal() &&
       !sig_desc->is_choose_sign() &&