Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Fixed bug 10844 - incorrect evaluation of threshold parameter, should us... #8

Closed
runrevmark wants to merge 1 commit into from
Closed

Fixed bug 10844 - incorrect evaluation of threshold parameter, should us... #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion engine/src/funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2787,7 +2787,9 @@ Exec_stat MCIntersect::eval(MCExecPoint &ep)
return ES_ERROR;
}

if (ep . ston() == ES_NORMAL)
// MW-2013-04-12: [[ Bug 10844 ]] Make sure we use ton(), otherwise it assumes
// input is a string.
if (ep . ton() == ES_NORMAL)
t_threshold = ep . getuint4();
else
{
Expand Down
1 change: 0 additions & 1 deletion engine/src/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4038,7 +4038,6 @@ bool MCObject::intersects(MCObject *p_other, uint32_t p_threshold)
memset(t_other_scanline, 0xff, t_scanline_width * 4);

// Now check for overlap!
bool t_intersects;
t_intersects = false;
for(int32_t y = 0; y < t_rect . height; y++)
{
Expand Down