equal
deleted
inserted
replaced
525 InitWindowSystem(); |
525 InitWindowSystem(); |
526 SetupColorsAndInitialWindow(); |
526 SetupColorsAndInitialWindow(); |
527 |
527 |
528 // Generate a world. |
528 // Generate a world. |
529 sprintf(filename, "%sopntitle.dat", _path.data_dir); |
529 sprintf(filename, "%sopntitle.dat", _path.data_dir); |
530 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
530 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) { |
531 #if defined SECOND_DATA_DIR |
531 #if defined SECOND_DATA_DIR |
532 { |
|
533 sprintf(filename, "%sopntitle.dat", _path.second_data_dir); |
532 sprintf(filename, "%sopntitle.dat", _path.second_data_dir); |
534 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
533 if (SaveOrLoad(filename, SL_LOAD) != SL_OK) |
535 #endif |
534 #endif |
536 GenerateWorld(1); // if failed loading, make empty world. |
535 GenerateWorld(1); // if failed loading, make empty world. |
537 #if defined SECOND_DATA_DIR |
536 } |
538 } |
|
539 #endif |
|
540 _opt.currency = _new_opt.currency; |
537 _opt.currency = _new_opt.currency; |
541 |
538 |
542 _pause = 0; |
539 _pause = 0; |
543 _local_player = 0; |
540 _local_player = 0; |
544 MarkWholeScreenDirty(); |
541 MarkWholeScreenDirty(); |