aboutsummaryrefslogtreecommitdiff
path: root/engines/sludge/people.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sludge/people.cpp')
-rw-r--r--engines/sludge/people.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index 1a032847ed..a477fbea85 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -61,12 +61,6 @@ int16 scaleHorizon = 75;
int16 scaleDivide = 150;
extern screenRegion *allScreenRegions;
-#define TF_max(a, b) ((a > b) ? a : b)
-
-inline int TF_abs(int a) {
- return (a > 0) ? a : -a;
-}
-
void setFrames(onScreenPerson &m, int a) {
m.myAnim = m.myPersona->animation[(a * m.myPersona->numDirections) + m.direction];
}
@@ -649,9 +643,9 @@ bool walkMe(onScreenPerson *thisPerson, bool move = true) {
if (s < 0.2)
s = 0.2;
- maxDiff = (TF_abs(xDiff) >= TF_abs(yDiff)) ? TF_abs(xDiff) : TF_abs(yDiff);
+ maxDiff = (abs(xDiff) >= abs(yDiff)) ? abs(xDiff) : abs(yDiff);
- if (TF_abs(maxDiff) > s) {
+ if (abs(maxDiff) > s) {
if (thisPerson->spinning) {
spinStep(thisPerson);
setFrames(*thisPerson, ANI_WALK);