diff options
| author | uruk | 2014-07-07 21:42:45 +0200 |
|---|---|---|
| committer | uruk | 2014-07-07 21:42:45 +0200 |
| commit | c7aa91019b08c52976356031cf2059333ab6fd23 (patch) | |
| tree | 6cbe4efb5624b77060f62041e3422b39a2446a91 /engines/cge2/hero.cpp | |
| parent | c5855b4293522f365329593e41a16e68b1424967 (diff) | |
| download | scummvm-rg350-c7aa91019b08c52976356031cf2059333ab6fd23.tar.gz scummvm-rg350-c7aa91019b08c52976356031cf2059333ab6fd23.tar.bz2 scummvm-rg350-c7aa91019b08c52976356031cf2059333ab6fd23.zip | |
CGE2: Replace NULL with nullptr everywhere.
Diffstat (limited to 'engines/cge2/hero.cpp')
| -rw-r--r-- | engines/cge2/hero.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp index 7e6c384a46..4b50cccd8b 100644 --- a/engines/cge2/hero.cpp +++ b/engines/cge2/hero.cpp @@ -127,10 +127,10 @@ Sprite *Hero::expand() { // It's very similar to Sprite's expand, but doesn't bo if (_actionCtrl[section]._cnt) { CommandHandler::Command *c = &_ext->_actions[section][cnt[section]++]; c->_commandType = CommandType(id); - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); c->_ref = _vm->number(p); - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); c->_val = _vm->number(p); c->_spritePtr = nullptr; @@ -141,7 +141,7 @@ Sprite *Hero::expand() { // It's very similar to Sprite's expand, but doesn't bo s->_now = atoi(p); if (s->_now > maxnow) maxnow = s->_now; - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) break; s->_next = _vm->number(p); switch (s->_next) { @@ -154,16 +154,16 @@ Sprite *Hero::expand() { // It's very similar to Sprite's expand, but doesn't bo } if (s->_next > maxnxt) maxnxt = s->_next; - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); s->_dx = _vm->number(p); - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); s->_dy = _vm->number(p); - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); s->_dz = _vm->number(p); - if ((p = _vm->token(nullptr)) == NULL) + if ((p = _vm->token(nullptr)) == nullptr) error("Unexpected end of file! %s", fname); s->_dly = _vm->number(p); break; |