aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent/teenagent.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/teenagent.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/teenagent.cpp')
-rw-r--r--engines/teenagent/teenagent.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 675663f46a..0d8c994b7a 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -22,7 +22,6 @@
* $Id$
*/
-
#include "teenagent/teenagent.h"
#include "common/system.h"
#include "common/events.h"
@@ -30,11 +29,11 @@
#include "common/savefile.h"
#include "common/config-manager.h"
#include "sound/mixer.h"
-#include "scene.h"
-#include "objects.h"
-#include "music.h"
+#include "teenagent/scene.h"
+#include "teenagent/objects.h"
+#include "teenagent/music.h"
-using namespace TeenAgent;
+namespace TeenAgent {
TeenAgentEngine::TeenAgentEngine(OSystem * system, const GameDescription *gd) : Engine(system), action(ActionNone), _gameDescription(gd) {
music = new MusicPlayer();
@@ -482,3 +481,5 @@ bool TeenAgentEngine::hasFeature(EngineFeature f) const {
return false;
}
}
+
+} // End of namespace TeenAgent