diff options
| author | Jonathan Gray | 2003-07-28 11:21:25 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-28 11:21:25 +0000 |
| commit | c1cbd4605e6a3ae3a28462cdb30482454e1b6da0 (patch) | |
| tree | 4644905a3160d0c5c34c025f0e12e60eb7f195ef /sword2/driver | |
| parent | 9e051fa5070cd70ff0e69faa647ad26f66b64560 (diff) | |
| download | scummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.tar.gz scummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.tar.bz2 scummvm-rg350-c1cbd4605e6a3ae3a28462cdb30482454e1b6da0.zip | |
fix some VC7 warnings
svn-id: r9240
Diffstat (limited to 'sword2/driver')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 2 | ||||
| -rw-r--r-- | sword2/driver/render.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 78c69bf6e7..ed820fbaff 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -2966,7 +2966,7 @@ void SetMusicVolume(uint8 volume) uint8 GetMusicVolume() { - return volMusic[0]; + return (uint8) volMusic[0]; } diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index a7ccabdc61..c4065a2692 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -929,8 +929,8 @@ int32 StartRenderCycle(void) } else { - scrollx = scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime); - scrolly = scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime); + scrollx = (int16) (scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime)); + scrolly = (int16) (scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime)); renderTooSlow = 0; } @@ -973,8 +973,8 @@ int32 EndRenderCycle(BOOL *end) else { *end = FALSE; - scrollx = scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime); - scrolly = scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime); + scrollx = (int16) (scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime)); + scrolly = (int16) (scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime)); } return(RD_OK); |