Feature: Improve restart command #7328

Berbe · 2019-03-05T04:38:07Z

When the restart command is issued, a normal map is always spawned.

This improvement takes into account the current state of _file_to_saveload to check if a savegame/scenario/heightmap was previously loaded, and loads the same resource again.

PeterN · 2019-03-05T08:09:40Z

I'm not sure I would expect restart to reload the game.

planetmaker · 2019-03-05T10:23:42Z

I'm not sure I would expect restart to reload the game.

I think such makes sense for competitive servers which re-run the same scenario. Could be argued that 'restart' generates a new map with current newgame settings while 'reload' restarts the currently loaded map / savegame.

PeterN · 2019-03-05T10:26:24Z

Yes, a reload command is what I was thinking of.

Eddi-z · 2019-03-05T12:01:53Z

Here's what i intuitively would think restart would do:

try to load the scenario (or heightmap) this game was originally started from, or
start a new game with the current game seed and settings

but don't do anything special with savegames.

Eddi-z · 2019-03-05T12:05:56Z

That would mean, a reference to the original scenario/heightmap must be stored in savegames, and this reference must still work if the file was moved (fallback to 2. if it was not found)

nielsmh · 2019-03-05T13:48:57Z

How about the Quake approach - have a variable/setting containing a console command to execute on game end? That command could be a simple newgame command, or it could be one to execute a longer script. It would probably need some kind of additional check to confirm a new game was in fact started, and if not create a new default game.

Eddi-z · 2019-03-05T13:53:26Z

i don't see how that has anything to do with the topic being discussed.

this is about what the restart command should do, not about ways it should be triggered

Berbe · 2019-03-05T15:07:05Z

At the moment, in trunk, if you use restart on a randomly generated map, it generates the same map again, ie using the same seed.
Since the state does not change, I find it appropriate that when loading an external resource (be it savegame/scenario/heightmap), the same behaviour apply, that is applying the same exact starting conditions again.

Hence, I don't understand your restart/reload split as I am merely attempting to mimick the current behaviour.

Berbe · 2019-03-05T15:51:24Z

Here's what i intuitively would think restart would do:
1. try to load the scenario (or heightmap) this game was originally started from, or
2. start a new game with the current game seed and settings
but don't do anything special with savegames.

Why would you make savegames stand out? Savegames and scenarios are kind of the same resource. To me they are interchangeable.
What if you wanted to host games deriving from a specific savegame? On (automatic - after year N) restart, you would spawn a new randomly generated map, which would miss the point.

Eddi-z · 2019-03-05T16:09:15Z

Why would you make savegames stand out? Savegames and scenarios are kind of the same resource. To me they are interchangeable.

they might be interchangable on a technical level, but not really at a logical/usage level.

What if you wanted to host games deriving from a specific savegame?

you could make that savegame into a scenario, then start from that scenario.

but what about the reverse? what if you loaded a backup savegame because of some griefers that messed everything up? you'd restart from that instead of the original one in your way.

Berbe · 2019-03-05T18:37:19Z

they might be interchangable on a technical level, but not really at a logical/usage level.

It is true I got carried away by the technical level, as I did not have a point of reference for semantics in OpenTTD. Savegames & scenarios are literally the same, except the former did not necessarily come from the editor...

I made some changes to only intercept savegames in editor mode. Would that be satisfactory?

stale · 2019-04-05T21:31:19Z

This pull request has been automatically marked as stale because it has not had any activity in the last month.
Please feel free to give a status update now, ping for review, or re-open when it's ready.
It will be closed if no further activity occurs within 7 days.
Thank you for your contributions.

Berbe · 2019-04-10T00:54:00Z

Ping?

src/openttd.cpp

When the restart command is issued, a normal map is always spawned. This improvement takes into account the current state of _file_to_saveload to check if a savegame/scenario/heightmap was previously loaded, and loads the same resource again.

LordAro · 2020-04-13T16:00:17Z

src/openttd.cpp

@@ -1078,7 +1078,22 @@ void SwitchToMode(SwitchMode new_mode)
 			MakeNewEditorWorld();
 			break;

-		case SM_RESTARTGAME: // Restart --> 'Random game' with current settings
+		case SM_RESTARTGAME: // Restart --> Current settings preserved
+			if (_file_to_saveload.abstract_ftype == FT_SAVEGAME || _file_to_saveload.abstract_ftype == FT_SCENARIO) {


I made some changes to only intercept savegames in editor mode. Would that be satisfactory?

I don't think it would, tbh. Would just be a confusing edgecase.

Besides, when could this actually happen? You can't load savegames into the editor, only scenarios (even if they're just savegames renamed to .scn extension)

You refer to a reply from 13 months ago, on a codebase which has changed since then.
I do not understand your comment in the context on the discussion you quote, applied to unrelated code?
What are you expecting to see?

Old review

SamuXarick · 2020-12-30T18:26:29Z

I don't like this feature at all.
There should be an alternative method to restart a loaded savegame with the settings used for that savegame.
There was an effort to make 'restart' attempt to re-create the same world starting from the generating process, and making most of the world gen settings saved on the savegame played a part for that to happen.

That effort seems to have gone forgotten with this feature now in master.

Berbe mentioned this pull request Mar 5, 2019

Occasional hang on game exit (GUI) #7329

Closed

Berbe force-pushed the restart branch from bc45ebc to 76bd51c Compare March 5, 2019 15:43

Berbe force-pushed the restart branch from 76bd51c to 92a7b68 Compare March 5, 2019 18:36

Berbe force-pushed the restart branch 2 times, most recently from 0e6a350 to e13ac77 Compare March 5, 2019 18:45

Berbe marked this pull request as ready for review March 6, 2019 21:05

stale bot added stale and removed stale labels Apr 5, 2019

LordAro reviewed Apr 27, 2019

View reviewed changes

src/openttd.cpp Outdated Show resolved Hide resolved

LordAro reviewed Apr 27, 2019

View reviewed changes

src/openttd.cpp Outdated Show resolved Hide resolved

Berbe force-pushed the restart branch from e13ac77 to 4d8acc4 Compare April 28, 2019 21:10

Berbe force-pushed the restart branch 3 times, most recently from 4b2718f to 1fdd16c Compare August 8, 2019 14:48

Berbe changed the title ~~Improve restart~~ Feature: Improve restart command Aug 8, 2019

Berbe force-pushed the restart branch 2 times, most recently from 8715f42 to 4279881 Compare February 10, 2020 20:17

LordAro previously requested changes Feb 10, 2020

View reviewed changes

src/openttd.cpp Outdated Show resolved Hide resolved

Feature: Improve restart command

1935576

When the restart command is issued, a normal map is always spawned. This improvement takes into account the current state of _file_to_saveload to check if a savegame/scenario/heightmap was previously loaded, and loads the same resource again.

Berbe force-pushed the restart branch from 4279881 to 1935576 Compare February 10, 2020 22:12

Berbe requested a review from LordAro March 24, 2020 20:30

LordAro reviewed Apr 13, 2020

View reviewed changes

LordAro approved these changes Sep 24, 2020

View reviewed changes

michicc merged commit 8f3d1ec into OpenTTD:master Sep 24, 2020

SamuXarick mentioned this pull request Dec 30, 2020

'restart' command after loading a savegame no longer re-generates the same world applying the settings from the save #8469

Closed

TrueBrain mentioned this pull request Jan 8, 2021

Fix a bug in "restart" and introduce "reload" console command #8527

Merged

Berbe deleted the restart branch April 21, 2021 19:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Improve restart command #7328

Feature: Improve restart command #7328

Berbe commented Mar 5, 2019 •

edited

Loading

PeterN commented Mar 5, 2019

planetmaker commented Mar 5, 2019 •

edited

Loading

PeterN commented Mar 5, 2019

Eddi-z commented Mar 5, 2019 •

edited

Loading

Eddi-z commented Mar 5, 2019

nielsmh commented Mar 5, 2019

Eddi-z commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading

Eddi-z commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading

stale bot commented Apr 5, 2019

Berbe commented Apr 10, 2019

LordAro Apr 13, 2020

Berbe Apr 25, 2020

SamuXarick commented Dec 30, 2020

Feature: Improve restart command #7328

Feature: Improve restart command #7328

Conversation

Berbe commented Mar 5, 2019 • edited Loading

PeterN commented Mar 5, 2019

planetmaker commented Mar 5, 2019 • edited Loading

PeterN commented Mar 5, 2019

Eddi-z commented Mar 5, 2019 • edited Loading

Eddi-z commented Mar 5, 2019

nielsmh commented Mar 5, 2019

Eddi-z commented Mar 5, 2019 • edited Loading

Berbe commented Mar 5, 2019 • edited Loading

Berbe commented Mar 5, 2019 • edited Loading

Eddi-z commented Mar 5, 2019 • edited Loading

Berbe commented Mar 5, 2019 • edited Loading

stale bot commented Apr 5, 2019

Berbe commented Apr 10, 2019

LordAro Apr 13, 2020

Choose a reason for hiding this comment

Berbe Apr 25, 2020

Choose a reason for hiding this comment

SamuXarick commented Dec 30, 2020

Berbe commented Mar 5, 2019 •

edited

Loading

planetmaker commented Mar 5, 2019 •

edited

Loading

Eddi-z commented Mar 5, 2019 •

edited

Loading

Eddi-z commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading

Eddi-z commented Mar 5, 2019 •

edited

Loading

Berbe commented Mar 5, 2019 •

edited

Loading