diff options
| author | Travis Howell | 2003-05-26 10:21:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-05-26 10:21:22 +0000 |
| commit | 4ca99c1c8966da5d37dcb51fffe561b68fc8f6c5 (patch) | |
| tree | b63c7b1772a6f8c30dd94bbbaf0494215cd402ed /simon | |
| parent | b959d9d64e0f08b178e25489d86f3eab59bf2a3f (diff) | |
| download | scummvm-rg350-4ca99c1c8966da5d37dcb51fffe561b68fc8f6c5.tar.gz scummvm-rg350-4ca99c1c8966da5d37dcb51fffe561b68fc8f6c5.tar.bz2 scummvm-rg350-4ca99c1c8966da5d37dcb51fffe561b68fc8f6c5.zip | |
Add / remove warning
svn-id: r7996
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/charset.cpp | 7 | ||||
| -rw-r--r-- | simon/simon.cpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/simon/charset.cpp b/simon/charset.cpp index c96acd7710..b0cd440d6a 100644 --- a/simon/charset.cpp +++ b/simon/charset.cpp @@ -100,9 +100,10 @@ void SimonState::render_string(uint num_1, uint color, uint width, uint height, if (_game == GAME_SIMON1AMIGA) { // FIXME Really bad hack to allow simon1amiga to work for now // simon1amiga needs to be decoded a different way - warning("img_height is %d and img_width is %d", img_height, img_width); - img_height = 9; - img_width = 7; + if (img_width < 1 || img_width > 49) + img_width = 7; + if (img_height < 1 || img_height > 49) + img_height = 9; } assert(img_width > 0 && img_width < 50 && img_height > 0 && img_height < 50); diff --git a/simon/simon.cpp b/simon/simon.cpp index 9451569e90..b82b44299b 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4743,6 +4743,7 @@ void SimonState::loadMusic (uint music) { if (_game & GF_AMIGAS) { if (_game != GAME_SIMON1CD32) { // TODO Add support for decruncher + warning("playMusic - Decrunch %dtune attempt", music); } // TODO Add Protracker support for simon1amiga/cd32 warning("playMusic - Load %dtune attempt", music); |