cpp/openttd-patchpack/source Changeset - r9672:31eaac85a9e4

Changeset - r9672:31eaac85a9e4

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 16 years ago 2008-07-20 21:23:28
peter1138@openttd.org

(svn r13761) -Codechange: Remove dependency on rail for altering purchase list position (mostly function renaming)

3 files changed with 7 insertions and 7 deletions:

src/newgrf.cpp

src/newgrf_engine.cpp

src/newgrf_engine.h

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -584,7 +584,7 @@ static bool RailVehicleChangeInfo(uint e @@
 			} break;
 			case 0x1A: // Alter purchase list sort order
-				AlterRailVehListOrder(e->index, grf_load_byte(&buf));
+				AlterVehicleListOrder(e->index, grf_load_byte(&buf));
 				break;
 			case 0x1B: // Powered wagons power bonus
@@ @@ -6002,7 +6002,7 @@ static void AfterLoadGRFs() @@
 	InitGRFTownGeneratorNames();
 	/* Run all queued vehicle list order changes */
-	CommitRailVehListOrderChanges();
+	CommitVehicleListOrderChanges();
 	/* Load old shore sprites in new position, if they were replaced by ActionA */
 	ActivateOldShore();

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -1093,7 +1093,7 @@ struct ListOrderChange { @@
 static std::list<ListOrderChange> _list_order_changes;
-void AlterRailVehListOrder(EngineID engine, EngineID target)
+void AlterVehicleListOrder(EngineID engine, EngineID target)
+{
 	/* Add the list order change to a queue */
 	ListOrderChange loc;
@@ @@ -1102,7 +1102,7 @@ void AlterRailVehListOrder(EngineID engi @@
 	_list_order_changes.push_back(loc);
+}
-void CommitRailVehListOrderChanges()
+void CommitVehicleListOrderChanges()
+{
 	/* List position to Engine map */
 	typedef std::map<uint16, Engine*> ListPositionMap;
@@ @@ -1120,7 +1120,7 @@ void CommitRailVehListOrderChanges() @@
 		/* Populate map with current list positions */
 		Engine *e;
-		FOR_ALL_ENGINES_OF_TYPE(e, VEH_TRAIN) {
+		FOR_ALL_ENGINES_OF_TYPE(e, source_e->type) {
 			if (!_settings_game.vehicle.dynamic_engines || e->grffile == source_e->grffile) {
 				if (e->internal_id == target) target_e = e;
 				lptr_map[e->list_position] = e;

src/newgrf_engine.h

➞

Show inline comments

@@ @@ -56,8 +56,8 @@ void TriggerVehicle(Vehicle *veh, Vehicl @@
 void UnloadWagonOverrides(Engine *e);
 uint ListPositionOfEngine(EngineID engine);
 void AlterRailVehListOrder(EngineID engine, EngineID target);
 void CommitRailVehListOrderChanges();
 void AlterVehicleListOrder(EngineID engine, EngineID target);
 void CommitVehicleListOrderChanges();
 EngineID GetNewEngineID(const GRFFile *file, VehicleType type, uint16 internal_id);

0 comments (0 inline, 0 general)