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

AGS: Adjusted comment in SetObjectFrame to make it bit more visible

Browse Source 
From upstream 6c6a5ff35a29eedbcd8aa1a33ec99de2f3536b09
This commit is contained in:
Paul Gilbert 2022-03-23 20:37:15 -07:00
parent de739c1913
commit 8511f7b36c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/ags/engine/ac/global_object.cpp
View File

@ -156,11 +156,11 @@ void SetObjectFrame(int obn, int viw, int lop, int fra) {
if (lop < 0 || lop >= _GP(views)[viw].numLoops) quitprintf("!SetObjectFrame: invalid loop number used (%d, range is 0 - %d)", lop, _GP(views)[viw].numLoops - 1);
// historically AGS let user to pass literally any positive invalid frame value by silently reassigning it to zero...
if (fra < 0 || fra >= _GP(views)[viw].loops[lop].numFrames) {
if (_GP(views)[viw].loops[lop].numFrames == 0) // NOTE: we have a dummy frame allocated for this case
if (_GP(views)[viw].loops[lop].numFrames == 0)
debug_script_warn("SetObjectFrame: specified loop %d has no frames, will fallback to dummy frame", lop);
else
debug_script_warn("SetObjectFrame: frame index out of range (%d, must be 0 - %d), set to 0", fra, _GP(views)[viw].loops[lop].numFrames - 1);
fra = 0;
fra = 0; // NOTE: we have 1 dummy frame allocated for empty loops
}
if (viw > UINT16_MAX || lop > UINT16_MAX || fra > UINT16_MAX) {
debug_script_warn("Warning: object's (id %d) view/loop/frame (%d/%d/%d) is outside of internal range (%d/%d/%d), reset to no view",

2
engines/ags/shared/ac/view.cpp
View File

@ -73,7 +73,7 @@ bool ViewLoopNew::RunNextLoop() {
void ViewLoopNew::Initialize(int frameCount) {
numFrames = frameCount;
flags = 0;
// an extra frame is allocated o prevent crashes with empty loops
// an extra frame is allocated to prevent crashes with empty loops
frames.resize(numFrames > 0 ? numFrames : 1);
}