diff options
| author | Kamil Zbrog | 2014-03-29 22:13:07 +0100 |
|---|---|---|
| committer | Kamil Zbrog | 2014-03-29 22:13:07 +0100 |
| commit | 5ffa58dba7a941249af9ca8c1bd229c310fb296b (patch) | |
| tree | 49faae8eb3424c32d890b4d3cd1eefeb11fc3cd9 /engines/zvision/strings | |
| parent | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (diff) | |
| parent | 620411bfebe72fb0f60c4d8f64558be088cff58d (diff) | |
| download | scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.gz scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.bz2 scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/zvision/strings')
| -rw-r--r-- | engines/zvision/strings/string_manager.cpp | 10 | ||||
| -rw-r--r-- | engines/zvision/strings/string_manager.h | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/engines/zvision/strings/string_manager.cpp b/engines/zvision/strings/string_manager.cpp index 77ed501672..22331d8a24 100644 --- a/engines/zvision/strings/string_manager.cpp +++ b/engines/zvision/strings/string_manager.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -36,7 +36,7 @@ namespace ZVision { -StringManager::StringManager(ZVision *engine) +StringManager::StringManager(ZVision *engine) : _engine(engine) { } @@ -218,7 +218,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) { // Don't spam the user with warnings about UTF-16 support. // Just do one warning per String bool charOverflowWarning = false; - + uint16 value = stream.readUint16LE(); while (!stream.eos()) { // Check for CRLF @@ -235,7 +235,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) { value = '?'; } char charValue = (char)value; - + asciiString += charValue; value = stream.readUint16LE(); diff --git a/engines/zvision/strings/string_manager.h b/engines/zvision/strings/string_manager.h index 86bb9638d7..af8324b890 100644 --- a/engines/zvision/strings/string_manager.h +++ b/engines/zvision/strings/string_manager.h @@ -8,17 +8,16 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * */ #ifndef ZVISION_STRING_MANAGER_H |