diff options
| author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
| commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
| tree | e6e98f266610f6428c248aed6abc75e637e45231 /engines/parallaction/exec_ns.cpp | |
| parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
| download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip | |
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'engines/parallaction/exec_ns.cpp')
| -rw-r--r-- | engines/parallaction/exec_ns.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index 91a8809070..c7f6464696 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -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))) { |