diff -r 67db0d431d5e -r d8811e327d12 src/openttd.h
--- a/src/openttd.h	Tue May 27 00:50:55 2008 +0000
+++ b/src/openttd.h	Tue Jun 17 10:32:49 2008 +0000
@@ -5,10 +5,6 @@
 #ifndef OPENTTD_H
 #define OPENTTD_H
 
-#ifndef VARDEF
-#define VARDEF extern
-#endif
-
 enum GameModes {
 	GM_MENU,
 	GM_NORMAL,
@@ -29,21 +25,6 @@
 	SM_LOAD_HEIGHTMAP  = 12,
 };
 
-
-/* Modes for GenerateWorld */
-enum GenerateWorldModes {
-	GW_NEWGAME   = 0,    /* Generate a map for a new game */
-	GW_EMPTY     = 1,    /* Generate an empty map (sea-level) */
-	GW_RANDOM    = 2,    /* Generate a random map for SE */
-	GW_HEIGHTMAP = 3,    /* Generate a newgame from a heightmap */
-};
-
-/* Modes for InitializeGame, those are _bits_! */
-enum InitializeGameModes {
-	IG_NONE       = 0,  /* Don't do anything special */
-	IG_DATE_RESET = 1,  /* Reset the date when initializing a game */
-};
-
 /* Display Options */
 enum {
 	DO_SHOW_TOWN_NAMES    = 0,
@@ -54,26 +35,6 @@
 	DO_WAYPOINTS          = 6,
 };
 
-enum {
-	SORT_ASCENDING  = 0,
-	SORT_DESCENDING = 1,
-	SORT_BY_DATE    = 0,
-	SORT_BY_NAME    = 2
-};
-
-extern byte _savegame_sort_order;
-
-/* In certain windows you navigate with the arrow keys. Do not scroll the
- * gameview when here. Bitencoded variable that only allows scrolling if all
- * elements are zero */
-enum {
-	SCROLL_CON  = 0,
-	SCROLL_EDIT = 1,
-	SCROLL_SAVE = 2,
-	SCROLL_CHAT = 4,
-};
-extern byte _no_scroll;
-
 extern byte _game_mode;
 extern bool _exit_game;
 extern int8 _pause_game;