--- a/src/misc.cpp	Wed Apr 16 22:34:14 2008 +0000
+++ b/src/misc.cpp	Fri Apr 18 19:55:13 2008 +0000
@@ -10,6 +10,7 @@
 #include "saveload.h"
 #include "vehicle_gui.h"
 #include "variables.h"
+#include "cheat_func.h"
 #include "ai/ai.h"
 #include "newgrf_house.h"
 #include "cargotype.h"
@@ -30,6 +31,7 @@
 #include "table/sprites.h"
 
 char _name_array[512][32];
+extern TileIndex _cur_tileloop_tile;
 
 void InitializeVehicles();
 void InitializeWaypoints();
@@ -42,7 +44,6 @@
 void InitializeAirportGui();
 void InitializeDockGui();
 void InitializeIndustries();
-void InitializeMainGui();
 void InitializeTowns();
 void InitializeTrees();
 void InitializeSigns();
@@ -50,7 +51,7 @@
 void InitializeCargoPackets();
 static void InitializeNameMgr();
 void InitializePlayers();
-static void InitializeCheats();
+void InitializeCheats();
 void InitializeNPF();
 
 void InitializeGame(int mode, uint size_x, uint size_y)
@@ -91,7 +92,6 @@
 	InitializeCargoPackets();
 	InitializeIndustries();
 	InitializeBuildingCounts();
-	InitializeMainGui();
 
 	InitializeNameMgr();
 	InitializeVehiclesGuiList();
@@ -117,12 +117,6 @@
 }
 
 
-static void InitializeCheats()
-{
-	memset(&_cheats, 0, sizeof(Cheats));
-}
-
-
 static void InitializeNameMgr()
 {
 	memset(_name_array, 0, sizeof(_name_array));
@@ -464,31 +458,6 @@
 	}
 }
 
-static void Save_CHTS()
-{
-	byte count = sizeof(_cheats)/sizeof(Cheat);
-	Cheat* cht = (Cheat*) &_cheats;
-	Cheat* cht_last = &cht[count];
-
-	SlSetLength(count * 2);
-	for (; cht != cht_last; cht++) {
-		SlWriteByte(cht->been_used);
-		SlWriteByte(cht->value);
-	}
-}
-
-static void Load_CHTS()
-{
-	Cheat* cht = (Cheat*)&_cheats;
-	uint count = SlGetFieldLength() / 2;
-
-	for (uint i = 0; i < count; i++) {
-		cht[i].been_used = (SlReadByte() != 0);
-		cht[i].value     = (SlReadByte() != 0);
-	}
-}
-
-
 extern const ChunkHandler _misc_chunk_handlers[] = {
 	{ 'MAPS', Save_MAPS,     Load_MAPS,     CH_RIFF },
 	{ 'MAPT', Save_MAPT,     Load_MAPT,     CH_RIFF },
@@ -502,6 +471,5 @@
 
 	{ 'NAME', NULL,          Load_NAME,     CH_ARRAY},
 	{ 'DATE', SaveLoad_DATE, SaveLoad_DATE, CH_RIFF},
-	{ 'VIEW', SaveLoad_VIEW, SaveLoad_VIEW, CH_RIFF},
-	{ 'CHTS', Save_CHTS,     Load_CHTS,     CH_RIFF | CH_LAST}
+	{ 'VIEW', SaveLoad_VIEW, SaveLoad_VIEW, CH_RIFF | CH_LAST},
 };