libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 16:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enforced convention on loader names: load[ItemType]

Browse Source 
svn-id: r25937
This commit is contained in:
Nicola Mettifogo 2007-03-02 22:26:39 +00:00
parent 02d4001f57
commit 753d83f946
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/parallaction/dialogue.cpp
View File

@ -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");
}

6
engines/parallaction/disk.cpp
View File

@ -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;

6
engines/parallaction/disk.h
View File

@ -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);

4
engines/parallaction/inventory.cpp
View File

@ -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);

2
engines/parallaction/location.cpp
View File

@ -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);

2
engines/parallaction/zone.cpp
View File

@ -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;