equal
deleted
inserted
replaced
655 LoadIntroGame(); |
655 LoadIntroGame(); |
656 ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
656 ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
657 } |
657 } |
658 |
658 |
659 _opt_ptr = &_opt; |
659 _opt_ptr = &_opt; |
660 memcpy(&_opt_ptr->diff, &_opt_newgame.diff, sizeof(GameDifficulty)); |
660 memcpy(&_opt_ptr->diff, &_opt_newgame.diff, sizeof(_opt_ptr->diff)); |
661 _opt.diff_level = _opt_newgame.diff_level; |
661 _opt.diff_level = _opt_newgame.diff_level; |
662 |
662 |
663 // Inititalize data |
663 // Inititalize data |
664 StartupPlayers(); |
664 StartupPlayers(); |
665 StartupEngines(); |
665 StartupEngines(); |
729 break; |
729 break; |
730 |
730 |
731 case SM_NEWGAME: /* New Game --> 'Random game' */ |
731 case SM_NEWGAME: /* New Game --> 'Random game' */ |
732 #ifdef ENABLE_NETWORK |
732 #ifdef ENABLE_NETWORK |
733 if (_network_server) { |
733 if (_network_server) { |
734 snprintf(_network_game_info.map_name, NETWORK_NAME_LENGTH, "Random Map"); |
734 snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "Random Map"); |
735 } |
735 } |
736 #endif /* ENABLE_NETWORK */ |
736 #endif /* ENABLE_NETWORK */ |
737 MakeNewGame(); |
737 MakeNewGame(); |
738 break; |
738 break; |
739 |
739 |
740 case SM_START_SCENARIO: /* New Game --> Choose one of the preset scenarios */ |
740 case SM_START_SCENARIO: /* New Game --> Choose one of the preset scenarios */ |
741 #ifdef ENABLE_NETWORK |
741 #ifdef ENABLE_NETWORK |
742 if (_network_server) { |
742 if (_network_server) { |
743 snprintf(_network_game_info.map_name, NETWORK_NAME_LENGTH, "%s (Loaded scenario)", _file_to_saveload.title); |
743 snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded scenario)", _file_to_saveload.title); |
744 } |
744 } |
745 #endif /* ENABLE_NETWORK */ |
745 #endif /* ENABLE_NETWORK */ |
746 StartScenario(); |
746 StartScenario(); |
747 break; |
747 break; |
748 |
748 |
755 } else { |
755 } else { |
756 _local_player = 0; |
756 _local_player = 0; |
757 DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog) |
757 DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog) |
758 #ifdef ENABLE_NETWORK |
758 #ifdef ENABLE_NETWORK |
759 if (_network_server) { |
759 if (_network_server) { |
760 snprintf(_network_game_info.map_name, NETWORK_NAME_LENGTH, "%s (Loaded game)", _file_to_saveload.title); |
760 snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title); |
761 } |
761 } |
762 #endif /* ENABLE_NETWORK */ |
762 #endif /* ENABLE_NETWORK */ |
763 } |
763 } |
764 break; |
764 break; |
765 } |
765 } |