upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2024-09-22 21:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

makes MSVC++ compile again.

Browse Source 
Please don't use "or" for the moment until i switched to something
more forgiving :P
This commit is contained in:
Jörg Hinrichs 2006-09-12 19:53:06 +00:00
parent f57af8acdc
commit 05f72d50eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/display.cpp
View File

@ -2180,7 +2180,7 @@ void display::set_turbo(bool turbo)
int display::turbo_speed() const
{
if (turbo_ or keys_[SDLK_LSHIFT] or keys_[SDLK_RSHIFT])
if (turbo_ || keys_[SDLK_LSHIFT] || keys_[SDLK_RSHIFT])
return turbo_speed_;
else
return 1;

2
src/help.cpp
View File

@ -1342,7 +1342,7 @@ std::vector<topic> generate_unit_topics(const bool sort_generated)
i != game_info->unit_types.end(); i++) {
const unit_type &type = (*i).second;
UNIT_DESCRIPTION_TYPE desc_type = description_type(type);
if (desc_type == NO_DESCRIPTION or type.hide_help())
if (desc_type == NO_DESCRIPTION || type.hide_help())
continue;
const std::string lang_name = type.language_name();