diff options
| author | Max Horn | 2009-02-24 05:39:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-24 05:39:10 +0000 |
| commit | 1e4db221e5fe6867e4558528b0d93db2c1de4170 (patch) | |
| tree | c7f9e11c2fccd31774fbcd41d3e462935d79816e /engines/sci/engine | |
| parent | 47bc0d787949faab3705d3e04388d6f0d4892609 (diff) | |
| download | scummvm-rg350-1e4db221e5fe6867e4558528b0d93db2c1de4170.tar.gz scummvm-rg350-1e4db221e5fe6867e4558528b0d93db2c1de4170.tar.bz2 scummvm-rg350-1e4db221e5fe6867e4558528b0d93db2c1de4170.zip | |
SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
svn-id: r38832
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/aatree.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cfsml | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/scriptconsole.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/sys_strings.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/aatree.cpp b/engines/sci/engine/aatree.cpp index 3cd3a01691..4cbe1b5c0a 100644 --- a/engines/sci/engine/aatree.cpp +++ b/engines/sci/engine/aatree.cpp @@ -25,7 +25,7 @@ #include "sci/engine/aatree.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" namespace Sci { diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index 3d5da9b89e..ff55fe0a55 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -32,7 +32,7 @@ #include <time.h> // FIXME: For struct tm #include "common/stream.h" #include "common/system.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_operations.h" #include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 363f519759..5c5980ff06 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -32,7 +32,7 @@ #include <time.h> // FIXME: For struct tm #include "common/stream.h" #include "common/system.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_operations.h" #include "sci/gfx/menubar.h" #include "sci/sfx/sfx_engine.h" @@ -237,7 +237,7 @@ RECORD synonym_t "synonym_t" { #line 102 "engines/sci/engine/savegame.cfsml" #include <stdarg.h> // We need va_lists -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #ifdef CFSML_DEBUG_MALLOC /* diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp index b81b2794d3..9be395ed5e 100644 --- a/engines/sci/engine/scriptconsole.cpp +++ b/engines/sci/engine/scriptconsole.cpp @@ -26,7 +26,7 @@ /* Second half of the console implementation: VM dependent stuff */ /* Remember, it doesn't have to be fast. */ -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/include/engine.h" namespace Sci { diff --git a/engines/sci/engine/sys_strings.cpp b/engines/sci/engine/sys_strings.cpp index 601b94a4b5..bcb7dd9219 100644 --- a/engines/sci/engine/sys_strings.cpp +++ b/engines/sci/engine/sys_strings.cpp @@ -25,7 +25,7 @@ #include "sci/tools.h" #include "sci/include/sys_strings.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" namespace Sci { |