From ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 25 May 2005 09:17:35 +0000 Subject: abs -> ABS (code unification) svn-id: r18246 --- scumm/script_v6.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scumm/script_v6.cpp') diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 6ed5c7637f..dddc942343 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2425,8 +2425,8 @@ void ScummEngine_v6::o6_dim2dimArray() { } void ScummEngine_v6::o6_abs() { - int a = pop(); // palmos: prevent multi pop if we use an abs function defined as : #define abs(a) ((a) < 0 ? -(a) : (a)) - push(abs(a)); + int a = pop(); + push(ABS(a)); } void ScummEngine_v6::o6_distObjectObject() { -- cgit v1.2.3