diff options
| author | Johannes Schickel | 2008-04-20 15:47:11 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-20 15:47:11 +0000 |
| commit | f173041811398817ffce870d30ef3b87d1302736 (patch) | |
| tree | 78e43d204662641a5d687cbc184ac60913ac870d /engines/kyra/timer.h | |
| parent | 38319954d1035a7ec8df335c88d455a4042a94fc (diff) | |
| download | scummvm-rg350-f173041811398817ffce870d30ef3b87d1302736.tar.gz scummvm-rg350-f173041811398817ffce870d30ef3b87d1302736.tar.bz2 scummvm-rg350-f173041811398817ffce870d30ef3b87d1302736.zip | |
- moved kyra functor code to common/func.h
- adapted debugger code to use functor code from common/func.h
- adapted kyra engine to use functor code from common/func.h
svn-id: r31614
Diffstat (limited to 'engines/kyra/timer.h')
| -rw-r--r-- | engines/kyra/timer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h index 44f2e744c6..0991f0a1b1 100644 --- a/engines/kyra/timer.h +++ b/engines/kyra/timer.h @@ -27,14 +27,14 @@ #define KYRA_TIMER_H #include "kyra/kyra.h" -#include "kyra/util.h" #include "common/list.h" #include "common/stream.h" +#include "common/func.h" namespace Kyra { -typedef Functor1<int, void> TimerFunc; +typedef Common::Functor1<int, void> TimerFunc; struct TimerEntry { uint8 id; @@ -89,3 +89,4 @@ private: } // end of namespace Kyra #endif + |