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

ULTIMA8: Fix tests for sort item to use bounds that properly overlap

Browse Source
This commit is contained in:
Matthew Jimenez 2023-09-22 23:57:36 -05:00
parent 47ab35a76c
commit 888f1c6154
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/engines/ultima/ultima8/world/sort_item.h
View File

@ -17,11 +17,14 @@ class U8SortItemTestSuite : public CxxTest::TestSuite {
Ultima::Ultima8::SortItem si1;
Ultima::Ultima8::SortItem si2;
Ultima::Ultima8::Box b1(0, 10, 0, 10, 10, 0);
Ultima::Ultima8::Box b2(0, 30, 0, 10, 10, 0);
Ultima::Ultima8::Box b1(0, 10, 0, 10, 10, 10);
Ultima::Ultima8::Box b2(0, 20, 0, 10, 10, 10);
si1.setBoxBounds(b1, 0, 0);
si2.setBoxBounds(b2, 0, 0);
TS_ASSERT(si1.overlap(si2));
TS_ASSERT(si2.overlap(si1));
TS_ASSERT(si1.below(si2));
TS_ASSERT(!si2.below(si1));
}
@ -31,11 +34,14 @@ class U8SortItemTestSuite : public CxxTest::TestSuite {
Ultima::Ultima8::SortItem si1;
Ultima::Ultima8::SortItem si2;
Ultima::Ultima8::Box b1(10, 0, 0, 10, 10, 0);
Ultima::Ultima8::Box b2(30, 0, 0, 10, 10, 0);
Ultima::Ultima8::Box b1(10, 0, 0, 10, 10, 10);
Ultima::Ultima8::Box b2(20, 0, 0, 10, 10, 10);
si1.setBoxBounds(b1, 0, 0);
si2.setBoxBounds(b2, 0, 0);
TS_ASSERT(si1.overlap(si2));
TS_ASSERT(si2.overlap(si1));
TS_ASSERT(si1.below(si2));
TS_ASSERT(!si2.below(si1));
}
@ -46,10 +52,13 @@ class U8SortItemTestSuite : public CxxTest::TestSuite {
Ultima::Ultima8::SortItem si2;
Ultima::Ultima8::Box b1(10, 10, 0, 10, 10, 10);
Ultima::Ultima8::Box b2(10, 10, 20, 10, 10, 10);
Ultima::Ultima8::Box b2(10, 10, 10, 10, 10, 10);
si1.setBoxBounds(b1, 0, 0);
si2.setBoxBounds(b2, 0, 0);
TS_ASSERT(si1.overlap(si2));
TS_ASSERT(si2.overlap(si1));
TS_ASSERT(si1.below(si2));
TS_ASSERT(!si2.below(si1));
}
@ -354,15 +363,18 @@ class U8SortItemTestSuite : public CxxTest::TestSuite {
Ultima::Ultima8::SortItem si1;
Ultima::Ultima8::SortItem si2;
Ultima::Ultima8::Box b1(129, 32, 0, 64, 64, 24);
Ultima::Ultima8::Box b1(7839, 19839, 24, 64, 64, 24);
si1.setBoxBounds(b1, 0, 0);
si1._anim = true;
si1._solid = true;
Ultima::Ultima8::Box b2(64, 69, 24, 64, 64, 40);
Ultima::Ultima8::Box b2(7774, 19876, 48, 64, 64, 40);
si2.setBoxBounds(b2, 0, 0);
si2._solid = true;
TS_ASSERT(si1.overlap(si2));
TS_ASSERT(si2.overlap(si1));
TS_ASSERT(si1.below(si2));
TS_ASSERT(!si2.below(si1));
}