[Scummvm-cvs-logs] SF.net SVN: scummvm: [25937] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Mar 2 23:26:39 CET 2007
Revision: 25937
http://scummvm.svn.sourceforge.net/scummvm/?rev=25937&view=rev
Author: peres001
Date: 2007-03-02 14:26:39 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
enforced convention on loader names: load[ItemType]
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/zone.cpp
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-02 22:26:39 UTC (rev 25937)
@@ -229,7 +229,7 @@
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 @@
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");
}
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-02 22:26:39 UTC (rev 25937)
@@ -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 openLocation(const char *name, char* script) {
+void loadLocation(const char *name, char* script) {
char archivefile[PATH_LEN];
@@ -118,7 +118,7 @@
// 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;
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/disk.h 2007-03-02 22:26:39 UTC (rev 25937)
@@ -72,9 +72,9 @@
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);
Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/inventory.cpp 2007-03-02 22:26:39 UTC (rev 25937)
@@ -372,7 +372,7 @@
void refreshInventory(const char *character) {
- openObjects(character, &_characterInventory);
+ loadObjects(character, &_characterInventory);
redrawInventory();
_vm->_graphics->freeCnv(&_characterInventory);
@@ -381,7 +381,7 @@
void refreshInventoryItem(const char *character, uint16 index) {
- openObjects(character, &_characterInventory);
+ loadObjects(character, &_characterInventory);
drawInventoryItem(index, &_inventory[index]);
_vm->_graphics->freeCnv(&_characterInventory);
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-03-02 22:26:39 UTC (rev 25937)
@@ -49,7 +49,7 @@
_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);
Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp 2007-03-02 22:23:02 UTC (rev 25936)
+++ scummvm/trunk/engines/parallaction/zone.cpp 2007-03-02 22:26:39 UTC (rev 25937)
@@ -365,7 +365,7 @@
void displayCharacterComment(ExamineData *data) {
if (data->_description == NULL) return;
- openTalk(_vm->_characterName, &_characterFace);
+ loadTalk(_vm->_characterName, &_characterFace);
StaticCnv v3C;
v3C._width = _characterFace._width;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list