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

fix 2 cases not handled in findBob() (stupid me...) and match new/delete

Browse Source 
svn-id: r10576
This commit is contained in:
Gregory Montoir 2003-10-03 19:59:19 +00:00
parent 8fb8ea48ec
commit d19c7980fb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
queen/logic.cpp
View File

@ -31,7 +31,7 @@ QueenLogic::QueenLogic(QueenResource *resource)
}
QueenLogic::~QueenLogic() {
free (_jas);
delete[] _jas;
//free(_graphicData);
}
@ -280,16 +280,25 @@ uint16 QueenLogic::findBob(uint16 obj) {
++idxStatic;
}
}
else if(img == -1) {
++idxStatic;
}
else if(img == -2) {
++idxAnimated;
}
}
// FIXME: _max*Frame variables should initialized in SETUP_FURNITURE and DISP_ROOM
// FIXME: _max*Frame variables should be initialized in SETUP_FURNITURE and DISP_ROOM
if(bobtype == 0) {
// static bob
bobnum = 19 + _maxStaticFrame + idxStatic;
if(idxStatic > 0) {
bobnum = 19 + _maxStaticFrame + idxStatic;
}
}
else {
// animated bob
bobnum = 4 + _maxAnimatedFrame + idxAnimated;
if(idxAnimated > 0) {
bobnum = 4 + _maxAnimatedFrame + idxAnimated;
}
}
}
}
@ -355,7 +364,7 @@ uint16 QueenLogic::findFrame(uint16 obj) {
if(img <= -10) {
GraphicData* pgd = &_graphicData[-(img + 10)];
if(pgd->lastFrame != 0) {
idx += ABS(pgd->lastFrame - pgd->firstFrame) + 1;
idx += ABS(pgd->lastFrame) - pgd->firstFrame + 1;
}
else {
++idx;