aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/scicore/decompress11.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/scicore/decompress11.cpp')
-rw-r--r--engines/sci/scicore/decompress11.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/engines/sci/scicore/decompress11.cpp b/engines/sci/scicore/decompress11.cpp
index 722f51dd6f..d2600b46e8 100644
--- a/engines/sci/scicore/decompress11.cpp
+++ b/engines/sci/scicore/decompress11.cpp
@@ -25,7 +25,6 @@
// Reads data from a resource file and stores the result in memory
-#include "common/util.h"
#include "sci/include/sci_memory.h"
#include "sci/include/sciresource.h"
@@ -99,10 +98,14 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version
}
#ifdef _SCI_DECOMPRESS_DEBUG
- error("Resource %i.%s encrypted with method SCI1.1/%hi at %.2f%% ratio\n", result->number,
- sci_resource_type_suffixes[result->type], compressionMethod, (result->size == 0) ? -1.0 :
- (100.0 * compressedLength / result->size));
- error(" compressedLength = 0x%hx, actualLength=0x%hx\n", compressedLength, result->size);
+ fprintf(stderr, "Resource %i.%s encrypted with method SCI1.1/%hi at %.2f%%"
+ " ratio\n",
+ result->number, sci_resource_type_suffixes[result->type],
+ compressionMethod,
+ (result->size == 0) ? -1.0 :
+ (100.0 * compressedLength / result->size));
+ fprintf(stderr, " compressedLength = 0x%hx, actualLength=0x%hx\n",
+ compressedLength, result->size);
#endif
DDEBUG("/%d[%d]", compressionMethod, result->size);
@@ -135,7 +138,7 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version
case 3:
case 4: // NYI
- error("Resource %d.%s: Warning: compression type #%d not yet implemented\n",
+ fprintf(stderr, "Resource %d.%s: Warning: compression type #%d not yet implemented\n",
result->number, sci_resource_type_suffixes[result->type], compressionMethod);
free(result->data);
result->data = NULL;
@@ -143,8 +146,9 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version
break;
default:
- error("Resource %d.%s: Compression method SCI1/%hi not supported", result->number,
- sci_resource_type_suffixes[result->type], compressionMethod);
+ fprintf(stderr, "Resource %d.%s: Compression method SCI1/%hi not "
+ "supported!\n", result->number, sci_resource_type_suffixes[result->type],
+ compressionMethod);
free(result->data);
result->data = NULL; // So that we know that it didn't work
result->status = SCI_STATUS_NOMALLOC;