# HG changeset patch # User tron # Date 1105085244 0 # Node ID 1884bb89c8dc2d10bf0bf3298b807e19a1abc048 # Parent 87e2eb5381d5290534d3f8413ddf00aba033af91 (svn r1409) Simplify some preprocessor magic diff -r 87e2eb5381d5 -r 1884bb89c8dc 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;