[Scummvm-cvs-logs] SF.net SVN: scummvm: [26202] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun Mar 18 11:34:43 CET 2007
Revision: 26202
http://scummvm.svn.sourceforge.net/scummvm/?rev=26202&view=rev
Author: peres001
Date: 2007-03-18 03:34:41 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
Made loadObjects return a new Cnv instead of accepting a parameter.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-18 10:30:51 UTC (rev 26201)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-18 10:34:41 UTC (rev 26202)
@@ -322,7 +322,7 @@
// loads character's icons set
-void Disk::loadObjects(const char *name, Cnv* cnv) {
+Cnv* Disk::loadObjects(const char *name) {
if (IS_MINI_CHARACTER(name)) {
name += 4;
@@ -331,9 +331,9 @@
char path[PATH_LEN];
sprintf(path, "%sobj", name);
+ Cnv* cnv = new Cnv;
loadExternalCnv(path, cnv);
-
- return;
+ return cnv;
}
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2007-03-18 10:30:51 UTC (rev 26201)
+++ scummvm/trunk/engines/parallaction/disk.h 2007-03-18 10:34:41 UTC (rev 26202)
@@ -106,7 +106,7 @@
Script* loadLocation(const char *name);
Script* loadScript(const char* name);
Cnv* loadTalk(const char *name);
- void loadObjects(const char *name, Cnv *cnv);
+ Cnv* loadObjects(const char *name);
StaticCnv* loadPointer();
StaticCnv* loadHead(const char* name);
void loadFont(const char* name, Cnv* cnv);
Modified: scummvm/trunk/engines/parallaction/inventory.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/inventory.cpp 2007-03-18 10:30:51 UTC (rev 26201)
+++ scummvm/trunk/engines/parallaction/inventory.cpp 2007-03-18 10:34:41 UTC (rev 26202)
@@ -187,8 +187,8 @@
uint16 col = pos % INVENTORY_ITEMS_PER_LINE;
// FIXME: this will end up in a general blit function
- byte* s = _vm->_char._objs._array[item->_index];
- byte* d = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs._height * INVENTORY_WIDTH;
+ byte* s = _vm->_char._objs->_array[item->_index];
+ byte* d = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs->_height * INVENTORY_WIDTH;
for (uint32 i = 0; i < INVENTORYITEM_HEIGHT; i++) {
memcpy(d, s, INVENTORYITEM_WIDTH);
@@ -228,8 +228,8 @@
uint16 line = pos / INVENTORY_ITEMS_PER_LINE;
uint16 col = pos % INVENTORY_ITEMS_PER_LINE;
- Common::Rect r(INVENTORYITEM_WIDTH, _vm->_char._objs._height);
- r.moveTo(col * INVENTORYITEM_WIDTH, line * _vm->_char._objs._height);
+ Common::Rect r(INVENTORYITEM_WIDTH, _vm->_char._objs->_height);
+ r.moveTo(col * INVENTORYITEM_WIDTH, line * _vm->_char._objs->_height);
drawBorder(r, _buffer, color);
@@ -247,7 +247,7 @@
// FIXME: this will end up in a general blit function
byte* d = dst;
- byte* s = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs._height * INVENTORY_WIDTH;
+ byte* s = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs->_height * INVENTORY_WIDTH;
for (uint32 i = 0; i < INVENTORYITEM_HEIGHT; i++) {
memcpy(d, s, INVENTORYITEM_WIDTH);
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2007-03-18 10:30:51 UTC (rev 26201)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2007-03-18 10:34:41 UTC (rev 26202)
@@ -732,7 +732,8 @@
_vm->_gfx->freeStaticCnv(_vm->_char._head);
if (_vm->_char._head) delete _vm->_char._head;
- _vm->_gfx->freeCnv(&_vm->_char._objs);
+ _vm->_gfx->freeCnv(_vm->_char._objs);
+ if (_vm->_char._objs) delete _vm->_char._objs;
}
return;
@@ -811,7 +812,7 @@
if (!IS_DUMMY_CHARACTER(name)) {
_vm->_char._head = _disk->loadHead(path);
_vm->_char._talk = _disk->loadTalk(path);
- _disk->loadObjects(name, &_vm->_char._objs);
+ _vm->_char._objs = _disk->loadObjects(name);
sprintf(path, "mini%s", v32);
_disk->loadFrames(path, &_vm->_char._miniFrames);
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-03-18 10:30:51 UTC (rev 26201)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-03-18 10:34:41 UTC (rev 26202)
@@ -240,7 +240,7 @@
Cnv *_talk;
Cnv _normalFrames;
Cnv _miniFrames;
- Cnv _objs;
+ Cnv *_objs;
Character() {
_talk = NULL;
@@ -255,7 +255,8 @@
// _head._data0 = NULL;
// _head._data1 = NULL;
- _objs._count = 0;
+ _objs = NULL;
+// _objs._count = 0;
_ani._zone._left = 150;
_ani._zone._top = 100;
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