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

Bugfixes #8545

Merged
merged 6 commits into from
Aug 13, 2014
Merged

Bugfixes #8545

merged 6 commits into from
Aug 13, 2014

Conversation

BevapDin
Copy link
Contributor

This fixes #8540 (hopefully) - there is one iterator increment to much.

Fixes #8469 - language names taken from http://msdn.microsoft.com/en-us/goglobal/bb896001.aspx

Fixes #8307 - prevent accessing an empty dreams vector.

Fixes #8416 - remove unnecessary null pointer checks

About 4f40f7f: Compare with game::update_map - the code in shift_monsters assumes that levx and levy already point to the new coordinates. When debug teleporting only a single overmap tile away, the monster positions have been screwed because of this.

Compare with game::update_map - the code in shift_monsters assumes that levx and levy already point to the *new* coordinates.
The increment is not supposed to happen there.
worldfactory: add proper initialization of pointer members,
Simplified deconstructor, no need to clear the maps, they are deconstructed anyway.
Also changes the modmanager pointer to be a smart pointer to let it handle its own destruction.
@KA101 KA101 self-assigned this Aug 13, 2014
optionNames["en"] = "English";
optionNames["fr_FR"] = "français (France)";
optionNames["de_DE"] = "Deutsch (Deutschland)";
optionNames["it"] = "italiano";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs more caps. I'll see what I can do.

Update: I don't have font support for Chinese, Japanese, or Korean, so can't speak for those. Sorry. All other languages are capitalized.

@KA101 KA101 merged commit 699f293 into CleverRaven:master Aug 13, 2014
@Chase-san
Copy link
Contributor

Don't worry. Chinese Japanese and Korean don't really have the concept of capitalization. The japanese one is correct though, I recognize that much.

@BevapDin BevapDin deleted the bugfixes branch August 13, 2014 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants