TITANIC: Further renaming of named scripts to npc scripts

3 files changed, 18 insertions, 18 deletions

diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index d4674233dc..4b1dab0046 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -177,13 +177,13 @@ void CTrueTalkManager::setFlags(int index, int val) {
 }
 
 void CTrueTalkManager::loadNPC(SimpleFile *file, int charId) {
-	TTNpcScript *script = _scripts.getNamedScript(charId);
+	TTNpcScript *script = _scripts.getNpcScript(charId);
 	if (script)
 		script->load(file);
 }
 
 void CTrueTalkManager::saveNPC(SimpleFile *file, int charId) const {
-	TTNpcScript *script = _scripts.getNamedScript(charId);
+	TTNpcScript *script = _scripts.getNpcScript(charId);
 	if (script) {
 		script->save(file);
 		file->writeNumber(MKTAG_BE('U', 'R', 'A', 'H'));
@@ -232,23 +232,23 @@ void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) {
 
 TTNpcScript *CTrueTalkManager::getTalker(const CString &name) const {
 	if (name.contains("Doorbot"))
-		return _scripts.getNamedScript(104);
+		return _scripts.getNpcScript(104);
 	else if (name.contains("DeskBot"))
-		return _scripts.getNamedScript(103);
+		return _scripts.getNpcScript(103);
 	else if (name.contains("LiftBot"))
-		return _scripts.getNamedScript(105);
+		return _scripts.getNpcScript(105);
 	else if (name.contains("Parrot"))
-		return _scripts.getNamedScript(107);
+		return _scripts.getNpcScript(107);
 	else if (name.contains("BarBot"))
-		return _scripts.getNamedScript(100);
+		return _scripts.getNpcScript(100);
 	else if (name.contains("ChatterBot"))
-		return _scripts.getNamedScript(102);
+		return _scripts.getNpcScript(102);
 	else if (name.contains("BellBot"))
-		return _scripts.getNamedScript(101);
+		return _scripts.getNpcScript(101);
 	else if (name.contains("MaitreD"))
-		return _scripts.getNamedScript(112);
+		return _scripts.getNpcScript(112);
 	else if (name.contains("Succubus") || name.contains("Sub"))
-		return _scripts.getNamedScript(111);
+		return _scripts.getNpcScript(111);
 
 	return nullptr;
 }
@@ -259,7 +259,7 @@ TTNpcScript *CTrueTalkManager::getNpcScript(CTrueTalkNPC *npc) const {
 
 	if (!script) {
 		// Fall back on the default NPC script
-		script = _scripts.getNamedScript(101);
+		script = _scripts.getNpcScript(101);
 	}
 
 	return script;
diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp
index bfcfabe059..96daf76827 100644
--- a/engines/titanic/true_talk/tt_scripts.cpp
+++ b/engines/titanic/true_talk/tt_scripts.cpp
@@ -81,7 +81,7 @@ void TTScripts::addScript(TTNpcScript *script, int scriptId) {
 	TTRoomScript *roomScript = getRoomScript(scriptId);
 	assert(roomScript);
 
-	_namedScripts.push_back(new TTNpcScriptListItem(script, roomScript));
+	_npcScripts.push_back(new TTNpcScriptListItem(script, roomScript));
 }
 
 void TTScripts::addScript(TTRoomScript *script) {
@@ -92,8 +92,8 @@ TTRoomScript *TTScripts::getRoomScript(int scriptId) const {
 	return _roomScripts.findById(scriptId);
 }
 
-TTNpcScript *TTScripts::getNamedScript(int charId) const {
-	return _namedScripts.findById(charId);
+TTNpcScript *TTScripts::getNpcScript(int charId) const {
+	return _npcScripts.findById(charId);
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_scripts.h b/engines/titanic/true_talk/tt_scripts.h
index 7ee7263140..8dd2e9305d 100644
--- a/engines/titanic/true_talk/tt_scripts.h
+++ b/engines/titanic/true_talk/tt_scripts.h
@@ -56,7 +56,7 @@ public:
 
 class TTScripts {
 private:
-	TTNpcScriptList _namedScripts;
+	TTNpcScriptList _npcScripts;
 	TTRoomScriptList _roomScripts;
 	CTitleEngine *_titleEngine;
 	int _field24;
@@ -80,9 +80,9 @@ public:
 	TTRoomScript *getRoomScript(int scriptId) const;
 
 	/**
-	 * Return a pointer to the specified named character script
+	 * Return a pointer to the specified character script
 	 */
-	TTNpcScript *getNamedScript(int charId) const;
+	TTNpcScript *getNpcScript(int charId) const;
 };
 
 } // End of namespace Titanic