(svn r1409) Simplify some preprocessor magic
authortron
Fri, 07 Jan 2005 08:07:24 +0000
changeset 921 1884bb89c8dc
parent 920 87e2eb5381d5
child 922 fc040662bd43
(svn r1409) Simplify some preprocessor magic
ttd.c
--- a/ttd.c	Thu Jan 06 22:50:48 2005 +0000
+++ b/ttd.c	Fri Jan 07 08:07:24 2005 +0000
@@ -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;