diff options
| author | Colin Snover | 2016-12-18 15:44:25 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-12-18 19:02:41 -0600 |
| commit | b011af94855ba48b866ad866ae40dde40669607d (patch) | |
| tree | 73f97f719c9776fac491a8e9e706c164a0ec9941 /engines | |
| parent | f52c03cd2c0f0ec3d8aef6d8600e3416c775f5a7 (diff) | |
| download | scummvm-rg350-b011af94855ba48b866ad866ae40dde40669607d.tar.gz scummvm-rg350-b011af94855ba48b866ad866ae40dde40669607d.tar.bz2 scummvm-rg350-b011af94855ba48b866ad866ae40dde40669607d.zip | |
SCI: Remove unused second parameter to SegManager::getString
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 7 | ||||
| -rw-r--r-- | engines/sci/engine/seg_manager.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index 35a655fb4c..159d3170f8 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -796,7 +796,7 @@ size_t SegManager::strlen(reg_t str) { } -Common::String SegManager::getString(reg_t pointer, int entries) { +Common::String SegManager::getString(reg_t pointer) { Common::String ret; if (pointer.isNull()) return ret; // empty text @@ -806,10 +806,7 @@ Common::String SegManager::getString(reg_t pointer, int entries) { warning("SegManager::getString(): Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer)); return ret; } - if (entries > src_r.maxSize) { - warning("Trying to dereference pointer %04x:%04x beyond end of segment", PRINT_REG(pointer)); - return ret; - } + if (src_r.isRaw) ret = (char *)src_r.raw; else { diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h index c409744711..e3ccb9ae5f 100644 --- a/engines/sci/engine/seg_manager.h +++ b/engines/sci/engine/seg_manager.h @@ -304,11 +304,10 @@ public: * Return the string referenced by pointer. * pointer can point to either a raw or non-raw segment. * @param pointer The pointer to dereference - * @parm entries The number of values expected (for checking) * @return The string referenced, or an empty string if not enough * entries were available. */ - Common::String getString(reg_t pointer, int entries = 0); + Common::String getString(reg_t pointer); /** |