1 files changed, 13 insertions, 14 deletions

diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index 493156c750..c741dec54f 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/ad/ad_node_state.h"
 #include "engines/wintermute/ad/ad_entity.h"
-#include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
@@ -42,14 +41,14 @@ IMPLEMENT_PERSISTENT(AdNodeState, false)
 
 //////////////////////////////////////////////////////////////////////////
 AdNodeState::AdNodeState(BaseGame *inGame) : BaseClass(inGame) {
-	_name = NULL;
+	_name = nullptr;
 	_active = false;
 	for (int i = 0; i < 7; i++) {
-		_caption[i] = NULL;
+		_caption[i] = nullptr;
 	}
 	_alphaColor = 0;
-	_filename = NULL;
-	_cursor = NULL;
+	_filename = nullptr;
+	_cursor = nullptr;
 }
 
 
@@ -58,12 +57,12 @@ AdNodeState::~AdNodeState() {
 	delete[] _name;
 	delete[] _filename;
 	delete[] _cursor;
-	_name = NULL;
-	_filename = NULL;
-	_cursor = NULL;
+	_name = nullptr;
+	_filename = nullptr;
+	_cursor = nullptr;
 	for (int i = 0; i < 7; i++) {
 		delete[] _caption[i];
-		_caption[i] = NULL;
+		_caption[i] = nullptr;
 	}
 }
 
@@ -71,7 +70,7 @@ AdNodeState::~AdNodeState() {
 //////////////////////////////////////////////////////////////////////////
 void AdNodeState::setName(const char *name) {
 	delete[] _name;
-	_name = NULL;
+	_name = nullptr;
 	BaseUtils::setString(&_name, name);
 }
 
@@ -79,7 +78,7 @@ void AdNodeState::setName(const char *name) {
 //////////////////////////////////////////////////////////////////////////
 void AdNodeState::setFilename(const char *filename) {
 	delete[] _filename;
-	_filename = NULL;
+	_filename = nullptr;
 	BaseUtils::setString(&_filename, filename);
 }
 
@@ -87,7 +86,7 @@ void AdNodeState::setFilename(const char *filename) {
 //////////////////////////////////////////////////////////////////////////
 void AdNodeState::setCursor(const char *filename) {
 	delete[] _cursor;
-	_cursor = NULL;
+	_cursor = nullptr;
 	BaseUtils::setString(&_cursor, filename);
 }
 
@@ -122,7 +121,7 @@ void AdNodeState::setCaption(const char *caption, int caseVal) {
 	_caption[caseVal - 1] = new char[strlen(caption) + 1];
 	if (_caption[caseVal - 1]) {
 		strcpy(_caption[caseVal - 1], caption);
-		_gameRef->_stringTable->expand(&_caption[caseVal - 1]);
+		_gameRef->expandStringByStringTable(&_caption[caseVal - 1]);
 	}
 }
 
@@ -132,7 +131,7 @@ const char *AdNodeState::getCaption(int caseVal) {
 	if (caseVal == 0) {
 		caseVal = 1;
 	}
-	if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == NULL) {
+	if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == nullptr) {
 		return "";
 	} else {
 		return _caption[caseVal - 1];