equal
deleted
inserted
replaced
494 SetupColorsAndInitialWindow(); |
494 SetupColorsAndInitialWindow(); |
495 |
495 |
496 // Generate a world. |
496 // Generate a world. |
497 sprintf(filename, "%sopntitle.dat", _path.data_dir); |
497 sprintf(filename, "%sopntitle.dat", _path.data_dir); |
498 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
498 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
499 GenerateWorld(1); // if failed loading, make empty world. |
499 #if defined SECOND_DATA_DIR |
500 |
500 { |
|
501 sprintf(filename, "%sopntitle.dat", _path.second_data_dir); |
|
502 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
|
503 #endif |
|
504 GenerateWorld(1); // if failed loading, make empty world. |
|
505 #if defined SECOND_DATA_DIR |
|
506 } |
|
507 #endif |
501 _opt.currency = _new_opt.currency; |
508 _opt.currency = _new_opt.currency; |
502 |
509 |
503 _pause = 0; |
510 _pause = 0; |
504 _local_player = 0; |
511 _local_player = 0; |
505 MarkWholeScreenDirty(); |
512 MarkWholeScreenDirty(); |