aboutsummaryrefslogtreecommitdiff
path: root/scumm/charset.cpp
diff options
context:
space:
mode:
authorMax Horn2005-05-08 21:49:52 +0000
committerMax Horn2005-05-08 21:49:52 +0000
commitcca744f69a9eb079a314c8f39af1faa4e7b1e5a6 (patch)
tree1eb00deac3941d844ce98abc10eb4339955ef61d /scumm/charset.cpp
parent013e30eb389c40eb579cc8e3f05b8e8da80925ca (diff)
downloadscummvm-rg350-cca744f69a9eb079a314c8f39af1faa4e7b1e5a6.tar.gz
scummvm-rg350-cca744f69a9eb079a314c8f39af1faa4e7b1e5a6.tar.bz2
scummvm-rg350-cca744f69a9eb079a314c8f39af1faa4e7b1e5a6.zip
Comply to our coding conventions
svn-id: r17975
Diffstat (limited to 'scumm/charset.cpp')
-rw-r--r--scumm/charset.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 9d14818394..e3c4c0b7bd 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -251,14 +251,14 @@ void CharsetRendererV3::setCurID(byte id) {
}
int CharsetRendererCommon::getFontHeight() {
- if(_vm->_useCJKMode)
+ if (_vm->_useCJKMode)
return MAX(_vm->_2byteHeight + 1, (int)_fontPtr[1]);
else
return _fontPtr[1];
}
int CharsetRendererV3::getFontHeight() {
- if(_vm->_useCJKMode)
+ if (_vm->_useCJKMode)
return MAX(_vm->_2byteHeight + 1, 8);
else
return 8;
@@ -289,7 +289,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) {
if (_vm->_heversion >= 72 && chr == code) {
chr = text[pos++];
if (chr == 84) { // Strings of speech offset/size
- while(chr != code)
+ while (chr != code)
chr = text[pos++];
continue;
}
@@ -303,7 +303,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) {
break;
if (chr == 254 || chr == 255) {
//process in LE
- if(chr == 254 && checkKSCode(text[pos], chr) && _vm->_useCJKMode) {
+ if (chr == 254 && checkKSCode(text[pos], chr) && _vm->_useCJKMode) {
goto loc_avoid_ks_fe;
}
chr = text[pos++];
@@ -354,7 +354,7 @@ void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
if (_vm->_heversion >= 72 && chr == code) {
chr = str[pos++];
if (chr == 84) { // Strings of speech offset/size
- while(chr != code)
+ while (chr != code)
chr = str[pos++];
continue;
}
@@ -370,7 +370,7 @@ void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
continue;
if (chr == 254 || chr == 255) {
//process in LE
- if(chr == 254 && checkKSCode(str[pos], chr) && _vm->_useCJKMode) {
+ if (chr == 254 && checkKSCode(str[pos], chr) && _vm->_useCJKMode) {
goto loc_avoid_ks_fe;
}
chr = str[pos++];