[Scummvm-cvs-logs] CVS: scummvm newgui.cpp,1.1,1.2 newgui.h,1.1,1.2 scumm.h,1.176,1.177
Max Horn
fingolfin at users.sourceforge.net
Sat Jul 6 05:58:01 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm scummvm.dsp,1.42,1.43
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.1,1.2 dialog.h,1.1,1.2 widget.cpp,1.1,1.2 widget.h,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2500
Modified Files:
newgui.cpp newgui.h scumm.h
Log Message:
added mouse over effect
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/newgui.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- newgui.cpp 5 Jul 2002 16:56:53 -0000 1.1
+++ newgui.cpp 6 Jul 2002 12:57:51 -0000 1.2
@@ -61,6 +61,10 @@
_activeDialog->handleClick(_s->mouse.x, _s->mouse.y, _s->_mouseButStat);
} else if (_s->_lastKeyHit) {
_activeDialog->handleKey(_s->_lastKeyHit, 0);
+ } else if (_old_mouse.x != _s->mouse.x || _old_mouse.y != _s->mouse.y) {
+ _activeDialog->handleMouseMoved(_s->mouse.x, _s->mouse.y, _s->_mouseButStat);
+ _old_mouse.x = _s->mouse.x;
+ _old_mouse.y = _s->mouse.y;
}
_s->drawDirtyScreenParts();
Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/newgui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- newgui.h 5 Jul 2002 16:56:53 -0000 1.1
+++ newgui.h 6 Jul 2002 12:57:51 -0000 1.2
@@ -44,21 +44,26 @@
NewGui(Scumm *s);
protected:
- Scumm *_s;
- bool _active;
- bool _need_redraw;
- Dialog *_activeDialog;
+ Scumm *_s;
+ bool _active;
+ bool _need_redraw;
+ Dialog *_activeDialog;
- Dialog *_pauseDialog;
- Dialog *_saveLoadDialog;
+ Dialog *_pauseDialog;
+ Dialog *_saveLoadDialog;
// sound state
- bool _old_soundsPaused;
+ bool _old_soundsPaused;
// mouse cursor state
- bool _old_cursor_mode;
- int _old_cursorHotspotX, _old_cursorHotspotY, _old_cursorWidth, _old_cursorHeight;
- byte _old_grabbedCursor[2048];
+ bool _old_cursor_mode;
+ int _old_cursorHotspotX, _old_cursorHotspotY, _old_cursorWidth, _old_cursorHeight;
+ byte _old_grabbedCursor[2048];
+
+ // mouse pos
+ struct {
+ int16 x,y;
+ } _old_mouse;
void saveState();
void restoreState();
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- scumm.h 5 Jul 2002 17:00:17 -0000 1.176
+++ scumm.h 6 Jul 2002 12:57:51 -0000 1.177
@@ -74,7 +74,7 @@
};
struct ScummPoint {
- int x,y;
+ int x, y;
};
struct MemBlkHeader {
@@ -417,12 +417,12 @@
};
struct SentenceTab {
- byte unk5;
- byte unk2;
- uint16 unk4;
- uint16 unk3;
- byte unk;
- byte pad;
+ byte unk5;
+ byte unk2;
+ uint16 unk4;
+ uint16 unk3;
+ byte unk;
+ byte pad;
};
struct StringTab {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm scummvm.dsp,1.42,1.43
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.1,1.2 dialog.h,1.1,1.2 widget.cpp,1.1,1.2 widget.h,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list