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

FULLPIPE: Rename base class variables to avoid ambigiuity

Browse Source
This commit is contained in:
Eugene Sandulenko 2013-08-12 12:32:49 +03:00
parent 687d0624e5
commit 13059906c5
8 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/fullpipe/gameloader.cpp
View File

@ -199,7 +199,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) {
StaticANIObject *stobj = g_fullpipe->_currentScene->getStaticANIObject1ById(_field_FA, -1);
if (stobj) {
stobj->setFlags(stobj->_flags & 0x100);
stobj->_flags &= 0x100;
ExCommand *ex = new ExCommand(stobj->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
@ -220,7 +220,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) {
} else {
StaticANIObject *stobj = g_fullpipe->_currentScene->getStaticANIObject1ById(_field_FA, -1);
if (stobj)
stobj->setFlags(stobj->_flags & 0xfeff);
stobj->_flags &= 0xfeff;
}
return true;

18
engines/fullpipe/gfx.cpp
View File

@ -96,7 +96,7 @@ bool Background::load(MfcArchive &file) {
}
void Background::addPictureObject(PictureObject *pct) {
if (pct->_field_4)
if (pct->_okeyCode)
pct->renumPictures(&_picObjList);
bool inserted = false;
@ -181,7 +181,7 @@ bool PictureObject::setPicAniInfo(PicAniInfo *picAniInfo) {
if (picAniInfo->type & 2) {
setOXY(picAniInfo->ox, picAniInfo->oy);
_priority = picAniInfo->priority;
_field_4 = picAniInfo->field_8;
_okeyCode = picAniInfo->field_8;
setFlags(picAniInfo->flags);
_field_8 = picAniInfo->field_24;
@ -192,7 +192,7 @@ bool PictureObject::setPicAniInfo(PicAniInfo *picAniInfo) {
}
GameObject::GameObject() {
_field_4 = 0;
_okeyCode = 0;
_flags = 0;
_id = 0;
_ox = 0;
@ -203,7 +203,7 @@ GameObject::GameObject() {
}
GameObject::GameObject(GameObject *src) {
_field_4 = 1;
_okeyCode = 1;
_flags = 0;
_id = src->_id;
@ -219,7 +219,7 @@ GameObject::GameObject(GameObject *src) {
bool GameObject::load(MfcArchive &file) {
debug(5, "GameObject::load()");
_field_4 = 0;
_okeyCode = 0;
_flags = 0;
_field_20 = 0;
@ -247,14 +247,14 @@ void GameObject::renumPictures(CPtrList *lst) {
for (uint i = 0; i < lst->size(); i++) {
if (_id == ((PictureObject *)((*lst)[i]))->_id)
buf[((PictureObject *)((*lst)[i]))->_field_4] = 1;
buf[((PictureObject *)((*lst)[i]))->_okeyCode] = 1;
}
if (buf[_field_4]) {
if (buf[_okeyCode]) {
uint count;
for (count = 1; buf[count] && count < lst->size() + 2; count++)
;
_field_4 = count;
_okeyCode = count;
}
free(buf);
@ -322,7 +322,7 @@ bool Picture::load(MfcArchive &file) {
_width = file.readUint32LE();
_height = file.readUint32LE();
_flags |= 1;
_mflags |= 1;
_memoryObject2 = new MemoryObject2;
_memoryObject2->load(file);

2
engines/fullpipe/gfx.h
View File

@ -109,7 +109,7 @@ class BigPicture : public Picture {
class GameObject : public CObject {
public:
int16 _field_4;
int16 _okeyCode;
int16 _field_6;
int _field_8;
int16 _flags;

10
engines/fullpipe/scene.cpp
View File

@ -272,7 +272,7 @@ StaticANIObject *Scene::getAniMan() {
StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) {
for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
StaticANIObject *o = (StaticANIObject *)*s;
if (o->_id == obj && (a3 == -1 || o->_field_4 == a3))
if (o->_id == obj && (a3 == -1 || o->_okeyCode == a3))
return o;
}
@ -282,7 +282,7 @@ StaticANIObject *Scene::getStaticANIObject1ById(int obj, int a3) {
StaticANIObject *Scene::getStaticANIObject1ByName(char *name, int a3) {
for (CPtrList::iterator s = _staticANIObjectList1.begin(); s != _staticANIObjectList1.end(); ++s) {
StaticANIObject *o = (StaticANIObject *)*s;
if (!strcmp(o->_objectName, name) && (a3 == -1 || o->_field_4 == a3))
if (!strcmp(o->_objectName, name) && (a3 == -1 || o->_okeyCode == a3))
return o;
}
@ -304,13 +304,13 @@ void Scene::deleteStaticANIObject(StaticANIObject *obj) {
}
void Scene::addStaticANIObject(StaticANIObject *obj, bool addList2) {
if (obj->_field_4)
if (obj->_okeyCode)
obj->renumPictures(&_staticANIObjectList1);
_staticANIObjectList1.push_back(obj);
if (addList2) {
if (!obj->_field_4)
if (!obj->_okeyCode)
obj->clearFlags();
_staticANIObjectList2.push_back(obj);
@ -325,7 +325,7 @@ void Scene::setPictureObjectsFlag4() {
PictureObject *Scene::getPictureObjectById(int objId, int flags) {
for (uint i = 1; i < _picObjList.size(); i++) {
if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_field_4 == flags)
if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_okeyCode == flags)
return (PictureObject *)_picObjList[i];
}

2
engines/fullpipe/scenes.cpp
View File

@ -776,7 +776,7 @@ int global_messageHandler1(ExCommand *cmd) {
} else if (st == (0x4000 | ST_MAN_RIGHT)) {
newex = new ExCommand(g_fullpipe->_aniMan->_id, 1, MV_MAN_LOOKUP, 0, 0, 0, 1, 0, 0, 0);
}
newex->_keyCode = g_fullpipe->_aniMan->_field_4;
newex->_keyCode = g_fullpipe->_aniMan->_okeyCode;
newex->_excFlags |= 3;
newex->postMessage();
}

20
engines/fullpipe/statics.cpp
View File

@ -509,7 +509,7 @@ void StaticANIObject::update(int counterdiff) {
newex->_excFlags |= 2;
if (newex->_messageKind == 17) {
newex->_parentId = _id;
newex->_keyCode = _field_4;
newex->_keyCode = _okeyCode;
}
newex->sendMessage();
@ -520,7 +520,7 @@ void StaticANIObject::update(int counterdiff) {
if (dyn->_initialCountdown == dyn->_countdown && dyn->_field_68 == 0) {
newex = new ExCommand(_id, 17, dyn->_field_68, 0, 0, 0, 1, 0, 0, 0);
newex->_excFlags = 2;
newex->_keyCode = _field_4;
newex->_keyCode = _okeyCode;
newex->sendMessage();
if (!_movement)
@ -599,7 +599,7 @@ bool StaticANIObject::setPicAniInfo(PicAniInfo *picAniInfo) {
if (picAniInfo->type & 3) {
setOXY(picAniInfo->ox, picAniInfo->oy);
_priority = picAniInfo->priority;
_field_4 = picAniInfo->field_8;
_okeyCode = picAniInfo->field_8;
setFlags(picAniInfo->flags);
_field_8 = picAniInfo->field_24;
}
@ -767,7 +767,7 @@ bool StaticANIObject::startAnim(int movementId, int messageQueueId, int dynPhase
ExCommand *newex = new ExCommand(_id, 17, 23, 0, 0, movementId, 1, 0, 0, 0);
newex->_keyCode = _field_4;
newex->_keyCode = _okeyCode;
newex->_excFlags = 2;
newex->postMessage();
@ -1277,23 +1277,23 @@ DynamicPhase::DynamicPhase(DynamicPhase *src, bool reverse) {
_dataSize = src->_dataSize;
if (g_fullpipe->_currArchive) {
_field_14 = 0;
_mfield_14 = 0;
_libHandle = g_fullpipe->_currArchive;
}
_flags |= 1;
_mflags |= 1;
_someX = src->_someX;
_someY = src->_someY;
} else {
_field_14 = src->_field_14;
_field_8 = src->_field_8;
_flags = src->_flags;
_mfield_14 = src->_mfield_14;
_mfield_8 = src->_mfield_8;
_mflags = src->_mflags;
_memfilename = (char *)calloc(strlen(src->_memfilename) + 1, 1);
strncpy(_memfilename, src->_memfilename, strlen(src->_memfilename) + 1);
_dataSize = src->_dataSize;
_field_10 = src->_field_10;
_mfield_10 = src->_mfield_10;
_libHandle = src->_libHandle;
_bitmap = src->_bitmap;

20
engines/fullpipe/utils.cpp
View File

@ -111,12 +111,12 @@ char *MfcArchive::readPascalString(bool twoByte) {
MemoryObject::MemoryObject() {
_memfilename = 0;
_field_8 = 0;
_field_C = 0;
_field_10 = -1;
_field_14 = 1;
_mfield_8 = 0;
_mfield_C = 0;
_mfield_10 = -1;
_mfield_14 = 1;
_dataSize = 0;
_flags = 0;
_mflags = 0;
_libHandle = 0;
_data = 0;
}
@ -139,7 +139,7 @@ bool MemoryObject::load(MfcArchive &file) {
}
if (g_fullpipe->_currArchive) {
_field_14 = 0;
_mfield_14 = 0;
_libHandle = g_fullpipe->_currArchive;
}
@ -168,7 +168,7 @@ void MemoryObject::loadFile(char *filename) {
byte *MemoryObject::getData() {
load();
if (_field_14 || _flags & 1) {
if (_mfield_14 || _mflags & 1) {
return _data;
} else {
error("Unhandled packed data");
@ -188,10 +188,10 @@ void MemoryObject::freeData() {
}
bool MemoryObject::testFlags() {
if (_field_8)
if (_mfield_8)
return false;
if (_flags & 1)
if (_mflags & 1)
return true;
return false;
@ -210,7 +210,7 @@ bool MemoryObject2::load(MfcArchive &file) {
debug(5, "MemoryObject2::load()");
MemoryObject::load(file);
_flags |= 1;
_mflags |= 1;
debug(5, "MemoryObject2::load: <%s>", _memfilename);

16
engines/fullpipe/utils.h
View File

@ -83,16 +83,16 @@ class MemoryObject : CObject {
protected:
char *_memfilename;
int _field_8;
int _field_C;
int _field_10;
char _field_14;
char _field_15;
char _field_16;
char _field_17;
int _mfield_8;
int _mfield_C;
int _mfield_10;
char _mfield_14;
char _mfield_15;
char _mfield_16;
char _mfield_17;
byte *_data;
int _dataSize;
int _flags;
int _mflags;
NGIArchive *_libHandle;
public: