diff options
| author | Einar Johan Trøan Sømåen | 2012-05-11 17:30:43 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 13:01:45 +0200 |
| commit | 987fd67ce0591e35b554b8dc1079e4889e9b0955 (patch) | |
| tree | 4375b4d0ad5f05cc56d17d0a3ab9fdcbd44c033e /engines/wintermute/AdActor.cpp | |
| parent | 0d9ec2a0a9be9d92cb6c96c401bdfbea24edecf5 (diff) | |
| download | scummvm-rg350-987fd67ce0591e35b554b8dc1079e4889e9b0955.tar.gz scummvm-rg350-987fd67ce0591e35b554b8dc1079e4889e9b0955.tar.bz2 scummvm-rg350-987fd67ce0591e35b554b8dc1079e4889e9b0955.zip | |
WINTERMUTE: Handle a few more forbidden symbols.
Diffstat (limited to 'engines/wintermute/AdActor.cpp')
| -rw-r--r-- | engines/wintermute/AdActor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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;
|