SCI: Rename engine/memobj.* to engine/segment.*

svn-id: r44155

5 files changed, 12 insertions, 12 deletions

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 0782530a7c..da0b93ed14 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -219,7 +219,7 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 	for (uint i = 0; i < sync_heap_size; ++i) {
 		SegmentObj *&mobj = _heap[i];
 
-		// Sync the memobj type
+		// Sync the segment type
 		SegmentType type = (s.isSaving() && mobj) ? mobj->getType() : SEG_TYPE_INVALID;
 		s.syncAsUint32LE(type);
 
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 114c7ff175..5e45e3c4f6 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -23,13 +23,13 @@
  *
  */
 
-#ifndef SCI_ENGINE_segMan_H
-#define SCI_ENGINE_segMan_H
+#ifndef SCI_ENGINE_SEGMAN_H
+#define SCI_ENGINE_SEGMAN_H
 
 #include "common/scummsys.h"
 #include "common/serializer.h"
 #include "sci/engine/vm.h"
-#include "sci/engine/memobj.h"
+#include "sci/engine/segment.h"
 
 namespace Sci {
 
@@ -397,4 +397,4 @@ private:
 
 } // End of namespace Sci
 
-#endif // SCI_ENGINE_segMan
+#endif // SCI_ENGINE_SEGMAN
diff --git a/engines/sci/engine/memobj.cpp b/engines/sci/engine/segment.cpp
index e59e41f24a..b072c2d380 100644
--- a/engines/sci/engine/memobj.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -26,7 +26,7 @@
 #include "common/endian.h"
 
 #include "sci/sci.h"
-#include "sci/engine/memobj.h"
+#include "sci/engine/segment.h"
 #include "sci/engine/intmap.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/engine/state.h"
diff --git a/engines/sci/engine/memobj.h b/engines/sci/engine/segment.h
index 38a165a33a..ef8bc28bfb 100644
--- a/engines/sci/engine/memobj.h
+++ b/engines/sci/engine/segment.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_ENGINE_MEMOBJ_H
-#define SCI_ENGINE_MEMOBJ_H
+#ifndef SCI_ENGINE_SEGMENT_H
+#define SCI_ENGINE_SEGMENT_H
 
 #include "common/serializer.h"
 #include "sci/engine/vm.h"
@@ -225,7 +225,7 @@ struct Object {
 		_variables[version < SCI_VERSION_1_1 ? 0 : 5] = value;
 	}
 
-	reg_t getSuperClassSelector(SciVersion version) { 
+	reg_t getSuperClassSelector(SciVersion version) {
 		return _variables[version < SCI_VERSION_1_1 ? 1 : 6];
 	}
 
@@ -266,7 +266,7 @@ struct Object {
 		uint16 offset = (version < SCI_VERSION_1_1) ? methods_nr + 1 + i : i * 2 + 2;
 		return make_reg(pos.segment, READ_LE_UINT16((byte *) (base_method + offset)));
 	}
-	
+
 	bool isClass(SciVersion version) {
 		return (getInfoSelector(version).offset & SCRIPT_INFO_CLASS);
 	}
@@ -641,4 +641,4 @@ public:
 
 } // End of namespace Sci
 
-#endif // SCI_ENGINE_VM_H
+#endif // SCI_ENGINE_SEGMENT_H
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index a49108ba37..d8775e0e57 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -26,12 +26,12 @@ MODULE_OBJS = \
 	engine/ksound.o \
 	engine/kstring.o \
 	engine/message.o \
-	engine/memobj.o \
 	engine/said.o \
 	engine/savegame.o \
 	engine/script.o \
 	engine/scriptdebug.o \
 	engine/seg_manager.o \
+	engine/segment.o \
 	engine/static_selectors.o \
 	engine/stringfrag.o \
 	engine/state.o \