aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-02-24 05:56:26 +0000
committerMax Horn2009-02-24 05:56:26 +0000
commit7105df20fa34e7819f5b416526405424cf9b36b5 (patch)
tree1f1888fe17148c7af9b8eafe9966e1a330cff0c8
parentb5df97ad2b3e81b7aba9feff7a5a3b2399e7d74f (diff)
downloadscummvm-rg350-7105df20fa34e7819f5b416526405424cf9b36b5.tar.gz
scummvm-rg350-7105df20fa34e7819f5b416526405424cf9b36b5.tar.bz2
scummvm-rg350-7105df20fa34e7819f5b416526405424cf9b36b5.zip
SCI: Moved vm.h from include to engine
svn-id: r38834
-rw-r--r--engines/sci/engine/seg_manager.cpp1
-rw-r--r--engines/sci/engine/seg_manager.h4
-rw-r--r--engines/sci/engine/vm.h (renamed from engines/sci/include/vm.h)2
3 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 093542d8a1..5f662d5c6e 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -25,6 +25,7 @@
#include "sci/engine/seg_manager.h"
#include "sci/include/engine.h"
+#include "sci/engine/intmap.h"
namespace Sci {
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index a545fcd6f8..56b6f550cb 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -27,10 +27,12 @@
#define _SCI_SEG_MANAGER_H
#include "sci/engine/intmap.h"
-#include "sci/include/vm.h"
+#include "sci/engine/vm.h"
namespace Sci {
+class IntMapper; // from intmap.h
+
// SCRIPT_ID must be 0
enum idFlag {
SCRIPT_ID,
diff --git a/engines/sci/include/vm.h b/engines/sci/engine/vm.h
index d89b868e5a..d64b6e67e3 100644
--- a/engines/sci/include/vm.h
+++ b/engines/sci/engine/vm.h
@@ -37,6 +37,8 @@
namespace Sci {
+class IntMapper; // from intmap.h
+
#define VM_STACK_SIZE 0x1000
/* Number of bytes to be allocated for the stack */