aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush/smush_font.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm/smush/smush_font.cpp')
-rw-r--r--engines/scumm/smush/smush_font.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp
index 59caaeea61..de7fe9c460 100644
--- a/engines/scumm/smush/smush_font.cpp
+++ b/engines/scumm/smush/smush_font.cpp
@@ -29,8 +29,8 @@
namespace Scumm {
-SmushFont::SmushFont(ScummEngine *vm, bool use_original_colors, bool new_colors) :
- NutRenderer(vm),
+SmushFont::SmushFont(ScummEngine *vm, const char *filename, bool use_original_colors, bool new_colors) :
+ NutRenderer(vm, filename, false),
_color(-1),
_new_colors(new_colors),
_original(use_original_colors) {
@@ -38,10 +38,6 @@ SmushFont::SmushFont(ScummEngine *vm, bool use_original_colors, bool new_colors)
int SmushFont::getStringWidth(const char *str) {
assert(str);
- if (!_loaded) {
- error("SmushFont::getStringWidth() Font is not loaded");
- return 0;
- }
int width = 0;
while (*str) {
@@ -56,10 +52,6 @@ int SmushFont::getStringWidth(const char *str) {
int SmushFont::getStringHeight(const char *str) {
assert(str);
- if (!_loaded) {
- error("SmushFont::getStringHeight() Font is not loaded");
- return 0;
- }
int height = 0;
while (*str) {