aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-06-27 22:30:25 +0200
committerEugene Sandulenko2019-09-03 17:17:03 +0200
commit4461c1b7efa24384c51ad62fe796a06decac041c (patch)
tree8c9f63602bdf1c76e1bbe1b0e4fa15e87ed338aa
parenta3e12b07089f52d91b0a2c61c40440acb6bed9a2 (diff)
downloadscummvm-rg350-4461c1b7efa24384c51ad62fe796a06decac041c.tar.gz
scummvm-rg350-4461c1b7efa24384c51ad62fe796a06decac041c.tar.bz2
scummvm-rg350-4461c1b7efa24384c51ad62fe796a06decac041c.zip
HDB: Fix warnings
-rw-r--r--engines/hdb/ai-bots.cpp1
-rw-r--r--engines/hdb/ai-funcs.cpp2
-rw-r--r--engines/hdb/ai-lists.cpp2
-rw-r--r--engines/hdb/hdb.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index 7018c19291..2d451b601c 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -755,6 +755,7 @@ void aiRailRiderOnAction(AIEntity *e) {
case DIR_DOWN: e->draw = e->movedownGfx[0]; break;
case DIR_LEFT: e->draw = e->moveleftGfx[0]; break;
case DIR_RIGHT: e->draw = e->moverightGfx[0]; break;
+ default: break; // DIR_NONE
}
g_hdb->_map->centerMapXY(e->x + 16, e->y + 16);
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index c00c9251b1..81419fa98b 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -947,7 +947,7 @@ void AI::animateEntity(AIEntity *e) {
uint16 buttons = g_hdb->_input->getButtons();
- if (e == _player && (buttons & (kButtonUp || kButtonDown || kButtonLeft || kButtonRight))) {
+ if (e == _player && (buttons & (kButtonUp | kButtonDown | kButtonLeft | kButtonRight))) {
int xva[] = {9, 0, 0, -1, 1}, yva[] = {9, -1, 1, 0, 0};
int nx, ny, result2;
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index 0e4f01eecb..bd3fcbf236 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -95,7 +95,7 @@ void AI::animateTargets() {
for (Common::Array<AnimTarget *>::iterator it = _animTargets->begin(); it != _animTargets->end(); it++) {
at = *it;
- debug(9, "it - _animTargets->begin(): %d", it - _animTargets->begin());
+ debug(9, "it - _animTargets->begin(): %ld", it - _animTargets->begin());
debug(9, "at: at->x: %d, at->y: %d, at->start: %d, at->end: %d, at->vel: %d", at->x, at->y, at->start, at->end, at->vel);
// Draw Non-Map stuff every frame
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index 8fb2c7a3ac..0e2ec3db7c 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -112,7 +112,7 @@ enum Flag {
enum {
kScreenWidth = 640,
- kScreenHeight = 480,
+ kScreenHeight = 480
};
class HDBGame : public Engine {