[Scummvm-cvs-logs] SF.net SVN: scummvm:[53089] scummvm/trunk/engines/toon
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Oct 9 00:45:29 CEST 2010
Revision: 53089
http://scummvm.svn.sourceforge.net/scummvm/?rev=53089&view=rev
Author: sev
Date: 2010-10-08 22:45:28 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
TOON: Normalized include paths
Modified Paths:
--------------
scummvm/trunk/engines/toon/anim.cpp
scummvm/trunk/engines/toon/anim.h
scummvm/trunk/engines/toon/audio.cpp
scummvm/trunk/engines/toon/audio.h
scummvm/trunk/engines/toon/character.cpp
scummvm/trunk/engines/toon/character.h
scummvm/trunk/engines/toon/conversation.cpp
scummvm/trunk/engines/toon/conversation.h
scummvm/trunk/engines/toon/detection.cpp
scummvm/trunk/engines/toon/drew.cpp
scummvm/trunk/engines/toon/drew.h
scummvm/trunk/engines/toon/flux.cpp
scummvm/trunk/engines/toon/flux.h
scummvm/trunk/engines/toon/font.cpp
scummvm/trunk/engines/toon/font.h
scummvm/trunk/engines/toon/hotspot.cpp
scummvm/trunk/engines/toon/hotspot.h
scummvm/trunk/engines/toon/movie.cpp
scummvm/trunk/engines/toon/movie.h
scummvm/trunk/engines/toon/path.cpp
scummvm/trunk/engines/toon/path.h
scummvm/trunk/engines/toon/picture.cpp
scummvm/trunk/engines/toon/picture.h
scummvm/trunk/engines/toon/resource.cpp
scummvm/trunk/engines/toon/script.cpp
scummvm/trunk/engines/toon/script_func.cpp
scummvm/trunk/engines/toon/script_func.h
scummvm/trunk/engines/toon/state.cpp
scummvm/trunk/engines/toon/state.h
scummvm/trunk/engines/toon/text.cpp
scummvm/trunk/engines/toon/text.h
scummvm/trunk/engines/toon/tools.cpp
scummvm/trunk/engines/toon/toon.cpp
scummvm/trunk/engines/toon/toon.h
Modified: scummvm/trunk/engines/toon/anim.cpp
===================================================================
--- scummvm/trunk/engines/toon/anim.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/anim.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,9 +23,9 @@
*
*/
-#include "anim.h"
-#include "toon.h"
-#include "tools.h"
+#include "toon/anim.h"
+#include "toon/toon.h"
+#include "toon/tools.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/anim.h
===================================================================
--- scummvm/trunk/engines/toon/anim.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/anim.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -31,7 +31,7 @@
#include "common/func.h"
#include "graphics/surface.h"
-#include "script.h"
+#include "toon/script.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/audio.cpp
===================================================================
--- scummvm/trunk/engines/toon/audio.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/audio.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "audio.h"
+#include "toon/audio.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/audio.h
===================================================================
--- scummvm/trunk/engines/toon/audio.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/audio.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -28,7 +28,7 @@
#include "sound/audiostream.h"
#include "sound/mixer.h"
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/character.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,9 +23,9 @@
*
*/
-#include "character.h"
-#include "drew.h"
-#include "path.h"
+#include "toon/character.h"
+#include "toon/drew.h"
+#include "toon/path.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/character.h
===================================================================
--- scummvm/trunk/engines/toon/character.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/character.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_CHARACTER_H
#define TOON_CHARACTER_H
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/conversation.cpp
===================================================================
--- scummvm/trunk/engines/toon/conversation.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/conversation.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "conversation.h"
+#include "toon/conversation.h"
namespace Toon {
@@ -46,4 +46,4 @@
}
-}
\ No newline at end of file
+}
Modified: scummvm/trunk/engines/toon/conversation.h
===================================================================
--- scummvm/trunk/engines/toon/conversation.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/conversation.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -28,6 +28,7 @@
#include "engines/engine.h"
#include "common/stream.h"
+
namespace Toon {
class Conversation {
Modified: scummvm/trunk/engines/toon/detection.cpp
===================================================================
--- scummvm/trunk/engines/toon/detection.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/detection.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "base/plugins.h"
#include "graphics/thumbnail.h"
-#include "toon.h"
+#include "toon/toon.h"
static const PlainGameDescriptor ToonGames[] = {
{ "toon", "Toonstruck" },
Modified: scummvm/trunk/engines/toon/drew.cpp
===================================================================
--- scummvm/trunk/engines/toon/drew.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/drew.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
- #include "drew.h"
+#include "toon/drew.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/drew.h
===================================================================
--- scummvm/trunk/engines/toon/drew.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/drew.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_DREW_H
#define TOON_DREW_H
-#include "character.h"
+#include "toon/character.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/flux.cpp
===================================================================
--- scummvm/trunk/engines/toon/flux.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/flux.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "flux.h"
+#include "toon/flux.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/flux.h
===================================================================
--- scummvm/trunk/engines/toon/flux.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/flux.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -27,7 +27,7 @@
#define TOON_FLUX_H
-#include "character.h"
+#include "toon/character.h"
class ToonEngine;
Modified: scummvm/trunk/engines/toon/font.cpp
===================================================================
--- scummvm/trunk/engines/toon/font.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/font.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "font.h"
+#include "toon/font.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/font.h
===================================================================
--- scummvm/trunk/engines/toon/font.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/font.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_FONT_H
#define TOON_FONT_H
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/hotspot.cpp
===================================================================
--- scummvm/trunk/engines/toon/hotspot.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/hotspot.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,8 +23,8 @@
*
*/
-#include "hotspot.h"
-#include "tools.h"
+#include "toon/hotspot.h"
+#include "toon/tools.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/hotspot.h
===================================================================
--- scummvm/trunk/engines/toon/hotspot.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/hotspot.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,8 +26,8 @@
#ifndef TOON_HOTSPOT_H
#define TOON_HOTSPOT_H
-#include "toon.h"
-#include "tools.h"
+#include "toon/toon.h"
+#include "toon/tools.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/movie.cpp
===================================================================
--- scummvm/trunk/engines/toon/movie.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/movie.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "movie.h"
+#include "toon/movie.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/movie.h
===================================================================
--- scummvm/trunk/engines/toon/movie.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/movie.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_MOVIE_H
#define TOON_MOVIE_H
-#include "toon.h"
+#include "toon/toon.h"
#include "graphics/video/smk_decoder.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/path.cpp
===================================================================
--- scummvm/trunk/engines/toon/path.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/path.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "path.h"
+#include "toon/path.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/path.h
===================================================================
--- scummvm/trunk/engines/toon/path.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/path.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_PATH_H
#define TOON_PATH_H
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/picture.cpp
===================================================================
--- scummvm/trunk/engines/toon/picture.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/picture.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,8 +23,8 @@
*
*/
-#include "picture.h"
-#include "tools.h"
+#include "toon/picture.h"
+#include "toon/tools.h"
#include "common/stack.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/picture.h
===================================================================
--- scummvm/trunk/engines/toon/picture.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/picture.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -31,7 +31,7 @@
#include "common/func.h"
#include "common/str.h"
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/resource.cpp
===================================================================
--- scummvm/trunk/engines/toon/resource.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/resource.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,9 +23,9 @@
*
*/
-#include "resource.h"
+#include "toon/resource.h"
#include "common/file.h"
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/script.cpp
===================================================================
--- scummvm/trunk/engines/toon/script.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/script.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -29,8 +29,8 @@
#include "common/util.h"
#include "common/system.h"
-#include "toon.h"
-#include "script.h"
+#include "toon/toon.h"
+#include "toon/script.h"
namespace Toon {
EMCInterpreter::EMCInterpreter(ToonEngine *vm) : _vm(vm), _scriptData(0), _filename(0) {
Modified: scummvm/trunk/engines/toon/script_func.cpp
===================================================================
--- scummvm/trunk/engines/toon/script_func.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/script_func.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,14 +23,14 @@
*
*/
-#include "script_func.h"
-#include "script.h"
-#include "state.h"
-#include "toon.h"
-#include "anim.h"
-#include "hotspot.h"
-#include "drew.h"
-#include "flux.h"
+#include "toon/script_func.h"
+#include "toon/script.h"
+#include "toon/state.h"
+#include "toon/toon.h"
+#include "toon/anim.h"
+#include "toon/hotspot.h"
+#include "toon/drew.h"
+#include "toon/flux.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/script_func.h
===================================================================
--- scummvm/trunk/engines/toon/script_func.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/script_func.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -27,7 +27,7 @@
#define SCRIPT_FUNC_H
#include "common/array.h"
-#include "script.h"
+#include "toon/script.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/state.cpp
===================================================================
--- scummvm/trunk/engines/toon/state.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/state.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,8 +23,8 @@
*
*/
-#include "state.h"
-#include "toon.h"
+#include "toon/state.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/state.h
===================================================================
--- scummvm/trunk/engines/toon/state.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/state.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -28,7 +28,8 @@
#include "common/file.h"
#include "common/str.h"
-#include "conversation.h"
+#include "toon/conversation.h"
+
namespace Toon {
struct Location {
Modified: scummvm/trunk/engines/toon/text.cpp
===================================================================
--- scummvm/trunk/engines/toon/text.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/text.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,7 +23,7 @@
*
*/
-#include "text.h"
+#include "toon/text.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/text.h
===================================================================
--- scummvm/trunk/engines/toon/text.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/text.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -26,7 +26,7 @@
#ifndef TOON_TEXT_H
#define TOON_TEXT_H
-#include "toon.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/tools.cpp
===================================================================
--- scummvm/trunk/engines/toon/tools.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/tools.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -23,8 +23,8 @@
*
*/
-#include "tools.h"
-#include "toon.h"
+#include "toon/tools.h"
+#include "toon/toon.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/toon.cpp 2010-10-08 22:45:28 UTC (rev 53089)
@@ -35,14 +35,14 @@
#include "gui/saveload.h"
#include "gui/about.h"
#include "gui/message.h"
-#include "resource.h"
-#include "toon.h"
-#include "anim.h"
-#include "picture.h"
-#include "hotspot.h"
-#include "flux.h"
-#include "drew.h"
-#include "path.h"
+#include "toon/resource.h"
+#include "toon/toon.h"
+#include "toon/anim.h"
+#include "toon/picture.h"
+#include "toon/hotspot.h"
+#include "toon/flux.h"
+#include "toon/drew.h"
+#include "toon/path.h"
namespace Toon {
Modified: scummvm/trunk/engines/toon/toon.h
===================================================================
--- scummvm/trunk/engines/toon/toon.h 2010-10-08 22:33:58 UTC (rev 53088)
+++ scummvm/trunk/engines/toon/toon.h 2010-10-08 22:45:28 UTC (rev 53089)
@@ -30,16 +30,16 @@
#include "engines/engine.h"
#include "graphics/surface.h"
#include "common/random.h"
-#include "resource.h"
-#include "script.h"
-#include "script_func.h"
-#include "state.h"
-#include "picture.h"
-#include "anim.h"
-#include "movie.h"
-#include "font.h"
-#include "text.h"
-#include "audio.h"
+#include "toon/resource.h"
+#include "toon/script.h"
+#include "toon/script_func.h"
+#include "toon/state.h"
+#include "toon/picture.h"
+#include "toon/anim.h"
+#include "toon/movie.h"
+#include "toon/font.h"
+#include "toon/text.h"
+#include "toon/audio.h"
#define TOON_DAT_VER_MAJ 0 // 1 byte
#define TOON_DAT_VER_MIN 3 // 1 byte
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