[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.76,1.77
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 29 11:52:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16546
Modified Files:
string.cpp
Log Message:
fixed indentation and a warning
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- string.cpp 29 Dec 2002 17:46:12 -0000 1.76
+++ string.cpp 29 Dec 2002 19:51:27 -0000 1.77
@@ -712,29 +712,29 @@
void Scumm::addVerbToStack(int var)
{
- int num, i;
+ int num, k;
num = readVar(var);
if (num) {
- for (i = 1; i < _maxVerbs; i++) {
- if (num == _verbs[i].verbid && !_verbs[i].type && !_verbs[i].saveid) {
- byte *ptr = getResourceAddress(rtVerb, i);
- if ((_features & GF_AFTER_V8) && (ptr[0] == '/')) {
- char pointer[20];
- int i, j;
+ for (k = 1; k < _maxVerbs; k++) {
+ if (num == _verbs[k].verbid && !_verbs[k].type && !_verbs[k].saveid) {
+ byte *ptr = getResourceAddress(rtVerb, k);
+ if ((_features & GF_AFTER_V8) && (ptr[0] == '/')) {
+ char pointer[20];
+ int i, j;
- translateText(ptr, _transText);
+ translateText(ptr, _transText);
- for (i = 0, j = 0; (ptr[i] != '/' || j == 0) && j < 19; i++) {
- if (ptr[i] != '/')
- pointer[j++] = ptr[i];
- }
- pointer[j] = 0;
- _sound->_talkChannel = _sound->playBundleSound(pointer);
- addMessageToStack(_transText);
- } else {
- addMessageToStack(ptr);
- }
+ for (i = 0, j = 0; (ptr[i] != '/' || j == 0) && j < 19; i++) {
+ if (ptr[i] != '/')
+ pointer[j++] = ptr[i];
+ }
+ pointer[j] = 0;
+ _sound->_talkChannel = _sound->playBundleSound(pointer);
+ addMessageToStack(_transText);
+ } else {
+ addMessageToStack(ptr);
+ }
break;
}
}
@@ -765,26 +765,25 @@
if (var) {
ptr = getStringAddress(var);
if (ptr) {
- if ((_features & GF_AFTER_V8) && (ptr[0] == '/')) {
- char pointer[20];
- int i, j;
+ if ((_features & GF_AFTER_V8) && (ptr[0] == '/')) {
+ char pointer[20];
+ int i, j;
- translateText(ptr, _transText);
+ translateText(ptr, _transText);
- for (i = 0, j = 0; (ptr[i] != '/' || j == 0) && j < 19; i++) {
- if (ptr[i] != '/')
- pointer[j++] = ptr[i];
- }
- pointer[j] = 0;
+ for (i = 0, j = 0; (ptr[i] != '/' || j == 0) && j < 19; i++) {
+ if (ptr[i] != '/')
+ pointer[j++] = ptr[i];
+ }
+ pointer[j] = 0;
_sound->_talkChannel = _sound->playBundleSound(pointer);
addMessageToStack(_transText);
- } else {
+ } else {
addMessageToStack(ptr);
}
- return;
}
- }
- addMessageToStack((byte *)"");
+ } else
+ addMessageToStack((byte *)"");
}
void Scumm::initCharset(int charsetno)
More information about the Scummvm-git-logs
mailing list