Merge branch 'master' into input-hotplug
This commit is contained in:
commit
633b6a69f5
|
@ -2020,13 +2020,13 @@ CheckMotion(xEvent *xE)
|
||||||
sprite.hot.y = sprite.physLimits.y1;
|
sprite.hot.y = sprite.physLimits.y1;
|
||||||
else if (sprite.hot.y >= sprite.physLimits.y2)
|
else if (sprite.hot.y >= sprite.physLimits.y2)
|
||||||
sprite.hot.y = sprite.physLimits.y2 - 1;
|
sprite.hot.y = sprite.physLimits.y2 - 1;
|
||||||
#ifdef XEVIE
|
|
||||||
xeviehot.x = sprite.hot.x;
|
|
||||||
xeviehot.y = sprite.hot.y;
|
|
||||||
#endif
|
|
||||||
#ifdef SHAPE
|
#ifdef SHAPE
|
||||||
if (sprite.hotShape)
|
if (sprite.hotShape)
|
||||||
ConfineToShape(sprite.hotShape, &sprite.hot.x, &sprite.hot.y);
|
ConfineToShape(sprite.hotShape, &sprite.hot.x, &sprite.hot.y);
|
||||||
|
#endif
|
||||||
|
#ifdef XEVIE
|
||||||
|
xeviehot.x = sprite.hot.x;
|
||||||
|
xeviehot.y = sprite.hot.y;
|
||||||
#endif
|
#endif
|
||||||
sprite.hotPhys = sprite.hot;
|
sprite.hotPhys = sprite.hot;
|
||||||
if ((sprite.hotPhys.x != XE_KBPTR.rootX) ||
|
if ((sprite.hotPhys.x != XE_KBPTR.rootX) ||
|
||||||
|
|
Loading…
Reference in New Issue
Block a user