aboutsummaryrefslogtreecommitdiff
path: root/engines/igor
diff options
context:
space:
mode:
authorMax Horn2009-07-01 20:51:04 +0000
committerMax Horn2009-07-01 20:51:04 +0000
commita6b57dc3a986f749ca8f915b461b184d48390757 (patch)
treed6c3e5e46743dd5073b8853613d61e501fa76fcd /engines/igor
parent62acda5fdbe0daaeae9e1d0f08044b8be4ee98cf (diff)
downloadscummvm-rg350-a6b57dc3a986f749ca8f915b461b184d48390757.tar.gz
scummvm-rg350-a6b57dc3a986f749ca8f915b461b184d48390757.tar.bz2
scummvm-rg350-a6b57dc3a986f749ca8f915b461b184d48390757.zip
- Added GCC_PRINTF attribute to several funcs where it makes sense
- change some constants from double to float, to avoid "loss of precision due to implicit conversion" warnings - removed duplicate prototypes for some funcs - fixed some "increases required alignment of target type" warnings svn-id: r42009
Diffstat (limited to 'engines/igor')
-rw-r--r--engines/igor/igor.cpp2
-rw-r--r--engines/igor/staticres.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp
index 0581f6ddc3..6cf7bda33d 100644
--- a/engines/igor/igor.cpp
+++ b/engines/igor/igor.cpp
@@ -2095,7 +2095,7 @@ int IgorEngine::getHorizontalStepsCount(int minX, int minY, int maxX, int maxY)
float r2 = _walkScaleSpeedTable[scale - 1];
debugC(9, kDebugWalk, "getHorizontalStepsCount() maxX - minX = %d r1 = %f r2 = %f", maxX - minX, r1, r2);
- int16 steps = roundReal((maxX - minX) / ((r1 + r2) / 2.));
+ int16 steps = roundReal((maxX - minX) / ((r1 + r2) / 2.0f));
int count = 0;
if (steps != 0) {
float r3 = (maxY - minY) / (float)steps;
diff --git a/engines/igor/staticres.cpp b/engines/igor/staticres.cpp
index e5df644c5e..ef19d7033f 100644
--- a/engines/igor/staticres.cpp
+++ b/engines/igor/staticres.cpp
@@ -230,11 +230,11 @@ const uint8 IgorEngine::_walkWidthScaleTable[] = {
};
const float IgorEngine::_walkScaleSpeedTable[] = {
- 0.6250, 1.0000, 1.0000, 1.0000, 1.0000, 1.0000, 1.1250, 1.3750, 1.6250, 1.6250,
- 1.6250, 1.6250, 2.0000, 2.1250, 2.3750, 2.3750, 2.6250, 2.6250, 2.7500, 2.7500,
- 2.7500, 3.0000, 3.0000, 3.0000, 3.0000, 3.6250, 3.6250, 3.6250, 3.8750, 3.8750,
- 3.8750, 4.0000, 4.0000, 4.3750, 4.3750, 4.6250, 4.6250, 5.0000, 5.0000, 5.0000,
- 5.0000, 5.2500, 5.5000, 5.6250, 5.6250, 5.6250, 5.6250, 5.6250, 5.6250, 5.6250
+ 0.6250f, 1.0000f, 1.0000f, 1.0000f, 1.0000f, 1.0000f, 1.1250f, 1.3750f, 1.6250f, 1.6250f,
+ 1.6250f, 1.6250f, 2.0000f, 2.1250f, 2.3750f, 2.3750f, 2.6250f, 2.6250f, 2.7500f, 2.7500f,
+ 2.7500f, 3.0000f, 3.0000f, 3.0000f, 3.0000f, 3.6250f, 3.6250f, 3.6250f, 3.8750f, 3.8750f,
+ 3.8750f, 4.0000f, 4.0000f, 4.3750f, 4.3750f, 4.6250f, 4.6250f, 5.0000f, 5.0000f, 5.0000f,
+ 5.0000f, 5.2500f, 5.5000f, 5.6250f, 5.6250f, 5.6250f, 5.6250f, 5.6250f, 5.6250f, 5.6250f
};
const uint8 IgorEngine::_walkScaleTable[] = {