mirror/fallout1-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout1-ce.git synced 2024-10-02 21:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix op_obj_on_screen rectangle

Browse Source 
Closes #70
This commit is contained in:
Alexander Batalov 2023-05-20 08:52:48 +03:00
parent 194110e078
commit d40be3ad11
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/int/support/intextra.cc
View File

@ -41,6 +41,7 @@
#include "plib/gnw/debug.h"
#include "plib/gnw/input.h"
#include "plib/gnw/rect.h"
#include "plib/gnw/svga.h"
#include "plib/gnw/vcr.h"
namespace fallout {
@ -3974,9 +3975,6 @@ static void op_combat_difficulty(Program* program)
// 0x4522FC
static void op_obj_on_screen(Program* program)
{
// 0x44B598
static Rect rect = { 0, 0, 640, 480 };
Object* object = static_cast<Object*>(programStackPopPointer(program));
int result = 0;
@ -3986,7 +3984,10 @@ static void op_obj_on_screen(Program* program)
Rect objectRect;
obj_bound(object, &objectRect);
if (rect_inside_bound(&objectRect, &rect, &objectRect) == 0) {
// CE: Original code checks if object intersects hardcoded 640x480
// rectangle (i.e. without accounting for interface bar). Do the
// same but with screen rectangle.
if (rect_inside_bound(&objectRect, &scr_size, &objectRect) == 0) {
result = 1;
}
}