[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.261,1.261.2.1 verbs.cpp,1.114,1.114.2.1
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Apr 12 23:33:11 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5872
Modified Files:
Tag: branch-0-7-0
string.cpp verbs.cpp
Log Message:
Backported two "Passport to Adventure" fixes: Indy 3 fighting and buffer
overflow in Loom help.
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.261
retrieving revision 1.261.2.1
diff -u -d -r1.261 -r1.261.2.1
--- string.cpp 22 Nov 2004 22:32:46 -0000 1.261
+++ string.cpp 13 Apr 2005 06:31:23 -0000 1.261.2.1
@@ -399,7 +399,7 @@
}
void ScummEngine::drawString(int a, const byte *msg) {
- byte buf[256];
+ byte buf[270];
byte *space;
int i, c;
byte fontHeight = 0;
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.114
retrieving revision 1.114.2.1
diff -u -d -r1.114 -r1.114.2.1
--- verbs.cpp 21 Nov 2004 14:48:17 -0000 1.114
+++ verbs.cpp 13 Apr 2005 06:31:23 -0000 1.114.2.1
@@ -298,10 +298,12 @@
}
}
- if (_gameId == GID_INDY4 && _mouseButStat >= '0' && _mouseButStat <= '9') {
+ if ((_gameId == GID_INDY4 || _gameId == GID_PASS) && _mouseButStat >= '0' && _mouseButStat <= '9') {
// To support keyboard fighting in FOA, we need to remap the number keys.
// FOA apparently expects PC scancode values (see script 46 if you want
- // to know where I got these numbers from).
+ // to know where I got these numbers from). Oddly enough, the The Indy 3
+ // part of the "Passport to Adventure" demo expects the same keyboard
+ // mapping, even though the full game doesn't.
static const int numpad[10] = {
'0',
335, 336, 337,
More information about the Scummvm-git-logs
mailing list