From 9d47b191f6302ac8960bb4d91d32104c0993a198 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 1 Jul 2010 16:05:47 +0000
Subject: SCI: Rename some more stuff

svn-id: r50553
---
 engines/sci/engine/gc.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines/sci/engine/gc.h')

diff --git a/engines/sci/engine/gc.h b/engines/sci/engine/gc.h
index cfae517790..f4318a1453 100644
--- a/engines/sci/engine/gc.h
+++ b/engines/sci/engine/gc.h
@@ -35,21 +35,22 @@ namespace Sci {
 
 struct reg_t_Hash {
 	uint operator()(const reg_t& x) const {
-		return (x.segment << 3) | x.offset;
+		return (x.segment << 3) ^ x.offset ^ (x.offset << 16);
 	}
 };
 
 /*
- * The reg_t_hash_map is actually really a hashset
+ * The AddrSet is a "set" of reg_t values.
+ * We don't have a HashSet type, so we abuse a HashMap for this.
  */
-typedef Common::HashMap<reg_t, bool, reg_t_Hash> reg_t_hash_map;
+typedef Common::HashMap<reg_t, bool, reg_t_Hash> AddrSet;
 
 /**
  * Finds all used references and normalises them to their memory addresses
  * @param s The state to gather all information from
  * @return A hash map containing entries for all used references
  */
-reg_t_hash_map *find_all_used_references(EngineState *s);
+AddrSet *findAllActiveReferences(EngineState *s);
 
 /**
  * Runs garbage collection on the current system state
-- 
cgit v1.2.3