[Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.45,2.46 intern.h,2.511,2.512 scumm.cpp,1.553,1.554 scumm.h,1.635,1.636
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Jul 19 11:00:56 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound/softsynth/mt32 i386.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.158,1.159 actor.h,1.85,1.86 animation.cpp,1.48,1.49 animation.h,1.25,1.26 console.cpp,1.27,1.28 console.h,1.14,1.15 events.cpp,1.60,1.61 font.cpp,1.31,1.32 font.h,1.14,1.15 game.cpp,1.76,1.77 gfx.cpp,1.54,1.55 gfx.h,1.34,1.35 ihnm_introproc.cpp,1.44,1.45 image.cpp,1.23,1.24 input.cpp,1.48,1.49 interface.cpp,1.119,1.120 interface.h,1.64,1.65 isomap.cpp,1.56,1.57 ite_introproc.cpp,1.59,1.60 music.cpp,1.55,1.56 music.h,1.23,1.24 objectmap.cpp,1.42,1.43 objectmap.h,1.22,1.23 palanim.cpp,1.24,1.25 rscfile.cpp,1.23,1.24 rscfile.h,1.10,1.11 saga.cpp,1.120,1.121 saga.h,1.106,1.107 scene.cpp,1.121,1.122 scene.h,1.62,1.63 script.cpp,1.70,1.71 script.h,1.93,1.94 sfuncs.cpp,1.139,1.140 sndres.cpp,1.44,1.45 sndres.h,1.20,1.21 sound.cpp,1.29,1.30 sound.h,1.21,1.22 sprite.cpp,1.59,1.60 sprite.h,1.21,1.22 sthread.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv722
Modified Files:
cursor.cpp intern.h scumm.cpp scumm.h
Log Message:
Applied patch #1238516, with very minor modifications. It gets rid of an
old DOTT hack/workaround.
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.45
retrieving revision 2.46
diff -u -d -r2.45 -r2.46
--- cursor.cpp 24 Jun 2005 15:23:09 -0000 2.45
+++ cursor.cpp 19 Jul 2005 17:53:45 -0000 2.46
@@ -75,6 +75,22 @@
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
};
+static const byte default_v6_cursor[] = {
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+ 0x0F,0x0F,0x0F,0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0xFF,
+ 0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+};
+
ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex)
: ScummEngine(detector, syst, gs, md5sum, substResFileNameIndex) {
@@ -133,7 +149,12 @@
setCursorFromBuffer((byte *)vs->pixels + (y - vs->topline) * vs->pitch + x, w, h, vs->pitch);
}
-void ScummEngine::setCursorFromBuffer(byte *ptr, int width, int height, int pitch) {
+void ScummEngine_v6::setDefaultCursor() {
+ setCursorHotspot(7, 6);
+ setCursorFromBuffer(default_v6_cursor, 16, 13, 16);
+}
+
+void ScummEngine::setCursorFromBuffer(const byte *ptr, int width, int height, int pitch) {
uint size;
byte *dst;
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.511
retrieving revision 2.512
diff -u -d -r2.511 -r2.512
--- intern.h 7 Jul 2005 09:10:19 -0000 2.511
+++ intern.h 19 Jul 2005 17:53:46 -0000 2.512
@@ -537,6 +537,7 @@
virtual void writeArray(int array, int index, int base, int value);
void shuffleArray(int num, int minIdx, int maxIdx);
+ void setDefaultCursor();
void setCursorTransparency(int a);
void setCursorHotspot(int x, int y);
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -d -r1.553 -r1.554
--- scumm.cpp 16 Jul 2005 17:10:50 -0000 1.553
+++ scumm.cpp 19 Jul 2005 17:53:54 -0000 1.554
@@ -1840,12 +1840,7 @@
void ScummEngine_v6::scummInit() {
ScummEngine::scummInit();
-
- if (_gameId == GID_TENTACLE && res.roomno[rtRoom][60]) {
- // HACK: For DOTT we manually set the default cursor. See also bug #786994
- setCursorFromImg(697, 60, 1);
- setCursorTransparency(1);
- }
+ setDefaultCursor();
}
void ScummEngine_v60he::scummInit() {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -d -r1.635 -r1.636
--- scumm.h 11 Jul 2005 10:59:03 -0000 1.635
+++ scumm.h 19 Jul 2005 17:53:55 -0000 1.636
@@ -983,7 +983,7 @@
void setupCursor();
- void setCursorFromBuffer(byte *ptr, int width, int height, int pitch);
+ void setCursorFromBuffer(const byte *ptr, int width, int height, int pitch);
public:
void markRectAsDirty(VirtScreenNumber virt, int left, int right, int top, int bottom, int dirtybit = 0);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound/softsynth/mt32 i386.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.158,1.159 actor.h,1.85,1.86 animation.cpp,1.48,1.49 animation.h,1.25,1.26 console.cpp,1.27,1.28 console.h,1.14,1.15 events.cpp,1.60,1.61 font.cpp,1.31,1.32 font.h,1.14,1.15 game.cpp,1.76,1.77 gfx.cpp,1.54,1.55 gfx.h,1.34,1.35 ihnm_introproc.cpp,1.44,1.45 image.cpp,1.23,1.24 input.cpp,1.48,1.49 interface.cpp,1.119,1.120 interface.h,1.64,1.65 isomap.cpp,1.56,1.57 ite_introproc.cpp,1.59,1.60 music.cpp,1.55,1.56 music.h,1.23,1.24 objectmap.cpp,1.42,1.43 objectmap.h,1.22,1.23 palanim.cpp,1.24,1.25 rscfile.cpp,1.23,1.24 rscfile.h,1.10,1.11 saga.cpp,1.120,1.121 saga.h,1.106,1.107 scene.cpp,1.121,1.122 scene.h,1.62,1.63 script.cpp,1.70,1.71 script.h,1.93,1.94 sfuncs.cpp,1.139,1.140 sndres.cpp,1.44,1.45 sndres.h,1.20,1.21 sound.cpp,1.29,1.30 sound.h,1.21,1.22 sprite.cpp,1.59,1.60 sprite.h,1.21,1.22 sthread.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list