changeset 921:471320499c64 draft

(svn r1409) Simplify some preprocessor magic
author tron <tron@openttd.org>
date Fri, 07 Jan 2005 08:07:24 +0000
parents 13727df7b101
children 8d76fc3650ea
files ttd.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ttd.c
+++ b/ttd.c
@@ -527,16 +527,13 @@
 
 	// Generate a world.
 	sprintf(filename, "%sopntitle.dat",  _path.data_dir);
-	if (SaveOrLoad(filename, SL_LOAD) != SL_OK)
+	if (SaveOrLoad(filename, SL_LOAD) != SL_OK) {
 #if defined SECOND_DATA_DIR
-		{
 		sprintf(filename, "%sopntitle.dat",  _path.second_data_dir);
 		if (SaveOrLoad(filename, SL_LOAD) != SL_OK)
 #endif
 			GenerateWorld(1); // if failed loading, make empty world.
-#if defined SECOND_DATA_DIR
-		}
-#endif
+	}
 	_opt.currency = _new_opt.currency;
 
 	_pause = 0;