From 0d41ca8d38ce6c604a2a7c9c763b9bf92dd5a9c9 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 21 Feb 2009 18:28:38 +0000 Subject: [PATCH] SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h svn-id: r38720 --- engines/sci/engine/grammar.cpp | 2 +- engines/sci/engine/heap.h | 2 +- engines/sci/include/console.h | 2 +- engines/sci/include/engine.h | 6 ++++-- engines/sci/include/gfx_system.h | 2 +- engines/sci/include/heapmgr.h | 2 +- engines/sci/include/sci_memory.h | 3 ++- engines/sci/include/sciresource.h | 2 +- engines/sci/module.mk | 2 +- engines/sci/scicore/resource_map.cpp | 2 +- engines/sci/scicore/versions.cpp | 2 +- engines/sci/sfx/adlib.h | 2 +- engines/sci/sfx/device/devices.cpp | 2 +- engines/sci/sfx/iterator.cpp | 2 +- engines/sci/sfx/pcm-iterator.cpp | 2 +- engines/sci/sfx/seq/sequencers.cpp | 2 +- engines/sci/sfx/softseq.h | 2 +- engines/sci/sfx/softseq/amiga.cpp | 2 +- engines/sci/sfx/softseq/opl2.cpp | 2 +- engines/sci/sfx/time.cpp | 2 +- engines/sci/{scicore => }/tools.cpp | 0 engines/sci/{include/resource.h => tools.h} | 4 ++-- 22 files changed, 26 insertions(+), 23 deletions(-) rename engines/sci/{scicore => }/tools.cpp (100%) rename engines/sci/{include/resource.h => tools.h} (99%) diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index c478d6c1c90..a06464a0b47 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -28,7 +28,7 @@ ** that grammar, writing an appropriate node tree if successful. */ -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/vocabulary.h" #include "sci/include/console.h" diff --git a/engines/sci/engine/heap.h b/engines/sci/engine/heap.h index 5fd745d5473..37a7134517e 100644 --- a/engines/sci/engine/heap.h +++ b/engines/sci/engine/heap.h @@ -26,7 +26,7 @@ #ifndef _SCI_HEAP_H #define _SCI_HEAP_H -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/include/console.h b/engines/sci/include/console.h index a12cfcdf2ab..7e0ad876c4d 100644 --- a/engines/sci/include/console.h +++ b/engines/sci/include/console.h @@ -35,7 +35,7 @@ #include "common/scummsys.h" #include "sci/include/sci_memory.h" -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/vm_types.h" #define SCI_CONSOLE diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index b4fbc62817c..aed9040ac58 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -36,14 +36,16 @@ namespace Common { // FIXME. Remove after transiton to File class #include -#include "sci/include/resource.h" +// FIXME. Remove this eventually +#include + +#include "sci/tools.h" #include "sci/include/sciresource.h" #include "sci/include/script.h" #include "sci/include/vocabulary.h" #include "sci/include/console.h" #include "sci/include/vm.h" #include "sci/include/menubar.h" -#include #include "sci/include/versions.h" #include "sci/include/kernel.h" #include "sci/include/gfx_state_internal.h" diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h index d3f73970435..93cf00d5d50 100644 --- a/engines/sci/include/gfx_system.h +++ b/engines/sci/include/gfx_system.h @@ -29,7 +29,7 @@ #include "common/scummsys.h" #include "common/rect.h" #include "sci/include/sci_memory.h" -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/include/heapmgr.h b/engines/sci/include/heapmgr.h index dff2e9fc12b..918a6a07fa2 100644 --- a/engines/sci/include/heapmgr.h +++ b/engines/sci/include/heapmgr.h @@ -28,7 +28,7 @@ #ifndef _FREESCI_HEAPMGR_H_ #define _FREESCI_HEAPMGR_H_ -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/sci_memory.h" namespace Sci { diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h index ff09b4b1b60..c39b6c86feb 100644 --- a/engines/sci/include/sci_memory.h +++ b/engines/sci/include/sci_memory.h @@ -44,8 +44,9 @@ #define _SCI_MEMORY_H #include "common/scummsys.h" -#include "sci/include/resource.h" +#include "sci/tools.h" +// FIXME: Get rid of the following #include #ifdef _MSC_VER # include // for chdir, rmdir, _gecwd, getcwd, mkdir #endif diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h index aa280657ca6..67205665b5e 100644 --- a/engines/sci/include/sciresource.h +++ b/engines/sci/include/sciresource.h @@ -32,7 +32,7 @@ #include "common/stream.h" #include "common/str.h" -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/versions.h" namespace Sci { diff --git a/engines/sci/module.mk b/engines/sci/module.mk index 2dccaad01d0..75293d6d7d8 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -5,6 +5,7 @@ MODULE_OBJS = \ detection.o \ exereader.o \ sci.o \ + tools.o \ engine/game.o \ engine/gc.o \ engine/grammar.o \ @@ -62,7 +63,6 @@ MODULE_OBJS = \ scicore/resource_patch.o \ scicore/sci_memory.o \ scicore/script.o \ - scicore/tools.o \ scicore/versions.o \ scicore/vocab.o \ scicore/vocab_debug.o \ diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp index dd44dabfcb1..c30525584aa 100644 --- a/engines/sci/scicore/resource_map.cpp +++ b/engines/sci/scicore/resource_map.cpp @@ -25,7 +25,7 @@ #include "sci/include/sci_memory.h" #include "sci/include/sciresource.h" -#include "sci/include/resource.h" +#include "sci/tools.h" #include "common/file.h" diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp index 8706a5d54b1..54bcc5acffc 100644 --- a/engines/sci/scicore/versions.cpp +++ b/engines/sci/scicore/versions.cpp @@ -30,7 +30,7 @@ #include "sci/include/versions.h" #include "sci/include/engine.h" -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/adlib.h b/engines/sci/sfx/adlib.h index 890f573cdfa..01f6624cdfe 100644 --- a/engines/sci/sfx/adlib.h +++ b/engines/sci/sfx/adlib.h @@ -27,7 +27,7 @@ #ifndef _SFX_ADLIB_H_ #define _SFX_ADLIB_H_ -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp index defa5bcef35..c15c6e03a2a 100644 --- a/engines/sci/sfx/device/devices.cpp +++ b/engines/sci/sfx/device/devices.cpp @@ -29,7 +29,7 @@ #include "../device.h" #include -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 5c6c3cb474e..7c98e6d6917 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -29,7 +29,7 @@ #include "common/util.h" #include "sci/include/sfx_iterator_internal.h" #include "sci/include/sfx_player.h" -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/sci_memory.h" namespace Sci { diff --git a/engines/sci/sfx/pcm-iterator.cpp b/engines/sci/sfx/pcm-iterator.cpp index abb42bc7a78..9c72edfa131 100644 --- a/engines/sci/sfx/pcm-iterator.cpp +++ b/engines/sci/sfx/pcm-iterator.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/sfx_iterator.h" -#include "sci/include/resource.h" /* for BREAKPOINT */ +#include "sci/tools.h" /* for BREAKPOINT */ #include "sci/include/sci_memory.h" namespace Sci { diff --git a/engines/sci/sfx/seq/sequencers.cpp b/engines/sci/sfx/seq/sequencers.cpp index ce73beab0fb..1a0cd68c2d9 100644 --- a/engines/sci/sfx/seq/sequencers.cpp +++ b/engines/sci/sfx/seq/sequencers.cpp @@ -24,7 +24,7 @@ */ #include "../sequencer.h" -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h index 39cb73e4e70..71b296fda6b 100644 --- a/engines/sci/sfx/softseq.h +++ b/engines/sci/sfx/softseq.h @@ -29,7 +29,7 @@ #include "sci/include/sfx_core.h" #include "sci/include/sfx_pcm.h" #include "sci/sfx/sequencer.h" -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp index 4ceb0d311e7..643d3092bd8 100644 --- a/engines/sci/sfx/softseq/amiga.cpp +++ b/engines/sci/sfx/softseq/amiga.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/sci_memory.h" #include "sci/sfx/softseq.h" diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp index 2986917b7a5..1de9bd46599 100644 --- a/engines/sci/sfx/softseq/opl2.cpp +++ b/engines/sci/sfx/softseq/opl2.cpp @@ -42,7 +42,7 @@ ***************************************************************************/ -#include "sci/include/resource.h" +#include "sci/tools.h" #include "sci/include/sfx_iterator.h" #include "../softseq.h" #include "../adlib.h" diff --git a/engines/sci/sfx/time.cpp b/engines/sci/sfx/time.cpp index 42af86dacfc..418343584a1 100644 --- a/engines/sci/sfx/time.cpp +++ b/engines/sci/sfx/time.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/sfx_time.h" -#include "sci/include/resource.h" +#include "sci/tools.h" namespace Sci { diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/tools.cpp similarity index 100% rename from engines/sci/scicore/tools.cpp rename to engines/sci/tools.cpp diff --git a/engines/sci/include/resource.h b/engines/sci/tools.h similarity index 99% rename from engines/sci/include/resource.h rename to engines/sci/tools.h index 5972cf2553f..9f84ee8cd10 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/tools.h @@ -23,8 +23,8 @@ * */ -#ifndef FREESCI_PRIMARY_RESOURCE_H_ -#define FREESCI_PRIMARY_RESOURCE_H_ +#ifndef SCI_TOOLS_H +#define SCI_TOOLS_H #include "common/scummsys.h"