libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

IMMORTAL: flameSet and Cycle utilize g_immortal instead of utilities

Browse Source
This commit is contained in:
Quote58 2022-09-22 03:40:30 -04:00 committed by Eugene Sandulenko
parent 7284826303
commit 4ca64366dc
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engines/immortal/cycle.cpp
View File

@ -47,10 +47,10 @@ namespace Immortal {
int Room::cycleNew(CycID id) {
// An 'available' cyc is identified by the index being -1
for (int i = 0; i < kMaxCycles; i++) {
if (_cycles[i]._index == -1) {
_cycles[i]._index = 0;
_cycles[i]._cycList = id;
debug("made cyc, = %d", i);
if (g_immortal->_cycles[i]._index == -1) {
g_immortal->_cycles[i]._index = 0;
g_immortal->_cycles[i]._cycList = id;
//debug("made cyc, = %d", i);
return i;
}
}
@ -59,18 +59,18 @@ int Room::cycleNew(CycID id) {
}
void Room::cycleFree(int c) {
_cycles[c]._index = -1;
g_immortal->_cycles[c]._index = -1;
}
bool Room::cycleAdvance(int c) {
/* If we have reached the end, check if repeat == true, and set back to 0 if so
* Otherwise, set to the last used index */
_cycles[c]._index++;
if (_cycPtrs[_cycles[c]._cycList]._frames[_cycles[c]._index] == -1) {
if (_cycPtrs[_cycles[c]._cycList]._repeat == true) {
_cycles[c]._index = 0;
g_immortal->_cycles[c]._index++;
if (g_immortal->_cycPtrs[g_immortal->_cycles[c]._cycList]._frames[g_immortal->_cycles[c]._index] == -1) {
if (g_immortal->_cycPtrs[g_immortal->_cycles[c]._cycList]._repeat == true) {
g_immortal->_cycles[c]._index = 0;
} else {
_cycles[c]._index--;
g_immortal->_cycles[c]._index--;
return true;
}
}
@ -88,33 +88,33 @@ int Room::cycleGetFrame(int c) {
* This is essentially self-modifying code, and it saves 2 bytes of DP memory over the traditional
* STA DP : LDA (DP)
*/
debug("%d", _cycPtrs[_cycles[c]._cycList]._frames[_cycles[c]._index]);
return _cycPtrs[_cycles[c]._cycList]._frames[_cycles[c]._index];
//debug("%d", _cycPtrs[_cycles[c]._cycList]._frames[_cycles[c]._index]);
return g_immortal->_cycPtrs[g_immortal->_cycles[c]._cycList]._frames[g_immortal->_cycles[c]._index];
}
int Room::cycleGetNumFrames(int c) {
// Why in the world is this not kept as a property of the cycle? We have to calculate the size of the array each time
int index = 0;
while (_cycPtrs[_cycles[c]._cycList]._frames[index] != -1) {
while (g_immortal->_cycPtrs[g_immortal->_cycles[c]._cycList]._frames[index] != -1) {
index++;
}
return index;
}
DataSprite *Room::cycleGetDataSprite(int c) {
return &_dataSprites[_cycPtrs[_cycles[c]._cycList]._sName];
return &g_immortal->_dataSprites[g_immortal->_cycPtrs[g_immortal->_cycles[c]._cycList]._sName];
}
CycID Room::getCycList(int c) {
return _cycles[c]._cycList;
return g_immortal->_cycles[c]._cycList;
}
int Room::cycleGetIndex(int c) {
return _cycles[c]._index;
return g_immortal->_cycles[c]._index;
}
void Room::cycleSetIndex(int c, int f) {
_cycles[c]._index = f;
g_immortal->_cycles[c]._index = f;
}

6
engines/immortal/flameSet.cpp
View File

@ -47,7 +47,7 @@ void Room::flameFreeAll() {
void Room::flameDrawAll(uint16 vX, uint16 vY) {
for (int i = 0; i < _fset.size(); i++) {
univAddSprite(vX, vY, _fset[i]._x, _fset[i]._y, _cycPtrs[_cycles[_fset[i]._c]._cycList]._sName, cycleGetFrame(_fset[i]._c), 0);
univAddSprite(vX, vY, _fset[i]._x, _fset[i]._y, g_immortal->_cycPtrs[g_immortal->_cycles[_fset[i]._c]._cycList]._sName, cycleGetFrame(_fset[i]._c), 0);
if (cycleAdvance(_fset[i]._c) == true) {
cycleFree(_fset[i]._c);
_fset[i]._c = flameGetCyc(&_fset[i], 1);
@ -68,7 +68,7 @@ bool Room::roomLighted() {
return false;
}
void Room::lightTorch(int x, int y) {
void Room::lightTorch(uint8 x, uint8 y) {
/* Checks every torch to see if it is:
* pattern == off, and inside the point x,y
* which is the fireball position. This is a
@ -79,7 +79,7 @@ void Room::lightTorch(int x, int y) {
for (int i = 0; i < _fset.size(); i++) {
if (_fset[i]._p == kFlameOff) {
if (Immortal::Utilities::inside(x, y, kLightTorchX, _fset[i]._x + 16, _fset[i]._y + 8)) {
if (Utilities::inside(kLightTorchX, x, y, _fset[i]._x + 16, _fset[i]._y + 8)) {
_fset[i]._p = kFlameNormal;
}