aboutsummaryrefslogtreecommitdiff
path: root/engines/cge
diff options
context:
space:
mode:
authorStrangerke2011-09-12 07:01:21 +0200
committerStrangerke2011-09-12 07:01:21 +0200
commit85a19d61ad603becac99c1bd71cde5173b0e6241 (patch)
tree7d4788511588aca98d5e4535d77a81957f5b6beb /engines/cge
parent4c28934e6d1c5828d2a40c23f71cba4afa5d484f (diff)
downloadscummvm-rg350-85a19d61ad603becac99c1bd71cde5173b0e6241.tar.gz
scummvm-rg350-85a19d61ad603becac99c1bd71cde5173b0e6241.tar.bz2
scummvm-rg350-85a19d61ad603becac99c1bd71cde5173b0e6241.zip
CGE: Remove debug messages, fix a warning
Diffstat (limited to 'engines/cge')
-rw-r--r--engines/cge/text.cpp5
-rw-r--r--engines/cge/vga13h.cpp4
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 2b949ab701..9e5ceac9c4 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -43,7 +43,8 @@ Text::Text(CGEEngine *vm, const char *fname) : _vm(vm) {
if (!_cat->exist(_fileName))
error("No talk (%s)\n", _fileName);
int16 txtCount = count() + 1;
- warning("Number of texts: %d", txtCount);
+ if (!txtCount)
+ error("Unable to read dialog file %s", _fileName);
_cache = new Handler[txtCount];
for (_size = 0; _size < txtCount; _size++) {
@@ -61,7 +62,7 @@ Text::~Text() {
int16 Text::count() {
EncryptedStream tf = _fileName;
if (tf.err())
- return NULL;
+ return -1;
Common::String line;
char tmpStr[kLineMax + 1];
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index ef085359a7..93b729e5ec 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -681,13 +681,15 @@ Vga::Vga() : _frmCnt(0), _msg(NULL), _name(NULL), _setPal(false), _mono(0) {
_page[idx]->create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
}
+#if 0
+ // This part was used to display credits at the beginning of the game
for (int i = 10; i < 20; i++) {
char *text = _text->getText(i);
if (text) {
debugN(1, "%s\n", text);
}
}
-
+#endif
_oldColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
_newColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
getColors(_oldColors);