From c7aa91019b08c52976356031cf2059333ab6fd23 Mon Sep 17 00:00:00 2001
From: uruk
Date: Mon, 7 Jul 2014 21:42:45 +0200
Subject: CGE2: Replace NULL with nullptr everywhere.

---
 engines/cge2/hero.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/cge2/hero.cpp')

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;
-- 
cgit v1.2.3