enforced convention on loader names: load[ItemType]

svn-id: r25937

6 files changed, 12 insertions, 12 deletions

diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 730da3f8ce..9f5f83970a 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -229,7 +229,7 @@ void runDialogue(SpeakData *data) {
 		debugC(1, kDebugDialogue, "runDialogue: special trick for 'museum' location");
 	}
 
-	openTalk(_vm->_characterName, &_characterFace);
+	loadTalk(_vm->_characterName, &_characterFace);
 
 	_vm->_graphics->setFont("comic");
 
@@ -241,7 +241,7 @@ void runDialogue(SpeakData *data) {
 		debugC(1, kDebugDialogue, "runDialogue: using default character head");
 	} else {
 		debugC(1, kDebugDialogue, "runDialogue: loading 2nd character head '%s'", _vm->_characterName);
-		openTalk(data->_name, &v6E);
+		loadTalk(data->_name, &v6E);
 		debugC(1, kDebugDialogue, "runDialogue: 2nd character head loaded");
 	}
 
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index ff4487fbf6..f42398466f 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -27,7 +27,7 @@
 
 namespace Parallaction {
 
-void openTalk(const char *name, Cnv *cnv) {
+void loadTalk(const char *name, Cnv *cnv) {
 
 	char* ext = strstr(name, ".talk");
 	if (ext != NULL) {
@@ -55,7 +55,7 @@ void openTalk(const char *name, Cnv *cnv) {
 
 }
 
-void openLocation(const char *name, char* script) {
+void loadLocation(const char *name, char* script) {
 
 	char archivefile[PATH_LEN];
 
@@ -118,7 +118,7 @@ void loadFont(const char* name, Cnv* cnv) {
 
 // loads character's icons set
 
-void openObjects(const char *name, Cnv* cnv) {
+void loadObjects(const char *name, Cnv* cnv) {
 
 	if (!scumm_strnicmp("mini", name, 4)) {
 		name += 4;
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index c1d3b2f811..abe91b304b 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -72,9 +72,9 @@ public:
 	uint32 read(void *dataPtr, uint32 dataSize);
 };
 
-void openLocation(const char *name, char* script);
-void openTalk(const char *name, Cnv *cnv);
-void openObjects(const char *name, Cnv *cnv);
+void loadLocation(const char *name, char* script);
+void loadTalk(const char *name, Cnv *cnv);
+void loadObjects(const char *name, Cnv *cnv);
 void loadPointer(StaticCnv* cnv);
 void loadHead(const char* name, StaticCnv* cnv);
 void loadFont(const char* name, Cnv* cnv);
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index d3e046ff2e..9aa6f2f283 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -372,7 +372,7 @@ void cleanInventory() {
 
 
 void refreshInventory(const char *character) {
-	openObjects(character, &_characterInventory);
+	loadObjects(character, &_characterInventory);
 	redrawInventory();
 	_vm->_graphics->freeCnv(&_characterInventory);
 
@@ -381,7 +381,7 @@ void refreshInventory(const char *character) {
 
 
 void refreshInventoryItem(const char *character, uint16 index) {
-	openObjects(character, &_characterInventory);
+	loadObjects(character, &_characterInventory);
 	drawInventoryItem(index, &_inventory[index]);
 	_vm->_graphics->freeCnv(&_characterInventory);
 
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index 219ca8c012..4a5ec68f2d 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -49,7 +49,7 @@ void Parallaction::parseLocation(const char *filename) {
 	_vm->_graphics->setFont("topaz");
 
 	location_src = (char*)memAlloc(0x4000);
-	openLocation(filename, location_src);
+	loadLocation(filename, location_src);
 	_locationScript = new Script(location_src);
 
 	fillBuffers(*_locationScript, true);
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp
index af5ebb37b5..6ad3c5667a 100644
--- a/engines/parallaction/zone.cpp
+++ b/engines/parallaction/zone.cpp
@@ -365,7 +365,7 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
 void displayCharacterComment(ExamineData *data) {
 	if (data->_description == NULL) return;
 
-	openTalk(_vm->_characterName, &_characterFace);
+	loadTalk(_vm->_characterName, &_characterFace);
 
 	StaticCnv v3C;
 	v3C._width = _characterFace._width;