diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-17 19:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 19:11:28 +0200 |
| commit | 8f7785771b9e02b1a1daf7a252550d78ea93053d (patch) | |
| tree | 7a4e4b524dbc63fed3dac99a3844b634cc621d0d /src/game.cpp | |
| parent | 76be103a91d6987527af19e87d93007be8ba8a67 (diff) | |
| download | minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.gz minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.bz2 minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.zip | |
Cpp11 initializers 2 (#5999)
* C++11 patchset 10: continue cleanup on constructors
* Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop)
* More classes cleanup
* More classes cleanup + change NULL tests to boolean tests
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index c32ab6f30..fc6df462d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2643,7 +2643,7 @@ void Game::openInventory() */ LocalPlayer *player = client->getEnv().getLocalPlayer(); - if (player == NULL || player->getCAO() == NULL) + if (!player || !player->getCAO()) return; infostream << "the_game: " << "Launching inventory" << std::endl; @@ -3402,7 +3402,7 @@ void Game::updateCamera(u32 busy_time, f32 dtime) GenericCAO *playercao = player->getCAO(); // If playercao not loaded, don't change camera - if (playercao == NULL) + if (!playercao) return; camera->toggleCameraMode(); |