(svn r20449) -Codechange: unduplicate saving/loading of NewGRF ID + local id -> OpenTTD spec mappings

1 files changed, 3 insertions, 30 deletions

diff --git a/src/saveload/airport_sl.cpp b/src/saveload/airport_sl.cpp
index c7f5c5769..e0637dbc0 100644
--- a/src/saveload/airport_sl.cpp
+++ b/src/saveload/airport_sl.cpp
@@ -10,45 +10,18 @@
 /** @file airport_sl.cpp Code handling saving and loading airport ids */
 
 #include "../stdafx.h"
-#include "../newgrf_commons.h"
 
 #include "saveload.h"
-
-/**
- * Save and load the mapping between the airport id in the AirportSpec array
- * and the grf file it came from.
- */
-static const SaveLoad _airport_id_mapping_desc[] = {
-	SLE_VAR(EntityIDMapping, grfid,         SLE_UINT32),
-	SLE_VAR(EntityIDMapping, entity_id,     SLE_UINT8),
-	SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT8),
-	SLE_END()
-};
+#include "newgrf_sl.h"
 
 static void Save_APID()
 {
-	uint i;
-	uint j = _airport_mngr.GetMaxMapping();
-
-	for (i = 0; i < j; i++) {
-		SlSetArrayIndex(i);
-		SlObject(&_airport_mngr.mapping_ID[i], _airport_id_mapping_desc);
-	}
+	Save_NewGRFMapping(_airport_mngr);
 }
 
 static void Load_APID()
 {
-	/* clear the current mapping stored.
-	 * This will create the manager if ever it is not yet done */
-	_airport_mngr.ResetMapping();
-
-	uint max_id = _airport_mngr.GetMaxMapping();
-
-	int index;
-	while ((index = SlIterateArray()) != -1) {
-		if ((uint)index >= max_id) break;
-		SlObject(&_airport_mngr.mapping_ID[index], _airport_id_mapping_desc);
-	}
+	Load_NewGRFMapping(_airport_mngr);
 }
 
 extern const ChunkHandler _airport_chunk_handlers[] = {