aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-26 05:25:14 -0800
committerJohannes Schickel2013-01-26 05:25:14 -0800
commit59dde5451908de79a89ee29937f3878cf221cc93 (patch)
treeaf40548096459f766726938a0db278224f48705a /audio/softsynth
parent94edb3409fa949a6391c54adb4bf7fc4a1d210ad (diff)
parent4d3ecbfcd2aabf0885df978e6e44ef8b8256c657 (diff)
downloadscummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.gz
scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.bz2
scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.zip
Merge pull request #301 from lordhoto/c++11-playground
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
Diffstat (limited to 'audio/softsynth')
-rw-r--r--audio/softsynth/opl/mame.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index c54f620a10..2db7d421b6 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -223,7 +223,7 @@ static int *ENV_CURVE;
/* multiple table */
-#define ML(a) (int)(a * 2)
+#define ML(a) (uint)(a * 2)
static const uint MUL_TABLE[16]= {
/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15 */
ML(0.50), ML(1.00), ML(2.00), ML(3.00), ML(4.00), ML(5.00), ML(6.00), ML(7.00),