From 4ca99c1c8966da5d37dcb51fffe561b68fc8f6c5 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 26 May 2003 10:21:22 +0000
Subject: Add / remove warning

svn-id: r7996
---
 simon/charset.cpp | 7 ++++---
 simon/simon.cpp   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'simon')

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);
-- 
cgit v1.2.3