diff options
| author | Paweł Kołodziejski | 2004-01-12 19:08:04 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-01-12 19:08:04 +0000 |
| commit | b8e3dda84cd39f7bbd67c818acb42e7614bf7d02 (patch) | |
| tree | 3d19112fc0c23d785b82eeebd0a792c49a9974f6 /sword2/function.cpp | |
| parent | e4628fbb07c034362d4e46f9939bb49e8fb74dbb (diff) | |
| download | scummvm-rg350-b8e3dda84cd39f7bbd67c818acb42e7614bf7d02.tar.gz scummvm-rg350-b8e3dda84cd39f7bbd67c818acb42e7614bf7d02.tar.bz2 scummvm-rg350-b8e3dda84cd39f7bbd67c818acb42e7614bf7d02.zip | |
- whitespaces
- fix for compilation at MAX, at include types
- changed to our types
svn-id: r12344
Diffstat (limited to 'sword2/function.cpp')
| -rw-r--r-- | sword2/function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sword2/function.cpp b/sword2/function.cpp index 701a57c9e4..83da75a184 100644 --- a/sword2/function.cpp +++ b/sword2/function.cpp @@ -614,7 +614,7 @@ int32 Logic::fnPlayCredits(int32 *params) { // credits. Note that musicTimeRemaining() will return 0 if the music // is muted, so we need a sensible fallback for that case. - uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * scrollSteps); + uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * (int32)scrollSteps); while (scrollPos < scrollSteps && !_vm->_quit) { bool foundStartLine = false; |