New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repeal save game data request #2364

Merged

geoffthemedio merged 14 commits into freeorion:master from o01eg:repeal-save-game-data-request

Feb 2, 2019

Contributor

o01eg commented Jan 26, 2019 •

edited

Another step of #2243. Fixes #2275.

Currently the server requests turn orders and save data from the client after get turn orders before from the client which requires the client to be online when server decide to save game.
After this PR server gets turn orders and save data together from the client so it became possible to client to disconnect after sending turn orders.

To compensate lacking server-side request the client sends partial order changes on some event.

Also allows to send UI data if client connected to playing game.

Breaks client-server compatibility!

o01eg mentioned this pull request

Allow player to disconnect from the server without stopping the game #2243

Closed

6 tasks

o01eg changed the title ~~Repeal save game data request~~ [WIP] Repeal save game data request

geoffthemedio reviewed

View reviewed changes

server/ServerApp.h Show resolved Hide resolved

geoffthemedio added component:network category:tweak labels

geoffthemedio reviewed

View reviewed changes

client/ClientApp.h Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

client/ClientApp.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

client/human/HumanClientApp.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

client/human/HumanClientApp.h Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

network/Message.h Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

network/Message.h Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

network/ServerNetworking.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/SaveLoad.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerApp.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerApp.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerApp.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerFSM.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerFSM.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

server/ServerFSM.cpp Outdated Show resolved Hide resolved

Member

geoffthemedio commented Jan 26, 2019

Basic idea of including save game data in turn orders messages is reasonable. Dunno about removing the message type entirely, though...

geoffthemedio added this to the Next Release milestone

o01eg force-pushed the repeal-save-game-data-request branch from 73bf0a1 to d227747 Compare

January 27, 2019 11:22

Contributor Author

o01eg commented Jan 27, 2019

Rebased. Fixed crash on loading. Fixed grooming remarks.

o01eg changed the title ~~[WIP] Repeal save game data request~~ Repeal save game data request

Contributor Author

o01eg commented Jan 29, 2019

Tested it in single-player, multiplayer and multiplayer hostless mode. Didn't catch more crashes or error.

geoffthemedio reviewed

View reviewed changes

network/Message.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

network/Message.cpp Outdated Show resolved Hide resolved

geoffthemedio reviewed

View reviewed changes

network/Message.cpp Outdated Show resolved Hide resolved

Member

geoffthemedio commented Jan 30, 2019

If I start a single-player game, issue a few orders, save the game, resign, then load that save, none of my issued orders are retained. They should be.

geoffthemedio reviewed

View reviewed changes

UI/MapWnd.cpp Outdated Show resolved Hide resolved

Member

geoffthemedio commented Jan 31, 2019

Is it correct and desirable that OrderSet::erase doesn't do "undo" order as OrderSet::RescindOrder b3e58c0 ?

I don't see the relevance of that commit... Not sure what you're asking. Erasing and undoing an order are different things, though...

o01eg added 12 commits

January 31, 2019 14:50


          Send AI state and UI data alongside turn orders sent by client.

f7ef4a2

Server doesn't initiate requesting save data.

Message numbering broken.
Save game broken.
Compatibility broken.


          Store PlayerSaveGameData instead of TurnOrders in turn sequence data.

cc6f34b

Allows to send UI data for in-game connected player.


          Save actual PlayerSaveGameData.

1bef271


          Actually send AI state and UI save data to server.

827f0a5


          Restore message numbering.

7d62e5f


          Fill save game data on new or loaded game.

d5141d1


          Fix crash on loading save without orders.

cd50e12


          Grooming.

c9f81a8


          Actually remove unused messages.

882250f


          Grooming. Prepare to turn partial orders message.


          Add ids of changed orders.

d07ef90


          Sending and receiving partial orders.

31eb793

o01eg force-pushed the repeal-save-game-data-request branch from bf9b84b to 31eb793 Compare

January 31, 2019 12:33

Contributor Author

o01eg commented Jan 31, 2019

Rebased. Started to implement partial orders updates.


          Send partial orders on "Save" button.

7bd8927

Contributor Author

o01eg commented Jan 31, 2019

Added sending partial orders when player press "Save" button. Should fix mentioned issue.

o01eg changed the title ~~[WIP] Repeal save game data request~~ Repeal save game data request


          Send oders changes on other cases.

af1dfd9

Contributor Author

o01eg commented Jan 31, 2019

Added sending partial orders on closing fleet window, switching planets, closing research and production windows.

Member

geoffthemedio commented Feb 2, 2019

saving and reloading in single player works.

is this still work in progress?

Contributor Author

o01eg commented Feb 2, 2019

No, I suppose it finished. I set sending changes when player "lost focus" on windows I remember. Even if I forgot something it still sends entire turn orders on end turn to prevent desyncs.

geoffthemedio merged commit 8a1903a into freeorion:master

geoffthemedio added status:merged and removed status:work in progress labels

o01eg deleted the repeal-save-game-data-request branch

February 3, 2019 06:31

o01eg mentioned this pull request

Remove unactual single substatus of WaitingForTurnEnd. #2405

Merged

o01eg mentioned this pull request

disable issuing fleet movement orders after turn button has been pressed #2548

Merged

Vezzra modified the milestones: Next Release, v0.4.9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment