Skip to content

Commit

Permalink
Merge pull request #235 from aquileia/VC_update
Browse files Browse the repository at this point in the history
tiny VC update, typo fixes
  • Loading branch information
timotei committed Jul 5, 2014
2 parents f6cf5f4 + b2b335d commit da3c45f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 7 deletions.
12 changes: 12 additions & 0 deletions projectfiles/VC9/wesnoth.vcproj
Expand Up @@ -21268,6 +21268,18 @@
RelativePath="..\..\src\variable.hpp"
>
</File>
<File
RelativePath="..\..\src\variable_info.cpp"
>
</File>
<File
RelativePath="..\..\src\variable_info.hpp"
>
</File>
<File
RelativePath="..\..\src\variable_info_detail.hpp"
>
</File>
<File
RelativePath="..\..\src\variant.cpp"
>
Expand Down
6 changes: 3 additions & 3 deletions src/playcampaign.cpp
Expand Up @@ -314,16 +314,16 @@ LEVEL_RESULT play_game(game_display& disp, saved_game& gamestate,
if (is_unit_test) {
return res;
}
//in this case we might have skipped state.set_snapshot which means wew cannot do gamestate.convert_to_start_save();
//in this case we might have skipped state.set_snapshot which means we cannot do gamestate.convert_to_start_save();
if(res == QUIT)
{
return res;
}

// Save-management options fire on game end.
// This means: (a) we have a victory, or
// or (b) we're multiplayer live, in which
// case defeat is also game end. Someday,
// (b) we're multiplayer live, in which
// case defeat is also game end. Someday,
// if MP campaigns ever work again, we might
// need to change this test.
if (res == VICTORY || (io_type != IO_NONE && res == DEFEAT)) {
Expand Down
2 changes: 1 addition & 1 deletion src/savegame.cpp
Expand Up @@ -295,7 +295,7 @@ void loadgame::set_gamestate()
{
gamestate_ = saved_game(load_config_);
#if 0
//we dont need this code since we always restore our random from [snapshot] or [replay_start] (execpt for start of scenario saves where we dont have those)
//we dont need this code since we always restore our random from [snapshot] or [replay_start] (except for start of scenario saves where we don't have those)
//also the random_seed isn't stored at toplevel anymore.


Expand Down
2 changes: 1 addition & 1 deletion src/serialization/preprocessor.cpp
Expand Up @@ -1117,7 +1117,7 @@ bool preprocessor_data::get_chunk()
target_.error(error.str(), linenum_);
}
} else {
target_.error("Too much nested preprocessing inclusions", linenum_);
target_.error("Too many nested preprocessing inclusions", linenum_);
}
}
else if (!skipping_)
Expand Down
4 changes: 2 additions & 2 deletions src/unit.cpp
Expand Up @@ -100,9 +100,9 @@ namespace {
void intrusive_ptr_add_ref(const unit * u)
{
assert(u->ref_count_ >= 0);
// the next code line is to notice possible wrongly intilized units.
// the next code line is to notice possible wrongly initialized units.
// The 100000 is picked rather randomly. If you are in the situation
// that you can actualy have more then 100000 intrusive_ptr to one unit
// that you can actually have more then 100000 intrusive_ptr to one unit
// or if you are sure that the refcounting system works
// then feel free to remove the next line
assert(u->ref_count_ < 100000);
Expand Down

0 comments on commit da3c45f

Please sign in to comment.