thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Rename sciEvent to SciEvent

Browse source 
svn-id: r49960
This commit is contained in:
Max Horn 2010-06-17 23:11:12 +00:00
parent 8e07a1e167
commit a2bcf9ac31
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/kevent.cpp
View file

@ -41,7 +41,7 @@ namespace Sci {
reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
int mask = argv[0].toUint16();
reg_t obj = argv[1];
sciEvent curEvent;
SciEvent curEvent;
int oldx, oldy;
int modifier_mask = getSciVersion() <= SCI_VERSION_01 ? SCI_KEYMOD_ALL : SCI_KEYMOD_NO_FOOLOCK;
SegManager *segMan = s->_segMan;

10
engines/sci/event.cpp
View file

@ -116,9 +116,9 @@ static const byte codepagemap_88591toDOS[0x80] = {
'?', 0xa4, 0x95, 0xa2, 0x93, '?', 0x94, '?', '?', 0x97, 0xa3, 0x96, 0x81, '?', '?', 0x98 // 0xFx
};
sciEvent EventManager::getScummVMEvent() {
SciEvent EventManager::getScummVMEvent() {
static int _modifierStates = 0; // FIXME: Avoid non-const global vars
sciEvent input = { SCI_EVENT_NONE, 0, 0, 0 };
SciEvent input = { SCI_EVENT_NONE, 0, 0, 0 };
Common::EventManager *em = g_system->getEventManager();
Common::Event ev;
@ -317,9 +317,9 @@ sciEvent EventManager::getScummVMEvent() {
return input;
}
sciEvent EventManager::getSciEvent(unsigned int mask) {
SciEvent EventManager::getSciEvent(unsigned int mask) {
//sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 };
sciEvent event = { 0, 0, 0, 0 };
SciEvent event = { 0, 0, 0, 0 };
// Update the screen here, since it's called very often.
// Throttle the screen update rate to 60fps.
@ -336,7 +336,7 @@ sciEvent EventManager::getSciEvent(unsigned int mask) {
} while (event.type != SCI_EVENT_NONE);
// Search for matching event in queue
Common::List<sciEvent>::iterator iter = _events.begin();
Common::List<SciEvent>::iterator iter = _events.begin();
while (iter != _events.end() && !((*iter).type & mask))
++iter;

8
engines/sci/event.h
View file

@ -34,7 +34,7 @@ namespace Sci {
#define SCI_INPUT_DEFAULT_REDRAWTIME 30000
struct sciEvent {
struct SciEvent {
short type;
short data;
short modifiers;
@ -116,15 +116,15 @@ public:
EventManager(ResourceManager *resMgr);
~EventManager();
sciEvent getSciEvent(unsigned int mask);
SciEvent getSciEvent(unsigned int mask);
private:
sciEvent getScummVMEvent();
SciEvent getScummVMEvent();
ResourceManager *_resMan;
bool _fontIsExtended;
Common::List<sciEvent> _events;
Common::List<SciEvent> _events;
};
} // End of namespace Sci

4
engines/sci/graphics/menu.cpp
View file

@ -681,7 +681,7 @@ uint16 GfxMenu::mouseFindMenuItemSelection(Common::Point mousePosition, uint16 m
}
GuiMenuItemEntry *GfxMenu::interactiveWithKeyboard() {
sciEvent curEvent;
SciEvent curEvent;
uint16 newMenuId = _curMenuId;
uint16 newItemId = _curItemId;
GuiMenuItemEntry *curItemEntry = findItem(_curMenuId, _curItemId);
@ -805,7 +805,7 @@ GuiMenuItemEntry *GfxMenu::interactiveWithKeyboard() {
// The menu item that is selected at that time is chosen. If no menu item is selected we cancel
// No keyboard interaction is allowed, cause that wouldnt make any sense at all
GuiMenuItemEntry *GfxMenu::interactiveWithMouse() {
sciEvent curEvent;
SciEvent curEvent;
uint16 newMenuId = 0, newItemId = 0;
uint16 curMenuId = 0, curItemId = 0;
Common::Point mousePosition = _cursor->getPosition();

2
engines/sci/graphics/portrait.cpp
View file

@ -166,7 +166,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
// Do animation depending on sync resource till audio is done playing
uint16 syncCue;
int timerPosition, curPosition;
sciEvent curEvent;
SciEvent curEvent;
bool userAbort = false;
while ((syncOffset < syncResource->size - 2) && (!userAbort)) {