From 987fd67ce0591e35b554b8dc1079e4889e9b0955 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 11 May 2012 17:30:43 +0200 Subject: WINTERMUTE: Handle a few more forbidden symbols. --- engines/wintermute/AdActor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/wintermute/AdActor.cpp') diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/AdActor.cpp index dff70dc3e9..14a36b1a90 100644 --- a/engines/wintermute/AdActor.cpp +++ b/engines/wintermute/AdActor.cpp @@ -805,8 +805,8 @@ void CAdActor::GetNextStep() { MaxStepX = abs(_currentSprite->_moveX); MaxStepY = abs(_currentSprite->_moveY); - MaxStepX = std::max(MaxStepX, MaxStepY); - MaxStepX = std::max(MaxStepX, 1); + MaxStepX = MAX(MaxStepX, MaxStepY); + MaxStepX = MAX(MaxStepX, 1); while (_pFCount > 0 && MaxStepX >= 0) { _pFX += _pFStepX; @@ -851,7 +851,7 @@ void CAdActor::GetNextStep() { ////////////////////////////////////////////////////////////////////////// void CAdActor::InitLine(CBPoint StartPt, CBPoint EndPt) { - _pFCount = std::max((abs(EndPt.x - StartPt.x)) , (abs(EndPt.y - StartPt.y))); + _pFCount = MAX((abs(EndPt.x - StartPt.x)) , (abs(EndPt.y - StartPt.y))); _pFStepX = (double)(EndPt.x - StartPt.x) / _pFCount; _pFStepY = (double)(EndPt.y - StartPt.y) / _pFCount; -- cgit v1.2.3