aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/seg_manager.h
diff options
context:
space:
mode:
authorMax Horn2010-07-01 16:04:29 +0000
committerMax Horn2010-07-01 16:04:29 +0000
commit3f429d64a2ef826782bf9af8971ba397b0e2743c (patch)
tree8f366f8353dfc1a4badb420d6f9cf434171b00b4 /engines/sci/engine/seg_manager.h
parente309f05162b3b49b3236ebd8faaed124d9c5862a (diff)
downloadscummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.tar.gz
scummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.tar.bz2
scummvm-rg350-3f429d64a2ef826782bf9af8971ba397b0e2743c.zip
SCI: Rename some variables to match our naming conventions
svn-id: r50549
Diffstat (limited to 'engines/sci/engine/seg_manager.h')
-rw-r--r--engines/sci/engine/seg_manager.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 0ef904618b..50a0464ee2 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -446,7 +446,7 @@ public:
/**
* Obtains the system strings segment ID
*/
- SegmentId getSysStringsSegment() { return sysStringsSegment; }
+ SegmentId getSysStringsSegment() { return _sysStringsSegId; }
public: // TODO: make private
Common::Array<SegmentObj *> _heap;
@@ -460,7 +460,7 @@ public: // TODO: make private
SciString *allocateString(reg_t *addr);
SciString *lookupString(reg_t addr);
void freeString(reg_t addr);
- SegmentId getStringSegmentId() { return String_seg_id; }
+ SegmentId getStringSegmentId() { return _stringSegId; }
#endif
private:
@@ -469,21 +469,21 @@ private:
ResourceManager *_resMan;
- SegmentId Clones_seg_id; ///< ID of the (a) clones segment
- SegmentId Lists_seg_id; ///< ID of the (a) list segment
- SegmentId Nodes_seg_id; ///< ID of the (a) node segment
- SegmentId Hunks_seg_id; ///< ID of the (a) hunk segment
+ SegmentId _clonesSegId; ///< ID of the (a) clones segment
+ SegmentId _listsSegId; ///< ID of the (a) list segment
+ SegmentId _nodesSegId; ///< ID of the (a) node segment
+ SegmentId _hunksSegId; ///< ID of the (a) hunk segment
/* System strings */
- SegmentId sysStringsSegment;
+ SegmentId _sysStringsSegId;
public: // TODO: make private. Only kString() needs direct access
- SystemStrings *sysStrings;
+ SystemStrings *_sysStrings;
private:
#ifdef ENABLE_SCI32
- SegmentId Arrays_seg_id;
- SegmentId String_seg_id;
+ SegmentId _arraysSegId;
+ SegmentId _stringSegId;
#endif
private: