Page MenuHomeWildfire Games
Differential D5130

Move the game loading out of the SavegameLoader
ClosedPublic
Actions

Authored by phosit on Sep 16 2023, 2:45 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Sep 25, 1:26 AM
Unknown Object (File)
Tue, Sep 24, 5:13 PM
Unknown Object (File)
Sun, Sep 22, 1:32 AM
Unknown Object (File)
Fri, Sep 20, 11:27 AM
Unknown Object (File)
Fri, Sep 13, 8:43 AM
Unknown Object (File)
Wed, Sep 11, 9:34 AM
Unknown Object (File)
Sep 4 2024, 3:42 PM
Unknown Object (File)
Sep 2 2024, 9:53 AM
Subscribers
Restricted Owners Package

Details

Reviewers
Freagarach
Commits
rP27867: Move the game loading out of the SavegameLoader
Summary

The SavegameLoader should not know that it has to start a game afterwards.
Note: Now if there's an Error in Engine.StartSavedGame(gameId); the Dialog is still closed.

This simplifies D4770.

Test Plan

Load a game from the from the main menu and the campain page.
Also test other ways the dialog can be closed (cancel, saveing of a game).

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

phosit created this revision.Sep 16 2023, 2:45 PM
Vulcan added a comment.Sep 16 2023, 2:46 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7290/display/redirect

phosit added a comment.Sep 16 2023, 2:47 PM

There is duplication but i didn't know where to put the function. Propably "gui/common/functions_global_object.js"

Vulcan added a comment.Sep 16 2023, 2:57 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8379/display/redirect

Harbormaster completed remote builds in B22339: Diff 22262.Sep 16 2023, 3:03 PM
phosit requested review of this revision.Sep 16 2023, 3:03 PM
phosit updated this revision to Diff 22276.Sep 17 2023, 5:56 PM
phosit edited the summary of this revision. (Show Details)

Make it a member function in CampaignMenu.

Vulcan added a comment.Sep 17 2023, 5:59 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7302/display/redirect

Vulcan added a comment.Sep 17 2023, 6:04 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8391/display/redirect

Harbormaster completed remote builds in B22351: Diff 22276.Sep 17 2023, 6:32 PM
phosit updated this revision to Diff 22280.Sep 18 2023, 6:47 PM
  • Add forgoten .bind(this)
  • Inline pData

Based on a review by elexis.

Vulcan added a comment.Sep 18 2023, 6:47 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7304/display/redirect

Vulcan added a comment.Sep 18 2023, 6:50 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8393/display/redirect

Harbormaster completed remote builds in B22356: Diff 22280.Sep 18 2023, 7:02 PM
phosit updated this revision to Diff 22315.Sep 24 2023, 3:51 PM

Use .bind instead of arrow functions more often.
Correct a indent mistake.

Vulcan added a comment.Sep 24 2023, 3:53 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7329/display/redirect

Vulcan added a comment.Sep 24 2023, 3:58 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8418/display/redirect

Harbormaster completed remote builds in B22389: Diff 22315.Sep 24 2023, 4:23 PM
phosit updated this revision to Diff 22350.Oct 1 2023, 5:04 PM
  • spaces on the inside of {}
  • use ! instead of == null

Because of CC

Vulcan added a comment.Oct 1 2023, 5:04 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7354/display/redirect

Vulcan added a comment.Oct 1 2023, 5:08 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8443/display/redirect

Harbormaster completed remote builds in B22420: Diff 22350.Oct 1 2023, 5:23 PM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 2 2023, 9:31 PM
This revision was landed with ongoing or failed builds.
Closed by commit rP27867: Move the game loading out of the SavegameLoader (authored by phosit). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosit added a commit: rP27867: Move the game loading out of the SavegameLoader.
Owners added a subscriber: Restricted Owners Package.Oct 2 2023, 9:31 PM
phosit mentioned this in D4770: Multiplayer saved games.Oct 15 2023, 12:34 PM

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
gui/
campaigns/
default_menu/
31 lines
loadgame/
27 lines
pregame/
28 lines

Diff 22354

View Options

ps/trunk/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/loadgame/SavegameLoader.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js

Loading...
Wildfire Games · Phabricator