Skip to content
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.

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

Resolve Bug #22133 #534

Merged
merged 1 commit into from Oct 24, 2015
Merged

Resolve Bug #22133 #534

merged 1 commit into from Oct 24, 2015

Conversation

Wedge009
Copy link
Member

Resolving bug #22133, stating Cancel Orders does not work when loading a MP game.

Modelled from the Cancel Orders functionality in the single-player Load Game, game_launcher::load_game() of game_launcher.cpp.

Resolving bug #22133, stating Cancel Orders does not work when loading a MP game.
@gfgtdf
Copy link
Contributor

gfgtdf commented Oct 23, 2015

you added code looks fine to me, however what i don't understand is this code:

        } else {
            if (!load.load_multiplayer_game()) {
                return ;
            }
        }

@Wedge009
Copy link
Member Author

Probably a case of not-well-chosen variable names. 'load' is a savegame::loadgame object, which is the Load Game dialogue. So load_multiplayer_game() is a call to the Load Game dialogue for MP games. If it's 'false' no game was chosen so just return immediately from the function. If 'true', then a game was loaded.

At least, inasmuch as I understand the code - I didn't write all this, I just updated it to include the Cancel Orders function.

@gfgtdf
Copy link
Contributor

gfgtdf commented Oct 24, 2015

Hmm right, assuming that you have tested the new code i'll merge it.

gfgtdf added a commit that referenced this pull request Oct 24, 2015
@gfgtdf gfgtdf merged commit 9ad56b8 into wesnoth:master Oct 24, 2015
@Wedge009
Copy link
Member Author

Yes, I made sure to test before offering the change. Though it would be better if others could check on it too. (:

@Wedge009 Wedge009 deleted the bug_22133_fix branch October 24, 2015 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants