aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/gc.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-06 12:57:42 +0000
committerMax Horn2009-09-06 12:57:42 +0000
commitd04b5d2c9b46c1bf0ad8a7b93981eae301163cb3 (patch)
tree6dd83b676d66a3653e3d8d684f95175e363acae1 /engines/sci/engine/gc.cpp
parentc0ff500b0a1a1595f2f88583c925758039e9b64c (diff)
downloadscummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.gz
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.bz2
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.zip
SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
Diffstat (limited to 'engines/sci/engine/gc.cpp')
-rw-r--r--engines/sci/engine/gc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp
index 5041416989..94413a3c50 100644
--- a/engines/sci/engine/gc.cpp
+++ b/engines/sci/engine/gc.cpp
@@ -145,7 +145,7 @@ reg_t_hash_map *find_all_used_references(EngineState *s) {
}
struct deallocator_t {
- SegManager *segManager;
+ SegManager *segMan;
MemObject *mobj;
#ifdef DEBUG_GC
char *segnames[MEM_OBJ_MAX + 1];
@@ -160,7 +160,7 @@ void free_unless_used(void *refcon, reg_t addr) {
if (!use_map->contains(addr)) {
// Not found -> we can free it
- deallocator->mobj->freeAtAddress(deallocator->segManager, addr);
+ deallocator->mobj->freeAtAddress(deallocator->segMan, addr);
#ifdef DEBUG_GC
debugC(2, kDebugLevelGC, "[GC] Deallocating %04x:%04x\n", PRINT_REG(addr));
deallocator->segcount[deallocator->mobj->getType()]++;
@@ -179,7 +179,7 @@ void run_gc(EngineState *s) {
memset(&(deallocator.segcount), 0, sizeof(int) * (MEM_OBJ_MAX + 1));
#endif
- deallocator.segManager = sm;
+ deallocator.segMan = sm;
deallocator.use_map = find_all_used_references(s);
for (seg_nr = 1; seg_nr < sm->_heap.size(); seg_nr++) {