[Scummvm-cvs-logs] SF.net SVN: scummvm:[46942] scummvm/trunk/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Jan 3 21:15:44 CET 2010
Revision: 46942
http://scummvm.svn.sourceforge.net/scummvm/?rev=46942&view=rev
Author: sev
Date: 2010-01-03 20:15:44 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
Reduce header dependencies for AGI engine.
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/console.cpp
scummvm/trunk/engines/agi/console.h
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/font.h
scummvm/trunk/engines/agi/graphics.h
scummvm/trunk/engines/agi/id.cpp
scummvm/trunk/engines/agi/inv.cpp
scummvm/trunk/engines/agi/keyboard.cpp
scummvm/trunk/engines/agi/loader_v2.cpp
scummvm/trunk/engines/agi/loader_v3.cpp
scummvm/trunk/engines/agi/logic.h
scummvm/trunk/engines/agi/lzw.cpp
scummvm/trunk/engines/agi/menu.cpp
scummvm/trunk/engines/agi/menu.h
scummvm/trunk/engines/agi/objects.cpp
scummvm/trunk/engines/agi/op_cmd.cpp
scummvm/trunk/engines/agi/op_test.cpp
scummvm/trunk/engines/agi/opcodes.h
scummvm/trunk/engines/agi/picture.cpp
scummvm/trunk/engines/agi/picture.h
scummvm/trunk/engines/agi/preagi.cpp
scummvm/trunk/engines/agi/preagi_common.cpp
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/preagi_mickey.h
scummvm/trunk/engines/agi/preagi_troll.cpp
scummvm/trunk/engines/agi/preagi_troll.h
scummvm/trunk/engines/agi/preagi_winnie.cpp
scummvm/trunk/engines/agi/preagi_winnie.h
scummvm/trunk/engines/agi/predictive.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/agi/sound.h
scummvm/trunk/engines/agi/sprite.h
scummvm/trunk/engines/agi/view.h
scummvm/trunk/engines/agi/words.cpp
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/agi.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -41,10 +41,8 @@
#include "agi/agi.h"
#include "agi/graphics.h"
#include "agi/sprite.h"
-#include "agi/opcodes.h"
#include "agi/keyboard.h"
#include "agi/menu.h"
-#include "agi/sound.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/agi.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,18 +26,17 @@
#ifndef AGI_H
#define AGI_H
-
#include "common/scummsys.h"
#include "common/endian.h"
#include "common/util.h"
#include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
#include "common/stack.h"
+#include "common/system.h"
#include "engines/engine.h"
+#include "gui/debugger.h"
+
/**
* This is the namespace of the AGI engine.
*
Modified: scummvm/trunk/engines/agi/console.cpp
===================================================================
--- scummvm/trunk/engines/agi/console.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/console.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,15 +23,12 @@
*
*/
-
-
#include "agi/agi.h"
-#include "agi/graphics.h"
-#include "agi/sprite.h"
-#include "agi/keyboard.h"
#include "agi/opcodes.h"
-#include "agi/console.h"
+#include "agi/preagi_mickey.h"
+#include "agi/preagi_winnie.h"
+
namespace Agi {
Console::Console(AgiEngine *vm) : GUI::Debugger() {
Modified: scummvm/trunk/engines/agi/console.h
===================================================================
--- scummvm/trunk/engines/agi/console.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/console.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,15 +26,12 @@
#ifndef AGI_CONSOLE_H
#define AGI_CONSOLE_H
-#include "gui/debugger.h"
-
-#include "agi/preagi_mickey.h"
-#include "agi/preagi_winnie.h"
-
namespace Agi {
class AgiEngine;
class PreAgiEngine;
+class Winnie;
+class Mickey;
struct AgiDebug {
int enabled;
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/detection.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -28,6 +28,7 @@
#include "engines/advancedDetector.h"
#include "common/config-manager.h"
#include "common/file.h"
+#include "common/savefile.h"
#include "graphics/thumbnail.h"
#include "agi/agi.h"
Modified: scummvm/trunk/engines/agi/font.h
===================================================================
--- scummvm/trunk/engines/agi/font.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/font.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_FONT_H
#define AGI_FONT_H
-#include "agi/agi.h"
-
namespace Agi {
// 8x8 font patterns
Modified: scummvm/trunk/engines/agi/graphics.h
===================================================================
--- scummvm/trunk/engines/agi/graphics.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/graphics.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,7 +26,6 @@
#ifndef AGI_GRAPHICS_H
#define AGI_GRAPHICS_H
-
#include "agi/font.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/id.cpp
===================================================================
--- scummvm/trunk/engines/agi/id.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/id.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "agi/agi.h"
#include "agi/opcodes.h"
Modified: scummvm/trunk/engines/agi/inv.cpp
===================================================================
--- scummvm/trunk/engines/agi/inv.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/inv.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -24,7 +24,6 @@
*/
#include "agi/agi.h"
-#include "agi/sprite.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/keyboard.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,12 +23,9 @@
*
*/
-
-
#include "agi/agi.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
-#include "agi/menu.h"
#ifdef __DS__
#include "wordcompletion.h"
#endif
Modified: scummvm/trunk/engines/agi/loader_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v2.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/loader_v2.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,8 +23,6 @@
*
*/
-#include "common/file.h"
-
#include "agi/agi.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/loader_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v3.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/loader_v3.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -27,7 +27,7 @@
#include "agi/lzw.h"
#include "common/config-manager.h"
-#include "common/fs.h"
+//#include "common/fs.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/logic.h
===================================================================
--- scummvm/trunk/engines/agi/logic.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/logic.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,9 +26,6 @@
#ifndef AGI_LOGIC_H
#define AGI_LOGIC_H
-
-#include "common/scummsys.h"
-
namespace Agi {
/**
Modified: scummvm/trunk/engines/agi/lzw.cpp
===================================================================
--- scummvm/trunk/engines/agi/lzw.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/lzw.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -33,8 +33,6 @@
** (c) 1997 Lance Ewing
***************************************************************************/
-
-
#include "agi/agi.h"
#include "agi/lzw.h"
Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/menu.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -24,11 +24,9 @@
*/
#include "agi/agi.h"
-#include "agi/sprite.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
#include "agi/menu.h"
-#include "common/list.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/menu.h
===================================================================
--- scummvm/trunk/engines/agi/menu.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/menu.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_MENU_H
#define AGI_MENU_H
-#include "common/list.h"
-
namespace Agi {
#define MENU_BG 0x0f // White
Modified: scummvm/trunk/engines/agi/objects.cpp
===================================================================
--- scummvm/trunk/engines/agi/objects.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/objects.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "agi/agi.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/op_cmd.cpp
===================================================================
--- scummvm/trunk/engines/agi/op_cmd.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/op_cmd.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -28,7 +28,6 @@
#include "agi/agi.h"
#include "agi/sprite.h"
#include "agi/graphics.h"
-#include "agi/keyboard.h"
#include "agi/opcodes.h"
#include "agi/menu.h"
Modified: scummvm/trunk/engines/agi/op_test.cpp
===================================================================
--- scummvm/trunk/engines/agi/op_test.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/op_test.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -25,7 +25,6 @@
#include "agi/agi.h"
-#include "agi/keyboard.h"
#include "agi/opcodes.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/opcodes.h
===================================================================
--- scummvm/trunk/engines/agi/opcodes.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/opcodes.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_OPCODES_H
#define AGI_OPCODES_H
-#include "agi/agi.h"
-
namespace Agi {
struct AgiLogicnames {
Modified: scummvm/trunk/engines/agi/picture.cpp
===================================================================
--- scummvm/trunk/engines/agi/picture.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/picture.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -25,10 +25,7 @@
#include "agi/agi.h"
#include "agi/graphics.h"
-#include "common/stack.h"
-#include "graphics/primitives.h"
-
namespace Agi {
PictureMgr::PictureMgr(AgiBase *agi, GfxMgr *gfx) {
Modified: scummvm/trunk/engines/agi/picture.h
===================================================================
--- scummvm/trunk/engines/agi/picture.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/picture.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_PICTURE_H
#define AGI_PICTURE_H
-#include "agi/agi.h"
-
namespace Agi {
#define _DEFAULT_WIDTH 160
Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -23,23 +23,12 @@
*
*/
-#include "common/file.h"
-#include "common/savefile.h"
#include "common/config-manager.h"
-#include "base/plugins.h"
-#include "base/version.h"
-
#include "sound/mididrv.h"
-#include "sound/mixer.h"
#include "agi/preagi.h"
#include "agi/graphics.h"
-#include "agi/sprite.h"
-#include "agi/opcodes.h"
-#include "agi/keyboard.h"
-#include "agi/menu.h"
-#include "agi/sound.h"
// preagi engines
#include "agi/preagi_mickey.h"
Modified: scummvm/trunk/engines/agi/preagi_common.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_common.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_common.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -24,7 +24,6 @@
*/
#include "agi/preagi.h"
-#include "agi/font.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -25,12 +25,10 @@
#include "common/events.h"
#include "common/savefile.h"
-#include "common/stream.h"
#include "graphics/cursorman.h"
#include "agi/preagi.h"
-#include "agi/preagi_common.h"
#include "agi/preagi_mickey.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/agi/preagi_mickey.h
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_mickey.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_PREAGI_MICKEY_H
#define AGI_PREAGI_MICKEY_H
-#include "agi/agi.h"
-
namespace Agi {
#define MSA_SAVEGAME_VERSION 2
Modified: scummvm/trunk/engines/agi/preagi_troll.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_troll.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_troll.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -24,7 +24,6 @@
*/
#include "agi/preagi.h"
-#include "agi/preagi_common.h"
#include "agi/preagi_troll.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/agi/preagi_troll.h
===================================================================
--- scummvm/trunk/engines/agi/preagi_troll.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_troll.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_PREAGI_TROLL_H
#define AGI_PREAGI_TROLL_H
-#include "agi/agi.h"
-
namespace Agi {
// strings
Modified: scummvm/trunk/engines/agi/preagi_winnie.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_winnie.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_winnie.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -31,7 +31,6 @@
#include "common/events.h"
#include "common/savefile.h"
-#include "common/stream.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/preagi_winnie.h
===================================================================
--- scummvm/trunk/engines/agi/preagi_winnie.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/preagi_winnie.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_PREAGI_WINNIE_H
#define AGI_PREAGI_WINNIE_H
-#include "agi/agi.h"
-
namespace Agi {
#define WTP_SAVEGAME_VERSION 1
Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/predictive.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -27,7 +27,6 @@
#include "agi/graphics.h"
#include "agi/keyboard.h"
-#include "common/func.h"
#include "common/config-manager.h"
#ifdef __DS__
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/saveload.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -31,6 +31,7 @@
#include "common/file.h"
#include "graphics/thumbnail.h"
#include "common/config-manager.h"
+#include "common/savefile.h"
#include "agi/agi.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/sound.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -25,12 +25,8 @@
#include "common/md5.h"
#include "common/config-manager.h"
-#include "common/fs.h"
-#include "common/algorithm.h"
-#include "sound/mixer.h"
#include "agi/agi.h"
-#include "agi/sound.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/sound.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,12 +26,9 @@
#ifndef AGI_SOUND_H
#define AGI_SOUND_H
-#include "agi/agi.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "common/frac.h"
-#include "common/array.h"
-#include "common/ptr.h"
namespace Agi {
Modified: scummvm/trunk/engines/agi/sprite.h
===================================================================
--- scummvm/trunk/engines/agi/sprite.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/sprite.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,8 +26,6 @@
#ifndef AGI_SPRITE_H
#define AGI_SPRITE_H
-#include "common/list.h"
-
namespace Agi {
Modified: scummvm/trunk/engines/agi/view.h
===================================================================
--- scummvm/trunk/engines/agi/view.h 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/view.h 2010-01-03 20:15:44 UTC (rev 46942)
@@ -26,9 +26,6 @@
#ifndef AGI_VIEW_H
#define AGI_VIEW_H
-
-#include "common/scummsys.h"
-
namespace Agi {
struct ViewCel {
Modified: scummvm/trunk/engines/agi/words.cpp
===================================================================
--- scummvm/trunk/engines/agi/words.cpp 2010-01-03 19:37:43 UTC (rev 46941)
+++ scummvm/trunk/engines/agi/words.cpp 2010-01-03 20:15:44 UTC (rev 46942)
@@ -28,7 +28,6 @@
//
#include "agi/agi.h"
-#include "agi/keyboard.h" // for clean_input()
namespace Agi {
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