aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdists/iphone/scummvm.xcodeproj/project.pbxproj20
-rw-r--r--dists/msvc8/sci.vcproj4
-rw-r--r--dists/msvc9/sci.vcproj4
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/sci/engine/seg_manager.h8
-rw-r--r--engines/sci/engine/segment.cpp (renamed from engines/sci/engine/memobj.cpp)2
-rw-r--r--engines/sci/engine/segment.h (renamed from engines/sci/engine/memobj.h)10
-rw-r--r--engines/sci/module.mk2
8 files changed, 26 insertions, 26 deletions
diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
index 8a31fa1b0f..f24b54c843 100755
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj
@@ -1017,11 +1017,11 @@
DF6118360FE3A7D20042AD3F /* res_view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61182F0FE3A7D20042AD3F /* res_view.cpp */; };
DF6118370FE3A7D20042AD3F /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118300FE3A7D20042AD3F /* seq_decoder.cpp */; };
DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
- DF61183D0FE3A8080042AD3F /* memobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* memobj.cpp */; };
+ DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
- DF61183F0FE3A8080042AD3F /* memobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* memobj.cpp */; };
+ DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
- DF6118410FE3A8080042AD3F /* memobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* memobj.cpp */; };
+ DF6118410FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118430FE3A8250042AD3F /* decompressor.cpp */; };
DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118450FE3A8250042AD3F /* resource.cpp */; };
DF61184B0FE3A8250042AD3F /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118470FE3A8250042AD3F /* vocabulary.cpp */; };
@@ -3169,8 +3169,8 @@
DF6118300FE3A7D20042AD3F /* seq_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seq_decoder.cpp; sourceTree = "<group>"; };
DF6118310FE3A7D20042AD3F /* seq_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seq_decoder.h; sourceTree = "<group>"; };
DF6118380FE3A8080042AD3F /* kmisc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmisc.cpp; sourceTree = "<group>"; };
- DF6118390FE3A8080042AD3F /* memobj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memobj.cpp; sourceTree = "<group>"; };
- DF61183A0FE3A8080042AD3F /* memobj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memobj.h; sourceTree = "<group>"; };
+ DF6118390FE3A8080042AD3F /* segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment.cpp; sourceTree = "<group>"; };
+ DF61183A0FE3A8080042AD3F /* segment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = segment.h; sourceTree = "<group>"; };
DF61183B0FE3A8080042AD3F /* savegame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savegame.h; sourceTree = "<group>"; };
DF6118420FE3A8250042AD3F /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
DF6118430FE3A8250042AD3F /* decompressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decompressor.cpp; sourceTree = "<group>"; };
@@ -6425,8 +6425,8 @@
children = (
DF7585F6100CB75800CC3324 /* static_selectors.cpp */,
DF6118380FE3A8080042AD3F /* kmisc.cpp */,
- DF6118390FE3A8080042AD3F /* memobj.cpp */,
- DF61183A0FE3A8080042AD3F /* memobj.h */,
+ DF6118390FE3A8080042AD3F /* segment.cpp */,
+ DF61183A0FE3A8080042AD3F /* segment.h */,
DF61183B0FE3A8080042AD3F /* savegame.h */,
DF5CEB3A0F75540700DEA624 /* stringfrag.cpp */,
DF89C2A30F62D79E00D756B6 /* script.cpp */,
@@ -8098,7 +8098,7 @@
DF6118340FE3A7D20042AD3F /* res_view.cpp in Sources */,
DF6118350FE3A7D20042AD3F /* seq_decoder.cpp in Sources */,
DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */,
- DF61183F0FE3A8080042AD3F /* memobj.cpp in Sources */,
+ DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */,
DF61184C0FE3A8250042AD3F /* decompressor.cpp in Sources */,
DF61184D0FE3A8250042AD3F /* resource.cpp in Sources */,
DF61184E0FE3A8250042AD3F /* vocabulary.cpp in Sources */,
@@ -9059,7 +9059,7 @@
DF6118320FE3A7D20042AD3F /* res_view.cpp in Sources */,
DF6118330FE3A7D20042AD3F /* seq_decoder.cpp in Sources */,
DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */,
- DF61183D0FE3A8080042AD3F /* memobj.cpp in Sources */,
+ DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */,
DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */,
DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */,
DF61184B0FE3A8250042AD3F /* vocabulary.cpp in Sources */,
@@ -10014,7 +10014,7 @@
DF6118360FE3A7D20042AD3F /* res_view.cpp in Sources */,
DF6118370FE3A7D20042AD3F /* seq_decoder.cpp in Sources */,
DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */,
- DF6118410FE3A8080042AD3F /* memobj.cpp in Sources */,
+ DF6118410FE3A8080042AD3F /* segment.cpp in Sources */,
DF61184F0FE3A8250042AD3F /* decompressor.cpp in Sources */,
DF6118500FE3A8250042AD3F /* resource.cpp in Sources */,
DF6118510FE3A8250042AD3F /* vocabulary.cpp in Sources */,
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 7800c975f2..36222aaaed 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -38,8 +38,8 @@
<File RelativePath="..\..\engines\sci\engine\kscripts.cpp" />
<File RelativePath="..\..\engines\sci\engine\ksound.cpp" />
<File RelativePath="..\..\engines\sci\engine\kstring.cpp" />
- <File RelativePath="..\..\engines\sci\engine\memobj.cpp" />
- <File RelativePath="..\..\engines\sci\engine\memobj.h" />
+ <File RelativePath="..\..\engines\sci\engine\segment.cpp" />
+ <File RelativePath="..\..\engines\sci\engine\segment.h" />
<File RelativePath="..\..\engines\sci\engine\message.cpp" />
<File RelativePath="..\..\engines\sci\engine\message.h" />
<File RelativePath="..\..\engines\sci\engine\said.cpp" />
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 136ebfbb0b..ee6d1f8317 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -39,8 +39,8 @@
<File RelativePath="..\..\engines\sci\engine\kscripts.cpp" />
<File RelativePath="..\..\engines\sci\engine\ksound.cpp" />
<File RelativePath="..\..\engines\sci\engine\kstring.cpp" />
- <File RelativePath="..\..\engines\sci\engine\memobj.cpp" />
- <File RelativePath="..\..\engines\sci\engine\memobj.h" />
+ <File RelativePath="..\..\engines\sci\engine\segment.cpp" />
+ <File RelativePath="..\..\engines\sci\engine\segment.h" />
<File RelativePath="..\..\engines\sci\engine\message.cpp" />
<File RelativePath="..\..\engines\sci\engine\message.h" />
<File RelativePath="..\..\engines\sci\engine\said.cpp" />
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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:43:58 +0000