[Scummvm-cvs-logs] SF.net SVN: scummvm:[47167] scummvm/trunk/engines/teenagent
megath at users.sourceforge.net
megath at users.sourceforge.net
Fri Jan 8 19:03:34 CET 2010
Revision: 47167
http://scummvm.svn.sourceforge.net/scummvm/?rev=47167&view=rev
Author: megath
Date: 2010-01-08 18:03:34 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
added configurable timers/fast mode with ctrl-f hotkey
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/teenagent/teenagent.h
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2010-01-08 18:00:28 UTC (rev 47166)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2010-01-08 18:03:34 UTC (rev 47167)
@@ -156,6 +156,9 @@
}
void TeenAgentEngine::init() {
+ _mark_delay = 80;
+ _game_delay = 110;
+
Resources * res = Resources::instance();
use_hotspots.resize(42);
byte *scene_hotspots = res->dseg.ptr(0xbb87);
@@ -448,12 +451,9 @@
CursorMan.showMouse(true);
- ///\todo move game timers to the option dialog
- const uint32 kGameDelay = 110, kMarkDelay = 80;
+ uint32 game_timer = 0;
+ uint32 mark_timer = 0;
- uint32 game_timer = kGameDelay;
- uint32 mark_timer = kMarkDelay;
-
Common::Event event;
Common::Point mouse;
uint32 timer = _system->getMillis();
@@ -477,9 +477,12 @@
if ((event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'd') ||
event.kbd.ascii == '~' || event.kbd.ascii == '#') {
console->attach();
+ } else if (event.kbd.flags == 0 && event.kbd.keycode == Common::KEYCODE_F5) {
+ openMainMenuDialog();
+ } if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'f') {
+ _mark_delay = _mark_delay == 80? 40: 80;
+ debug(0, "mark_delay = %u", _mark_delay);
}
- if (event.kbd.flags == 0 && event.kbd.keycode == Common::KEYCODE_F5)
- openMainMenuDialog();
break;
case Common::EVENT_LBUTTONDOWN:
if (scene->getId() < 0)
@@ -519,13 +522,13 @@
bool tick_game = game_timer <= delta;
if (tick_game)
- game_timer = kGameDelay - ((delta - game_timer) % kGameDelay);
+ game_timer = _game_delay - ((delta - game_timer) % _game_delay);
else
game_timer -= delta;
bool tick_mark = mark_timer <= delta;
if (tick_mark)
- mark_timer = kMarkDelay - ((delta - mark_timer) % kMarkDelay);
+ mark_timer = _mark_delay - ((delta - mark_timer) % _mark_delay);
else
mark_timer -= delta;
Modified: scummvm/trunk/engines/teenagent/teenagent.h
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.h 2010-01-08 18:00:28 UTC (rev 47166)
+++ scummvm/trunk/engines/teenagent/teenagent.h 2010-01-08 18:03:34 UTC (rev 47167)
@@ -134,6 +134,8 @@
Audio::SoundHandle _musicHandle, _soundHandle;
const ADGameDescription *_gameDescription;
+ uint _mark_delay, _game_delay;
+
Common::Array<Common::Array<UseHotspot> > use_hotspots;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list