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/gfx/resource | |
| 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/gfx/resource')
| -rw-r--r-- | engines/sci/gfx/resource/sci_font.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_pal_1.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_pic_0.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_resmgr.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_view_0.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_view_1.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/gfx/resource/sci_font.cpp b/engines/sci/gfx/resource/sci_font.cpp index a6d3abcb9d..e37306405e 100644 --- a/engines/sci/gfx/resource/sci_font.cpp +++ b/engines/sci/gfx/resource/sci_font.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_tools.h" diff --git a/engines/sci/gfx/resource/sci_pal_1.cpp b/engines/sci/gfx/resource/sci_pal_1.cpp index 544f6db4f3..fdd11e2474 100644 --- a/engines/sci/gfx/resource/sci_pal_1.cpp +++ b/engines/sci/gfx/resource/sci_pal_1.cpp @@ -26,7 +26,7 @@ /* SCI1 palette resource defrobnicator */ #include "common/file.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_resource.h" diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp index d64e46f32d..4e470a9435 100644 --- a/engines/sci/gfx/resource/sci_pic_0.cpp +++ b/engines/sci/gfx/resource/sci_pic_0.cpp @@ -24,7 +24,7 @@ */ #include <time.h> // for time() to seed rand() via srand() -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_tools.h" diff --git a/engines/sci/gfx/resource/sci_resmgr.cpp b/engines/sci/gfx/resource/sci_resmgr.cpp index d64b777afa..4e2b1e2410 100644 --- a/engines/sci/gfx/resource/sci_resmgr.cpp +++ b/engines/sci/gfx/resource/sci_resmgr.cpp @@ -25,7 +25,7 @@ // The interpreter-specific part of the resource manager, for SCI -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/include/sciresource.h" #include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_resmgr.h" diff --git a/engines/sci/gfx/resource/sci_view_0.cpp b/engines/sci/gfx/resource/sci_view_0.cpp index a22f0659b0..c5717b27b8 100644 --- a/engines/sci/gfx/resource/sci_view_0.cpp +++ b/engines/sci/gfx/resource/sci_view_0.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_tools.h" diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp index 82ba6160a2..d013721735 100644 --- a/engines/sci/gfx/resource/sci_view_1.cpp +++ b/engines/sci/gfx/resource/sci_view_1.cpp @@ -27,7 +27,7 @@ #include "common/endian.h" -#include "sci/include/sci_memory.h" +#include "sci/sci_memory.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/gfx_resource.h" #include "sci/gfx/gfx_tools.h" |