Fixed the spaces before tabs.
svn-id: r30667
This commit is contained in:
parent
66e9d4f5e8
commit
d6c34bdc4b
207 changed files with 6067 additions and 6067 deletions
|
@ -29,7 +29,7 @@
|
|||
|
||||
namespace Parallaction {
|
||||
|
||||
#define INST_ON 1
|
||||
#define INST_ON 1
|
||||
#define INST_OFF 2
|
||||
#define INST_X 3
|
||||
#define INST_Y 4
|
||||
|
@ -722,8 +722,8 @@ Zone *Parallaction::hitZone(uint32 type, uint16 x, uint16 y) {
|
|||
_e = ((_si >= a->_left + a->width()) || (_si <= a->_left)) ? 0 : 1; // _e: horizontal range
|
||||
_f = ((_di >= a->_top + a->height()) || (_di <= a->_top)) ? 0 : 1; // _f: vertical range
|
||||
|
||||
_b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character)
|
||||
_c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object
|
||||
_b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character)
|
||||
_c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object
|
||||
_d = ((a->_type & 0xFFFF0000) != type) ? 0 : 1; // _d: Animation is an object of the same type
|
||||
|
||||
if ((_a != 0 && _e != 0 && _f != 0) && ((_b != 0 && _c != 0) || (a->_type == type) || (_d != 0))) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue