aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent/callbacks.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-04 20:08:33 +0000
committerMax Horn2009-09-04 20:08:33 +0000
commit088c5dada3040fd2f0d0df04d12156610786a0e2 (patch)
tree5dd9929f5fb30d0fa82f768565e243e1a0b5ff00 /engines/teenagent/callbacks.cpp
parent4290984108b71cff094099193468068154b8cc94 (diff)
downloadscummvm-rg350-088c5dada3040fd2f0d0df04d12156610786a0e2.tar.gz
scummvm-rg350-088c5dada3040fd2f0d0df04d12156610786a0e2.tar.bz2
scummvm-rg350-088c5dada3040fd2f0d0df04d12156610786a0e2.zip
TEEN:
* don't use "using namespace", instead put stuff into its correct namespace * when using #include, always prefix engine header files with the engine name * some cleanup svn-id: r43945
Diffstat (limited to 'engines/teenagent/callbacks.cpp')
-rw-r--r--engines/teenagent/callbacks.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 86df52870d..4d79f24a00 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -22,12 +22,12 @@
* $Id$
*/
-#include "scene.h"
-#include "teenagent.h"
-#include "resources.h"
-#include "dialog.h"
+#include "teenagent/scene.h"
+#include "teenagent/teenagent.h"
+#include "teenagent/resources.h"
+#include "teenagent/dialog.h"
-using namespace TeenAgent;
+namespace TeenAgent {
#define CHECK_FLAG(addr, v) (res->dseg.get_byte(addr) == (v))
#define SET_FLAG(addr, v) (res->dseg.set_byte((addr), (v)))
@@ -1823,3 +1823,5 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
debug(0, "invalid callback %04x called", addr);
return true;
}
+
+} // End of namespace TeenAgent