Differentiate save files based on game type #2122

eos428 · 2020-10-28T16:21:25Z

Solves #323

So far the actual saving and loading seems alright for standard and campaign maps. However, I haven't saved the extra things needed for campaign maps.

@ihhub @idshibanov Any pointers on what to save? I think it should the player's hero data so maybe one of the heroes stream operators?

idshibanov · 2020-10-28T17:55:02Z

@ihhub @idshibanov Any pointers on what to save? I think it should the player's hero data so maybe one of the heroes stream operators?

Things to keep track:

Maps finished to this point
Maps chosen (when there's a branch in campaign, especially switch between Good and Evil campaigns at 5th scenario)
Campaign awards earned (artifacts, creatures, "dwarven alliance" in Good campaign)
Current scenario bonus chosen (one of the three)
Optionally (not in original, but nice to have) we can save certain heroes (experience and skills only).

You don't have to add all of them right now, but make sure it will be easy to do in the future.

ihhub · 2020-10-29T17:04:36Z

Hi @eos428 , it's a very good but critical change which also breaks the backward compatibility. We will definitely come back to this pull request after 0.8.3 which is just in few days.

eos428 · 2020-10-30T03:19:59Z

No problem with that, take your time 👍

There's also campaign data which I do partially for this PR so I'd imagine there'll be a lot to review here haha

eos428 · 2020-10-31T17:58:17Z

Some update on the latest state of this PR:

Added some initial code on campaign data (I expect a lot of refactoring once it's reviewed hehe)
Did campaign scenario bonus. Probably no more than this for now, to prevent the PR over-scoping and becoming too big. Still have to test the troop bonus, but I tested the other two and it looks fine.

Things left to do for this PR:

Implement IO on campaign data
Code cleanup, of course
Likely many variable and/or class renaming

ihhub

Hi @eos428 , great stuff! We need to polish the code right now so move forward. Could you please take a look into given comments?

fheroes2.vcxproj

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/campaign/campaign_data.h

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/game/game_newgame.cpp

src/fheroes2/system/settings.cpp

ihhub

Hi @eos428 I left few more comments. Please take a look.

src/fheroes2/campaign/campaign_data.h

src/fheroes2/game/difficulty.cpp

src/fheroes2/game/game_io.cpp

src/fheroes2/game/game_loadgame.cpp

src/fheroes2/game/game_newgame.cpp

eos428 · 2020-11-12T03:33:24Z

Fixes done. A bit unsure if I misunderstood some of the reviews so let me know if I do!

ihhub

Hi @eos428 , I left multiple comments. Could you please take a look and see if they make sense?

src/fheroes2/campaign/campaign_data.h

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/campaign/campaign_data.h

src/fheroes2/system/settings.cpp

src/fheroes2/system/settings.h

src/fheroes2/system/settings.cpp

ihhub

Hi @eos428 , I left multiple comments. Could you please take a look?

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/campaign/campaign_data.h

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/campaign/campaign_data.h

src/fheroes2/game/game_loadgame.cpp

src/fheroes2/game/game_newgame.cpp

ihhub

Hi @eos428 I left few comments and also some of previous comments haven't been addresses.

On top of this we have to modify CURRENT_FORMAT_VERSION and LAST_FORMAT_VERSION values. Please check if ( binver > CURRENT_FORMAT_VERSION || binver < LAST_FORMAT_VERSION ) { line in game_io.cpp file for more details.

src/fheroes2/campaign/campaign_data.h

src/fheroes2/game/game_newgame.cpp

ihhub

Hi @eos428 I left multiple comments mostly regarding the architecture of your changes. Could you please take a look?

src/fheroes2/campaign/campaign_data.h

src/fheroes2/dialog/dialog_selectfile.cpp

src/fheroes2/dialog/dialog_file.cpp

src/fheroes2/game/game_newgame.cpp

src/fheroes2/system/settings.cpp

ihhub

Hi @eos428 I left multiple comments. Could you please take a look?

src/fheroes2/dialog/dialog_selectfile.cpp

src/fheroes2/game/game_newgame.cpp

src/fheroes2/system/settings.cpp

src/fheroes2/dialog/dialog_selectfile.cpp

src/fheroes2/campaign/campaign_data.cpp

src/fheroes2/dialog/dialog_selectfile.cpp

src/fheroes2/game/game_io.cpp

src/fheroes2/kingdom/kingdom.h

ihhub

Hi @eos428 I left multiple comments. Could you please take a look?

src/fheroes2/game/game_loadgame.cpp

src/fheroes2/game/game_newgame.cpp

src/fheroes2/maps/maps_fileinfo.cpp

src/fheroes2/game/game_loadgame.cpp

ihhub · 2020-12-23T16:12:14Z

Hi @eos428 ,
I think we need to make some change in order to support old saves and prevent incorrect old save loading.

In bool Game::Load( const std::string & fn ) function we have the code:

HeaderSAV header;

// read raw info
fs >> strver >> binver >> header;

where we load a header. The issue here that modified HeaderSAV will read extra information from save file which is not present in the old saves.
To avoid this issue we need to modify the code to do this first:

fs >> strver >> binver;

after this we have to rename HeaderSAV into HeaderSAVBase and inherit from it another structure with our new parameter and call it (obviously) HeaderSAV. Then at the time of save loading we could decide which structure we need to use (we can utilize std::unique_ptr<HeaderSAVBase> for this) and load needed info. Please let me know if you have better ideas or questions.

ihhub

Hi @eos428 , I left just few comments. Could you please take a look into them?

src/fheroes2/game/game_loadgame.cpp

src/fheroes2/game/game_io.cpp

src/fheroes2/game/game_loadgame.cpp

ihhub

Hi @eos428 , things we need to change:

pass game type to Game::LoadSAV2FileInfo function and check it with read game type. If it's different then return false
revert changes in dialog_selectfile.cpp related to cursor. It breaks save file interaction
fix loading hot head and multiplayer file types. I think we mixed them together

The rest of changes I corrected. Please take a look :)

ihhub · 2020-12-27T05:21:08Z

src/fheroes2/dialog/dialog_selectfile.cpp

 {
    fheroes2::Display & display = fheroes2::Display::instance();
    Cursor & cursor = Cursor::Get();
    LocalEvent & le = LocalEvent::Get();

-    cursor.Hide();


Please revert back all changes related to cursor.Hide() and cursor.Show() as it breaks the behaviour of typing a name for new save.

src/fheroes2/game/game_loadgame.cpp

ihhub · 2020-12-27T05:56:51Z

Also @eos428 could you please squash all commits into one as GitHub behaves strangely with so many commits in a branch?

eos428 · 2020-12-27T07:32:00Z

Hi @ihhub I have made the changes as you requested.

However, in loading multiplayer saves separately (hotseat and network) I had to make more changes to the code. Mostly copy-pasted stuff though, but I hope you don't mind with that.

Also, I have to revert cursor Show/Hide changes in Game::LoadGame() due to reverting the changes in dialog_selectfile.cpp.

ihhub · 2020-12-27T11:45:13Z

@eos428 great thanks for your work! Well done!

relates to #2122 and also some code cleanup

close ihhub#323

relates to ihhub#2122 and also some code cleanup

idshibanov assigned eos428 Oct 28, 2020

idshibanov added this to the 0.9 milestone Oct 28, 2020

idshibanov added campaign Campaign related stuff improvement New feature, request or improvement labels Oct 28, 2020

ihhub added the Hacktoberfest label Oct 29, 2020

ihhub requested changes Nov 6, 2020

View reviewed changes

ihhub requested changes Nov 12, 2020

View reviewed changes

ihhub requested changes Nov 19, 2020

View reviewed changes

ihhub requested changes Nov 23, 2020

View reviewed changes

ihhub requested changes Nov 28, 2020

View reviewed changes

src/fheroes2/campaign/campaign_data.h Outdated Show resolved Hide resolved

src/fheroes2/campaign/campaign_data.h Outdated Show resolved Hide resolved

src/fheroes2/campaign/campaign_data.h Outdated Show resolved Hide resolved

src/fheroes2/game/game_newgame.cpp Outdated Show resolved Hide resolved

ihhub requested changes Nov 30, 2020

View reviewed changes

ihhub requested changes Dec 3, 2020

View reviewed changes

ihhub requested changes Dec 24, 2020

View reviewed changes

ihhub requested changes Dec 27, 2020

View reviewed changes

ihhub reviewed Dec 27, 2020

View reviewed changes

src/fheroes2/game/game_loadgame.cpp Outdated Show resolved Hide resolved

squash commits

55aa57c

eos428 force-pushed the differentiate-save-files-based-on-game-type branch from 82619a7 to 55aa57c Compare December 27, 2020 07:16

revert cursor Hide/Show changes in LOADGAME

faed1c1

ihhub added 3 commits December 27, 2020 19:03

Revert changes back

4bba807

Fix the logic

1358131

Add missing input argument name

eb7092b

ihhub added 4 commits December 27, 2020 19:14

Reset input field in case of incorrect file

58faf64

Update game_io.cpp

aeeb726

Remove trailing spaces

43fa990

The previous change was correct

de61c67

ihhub merged commit 0769184 into ihhub:master Dec 27, 2020

ihhub added a commit that referenced this pull request Dec 28, 2020

Fix Battle Only mode

5c42d39

relates to #2122 and also some code cleanup

ihhub mentioned this pull request Dec 28, 2020

Fix Battle Only mode #2505

Merged

ihhub added a commit that referenced this pull request Dec 28, 2020

Fix Battle Only mode (#2505)

45a5938

relates to #2122 and also some code cleanup

vincent-grosbois pushed a commit to vincent-grosbois/fheroes2 that referenced this pull request Dec 28, 2020

Differentiate save files based on game type (ihhub#2122)

370a231

close ihhub#323

vincent-grosbois pushed a commit to vincent-grosbois/fheroes2 that referenced this pull request Dec 28, 2020

Fix Battle Only mode (ihhub#2505)

850b1dc

relates to ihhub#2122 and also some code cleanup

eos428 deleted the differentiate-save-files-based-on-game-type branch February 20, 2021 02:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Differentiate save files based on game type #2122

Differentiate save files based on game type #2122

eos428 commented Oct 28, 2020 •

edited

Loading

idshibanov commented Oct 28, 2020

ihhub commented Oct 29, 2020

eos428 commented Oct 30, 2020

eos428 commented Oct 31, 2020

ihhub left a comment

ihhub left a comment

eos428 commented Nov 12, 2020

ihhub left a comment

ihhub left a comment

ihhub left a comment

ihhub left a comment

ihhub left a comment

ihhub left a comment

ihhub commented Dec 23, 2020

ihhub left a comment

ihhub left a comment

ihhub Dec 27, 2020

ihhub commented Dec 27, 2020

eos428 commented Dec 27, 2020

ihhub commented Dec 27, 2020

Differentiate save files based on game type #2122

Differentiate save files based on game type #2122

Conversation

eos428 commented Oct 28, 2020 • edited Loading

idshibanov commented Oct 28, 2020

ihhub commented Oct 29, 2020

eos428 commented Oct 30, 2020

eos428 commented Oct 31, 2020

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

eos428 commented Nov 12, 2020

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub commented Dec 23, 2020

ihhub left a comment

Choose a reason for hiding this comment

ihhub left a comment

Choose a reason for hiding this comment

ihhub Dec 27, 2020

Choose a reason for hiding this comment

ihhub commented Dec 27, 2020

eos428 commented Dec 27, 2020

ihhub commented Dec 27, 2020

eos428 commented Oct 28, 2020 •

edited

Loading