diff options
| -rw-r--r-- | crawl-ref/source/player.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/winhdr.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 451b22f347..21904de8d6 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6711,7 +6711,7 @@ void PlaceInfo::make_global() void PlaceInfo::assert_validity() const { - // Check that level_type and branch match up + // Check that level_type and branch match up. ASSERT(is_global() || level_type == LEVEL_DUNGEON && branch >= BRANCH_MAIN_DUNGEON && branch < NUM_BRANCHES @@ -6719,7 +6719,7 @@ void PlaceInfo::assert_validity() const && branch == -1); // Can't have visited a place without seeing any of its levels, and - // visa versa. + // vice versa. ASSERT(num_visits == 0 && levels_seen == 0 || num_visits > 0 && levels_seen > 0); diff --git a/crawl-ref/source/winhdr.h b/crawl-ref/source/winhdr.h index 31caab774f..adb295908d 100644 --- a/crawl-ref/source/winhdr.h +++ b/crawl-ref/source/winhdr.h @@ -48,7 +48,7 @@ #pragma warning(error : 4130) // The operator was used with the address of a string literal. #pragma warning(error : 4131) // The specified function declaration is not in prototype form. #pragma warning(error : 4132) // The constant was not initialized. -#pragma warning(error : 4152) // A pointer to a function was converted to a pointer to data, or visa versa. +#pragma warning(error : 4152) // A pointer to a function was converted to a pointer to data, or vice versa. #pragma warning(error : 4208) // nonstandard extension used : delete [exp] - exp evaluated but ignored #pragma warning(error : 4211) // nonstandard extension used : redefined extern to static #pragma warning(error : 4212) // nonstandard extension used : function declaration used ellipsis |