aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-03-02 12:36:07 +0000
committerPaweł Kołodziejski2003-03-02 12:36:07 +0000
commitd115e0ad758dff85b097930b4a984fa1311ce95f (patch)
tree6065326bf3d433796cff16f6aa25eb82dcca6e34
parent0ce6264d11120622bafc5c9d5780227c5e299d18 (diff)
downloadscummvm-rg350-d115e0ad758dff85b097930b4a984fa1311ce95f.tar.gz
scummvm-rg350-d115e0ad758dff85b097930b4a984fa1311ce95f.tar.bz2
scummvm-rg350-d115e0ad758dff85b097930b4a984fa1311ce95f.zip
fixed warnings
svn-id: r6659
-rw-r--r--scumm/object.cpp2
-rw-r--r--simon/simon.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index d82fd54264..073f773372 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -657,7 +657,7 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr)
od->y_pos = (int)READ_LE_UINT32(&imhd->v8.y_pos);
od->width = (uint)READ_LE_UINT32(&imhd->v8.width);
od->height = (uint)READ_LE_UINT32(&imhd->v8.height);
- od->actordir = READ_LE_UINT32(&imhd->v8.actordir);
+ od->actordir = (byte)READ_LE_UINT32(&imhd->v8.actordir);
} else if (_features & GF_AFTER_V7) {
od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 33bb77d587..50a9d06f5e 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -191,7 +191,7 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst)
driver = MidiDriver_NULL_create();
midi.set_driver(driver);
- _game = detector->_features;
+ _game = (byte)detector->_features;
/* Setup mixer */
if (!_mixer->bindToSystem(syst))