[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.25,1.26
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Tue Dec 30 08:20:06 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: tools extract.h,1.7,1.8 util.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: tools md5.txt,NONE,1.1 md5table.c,NONE,1.1 Makefile,1.28,1.29 convbdf.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv28625/sword1
Modified Files:
logic.cpp
Log Message:
fixed fnFace() and added workaround for missing animation on train roof
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- logic.cpp 28 Dec 2003 23:24:02 -0000 1.25
+++ logic.cpp 30 Dec 2003 16:19:30 -0000 1.26
@@ -31,6 +31,7 @@
#include "mouse.h"
#include "sword1.h"
#include "music.h"
+#include "swordres.h"
#include "debug.h"
@@ -1044,6 +1045,10 @@
int SwordLogic::fnISpeak(BsObject *cpt, int32 id, int32 cdt, int32 textNo, int32 spr, int32 f, int32 z, int32 x) {
_speechClickDelay = 3;
+ if (((textNo & ~1) == 0x3f0012) && (!cdt) && (!spr)) {
+ cdt = GEOSTDLCDT; // workaround for missing animation when examining
+ spr = GEOSTDL; // the conductor on the train roof
+ }
_mouse->flushEvents(); // prevent player from accidently clicking text away within first three frames
cpt->o_logic = LOGIC_speech;
@@ -1419,7 +1424,7 @@
y = target->o_ycoord;
} else {
x = (target->o_mouse_x1 + target->o_mouse_x2) / 2;
- y = (target->o_mouse_y1 + target->o_mouse_y2) / 2;
+ y = target->o_mouse_y2;
}
int32 megaTarDir = whatTarget(cpt->o_xcoord, cpt->o_ycoord, x, y);
fnTurn(cpt, id, megaTarDir, 0, 0, 0, 0, 0);
- Previous message: [Scummvm-cvs-logs] CVS: tools extract.h,1.7,1.8 util.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: tools md5.txt,NONE,1.1 md5table.c,NONE,1.1 Makefile,1.28,1.29 convbdf.c,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list