update

svn-id: r38853

4 files changed, 146 insertions, 174 deletions

diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
index 042c4979e5..f784f8b8c5 100644
--- a/dists/msvc7/sci.vcproj
+++ b/dists/msvc7/sci.vcproj
@@ -130,15 +130,21 @@
 				RelativePath="..\..\engines\sci\engine\heap.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp">
+				RelativePath="..\..\engines\sci\engine\intmap.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.h">
+				RelativePath="..\..\engines\sci\engine\intmap.h">
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\kdebug.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\engine\kernel.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\kernel.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\kernel_types.h">
 			</File>
 			<File
@@ -205,8 +211,14 @@
 				RelativePath="..\..\engines\sci\engine\sys_strings.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\sys_strings.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\vm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\vm.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="gfx">
@@ -253,15 +265,24 @@
 				RelativePath="..\..\engines\sci\gfx\gfx_tools.h">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\gfx\menubar.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\menubar.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\operations.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\operations.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\resmgr.cpp">
 			</File>
 			<File
@@ -274,7 +295,7 @@
 				RelativePath="..\..\engines\sci\gfx\sci_widgets.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\widgets.cpp">
+				RelativePath="..\..\engines\sci\gfx\sci_widgets.h">
 			</File>
 			<Filter
 				Name="resource">
@@ -325,10 +346,10 @@
 				RelativePath="..\..\engines\sci\scicore\resource_patch.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp">
+				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp">
+				RelativePath="..\..\engines\sci\scicore\sciconsole.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\scicore\script.cpp">
@@ -439,57 +460,24 @@
 				RelativePath="..\..\engines\sci\include\engine.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\event.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\heapmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kdebug.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\kernel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\list.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\menubar.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sci_memory.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sci_midi.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_widgets.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sciconsole.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sciresource.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\scitypes.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\script.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sys_strings.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\uinput.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\include\versions.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\vm_types.h">
 			</File>
 			<File
@@ -518,6 +506,12 @@
 			RelativePath="..\..\engines\sci\sci.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\sci_memory.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\sci\sci_memory.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/sci.vcproj b/dists/msvc71/sci.vcproj
index 283bf2910a..ea1314da03 100644
--- a/dists/msvc71/sci.vcproj
+++ b/dists/msvc71/sci.vcproj
@@ -144,15 +144,21 @@
 				RelativePath="..\..\engines\sci\engine\heap.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp">
+				RelativePath="..\..\engines\sci\engine\intmap.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.h">
+				RelativePath="..\..\engines\sci\engine\intmap.h">
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\kdebug.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\engine\kernel.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\kernel.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\kernel_types.h">
 			</File>
 			<File
@@ -219,8 +225,14 @@
 				RelativePath="..\..\engines\sci\engine\sys_strings.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\sys_strings.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\vm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\vm.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="gfx">
@@ -267,15 +279,24 @@
 				RelativePath="..\..\engines\sci\gfx\gfx_tools.h">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\gfx\menubar.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\menubar.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\operations.cpp">
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\operations.h">
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\resmgr.cpp">
 			</File>
 			<File
@@ -288,7 +309,7 @@
 				RelativePath="..\..\engines\sci\gfx\sci_widgets.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\widgets.cpp">
+				RelativePath="..\..\engines\sci\gfx\sci_widgets.h">
 			</File>
 			<Filter
 				Name="resource">
@@ -339,10 +360,10 @@
 				RelativePath="..\..\engines\sci\scicore\resource_patch.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp">
+				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp">
+				RelativePath="..\..\engines\sci\scicore\sciconsole.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\scicore\script.cpp">
@@ -453,57 +474,24 @@
 				RelativePath="..\..\engines\sci\include\engine.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\event.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\heapmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kdebug.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\kernel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\list.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\menubar.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sci_memory.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sci_midi.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_widgets.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sciconsole.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sciresource.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\scitypes.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\script.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sys_strings.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\uinput.h">
 			</File>
 			<File
 				RelativePath="..\..\engines\sci\include\versions.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm.h">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\vm_types.h">
 			</File>
 			<File
@@ -532,6 +520,12 @@
 			RelativePath="..\..\engines\sci\sci.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\sci_memory.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\sci\sci_memory.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp">
 		</File>
 		<File
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 5139e0704d..c8966c3820 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -202,11 +202,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp"
+				RelativePath="..\..\engines\sci\engine\intmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.h"
+				RelativePath="..\..\engines\sci\engine\intmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\kdebug.h"
 				>
 			</File>
 			<File
@@ -214,6 +218,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\kernel.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\kernel_types.h"
 				>
 			</File>
@@ -302,9 +310,17 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\sys_strings.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\vm.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\vm.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="gfx"
@@ -366,6 +382,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h"
 				>
 			</File>
@@ -374,10 +394,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\menubar.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\operations.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\operations.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\resmgr.cpp"
 				>
 			</File>
@@ -394,7 +422,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\widgets.cpp"
+				RelativePath="..\..\engines\sci\gfx\sci_widgets.h"
 				>
 			</File>
 			<Filter
@@ -462,11 +490,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp"
+				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp"
+				RelativePath="..\..\engines\sci\scicore\sciconsole.h"
 				>
 			</File>
 			<File
@@ -614,62 +642,22 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\event.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\heapmgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kdebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\kernel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\menubar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sci_memory.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sci_midi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_widgets.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sciconsole.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sciresource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\scitypes.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\script.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sys_strings.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\uinput.h"
 				>
 			</File>
@@ -678,10 +666,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\vm_types.h"
 				>
 			</File>
@@ -719,6 +703,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\sci_memory.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\sci\sci_memory.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 386562ea48..3e05029730 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -203,11 +203,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.cpp"
+				RelativePath="..\..\engines\sci\engine\intmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\engine\int_hashmap.h"
+				RelativePath="..\..\engines\sci\engine\intmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\kdebug.h"
 				>
 			</File>
 			<File
@@ -215,6 +219,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\kernel.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\kernel_types.h"
 				>
 			</File>
@@ -303,9 +311,17 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\engine\sys_strings.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\engine\vm.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engines\sci\engine\vm.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="gfx"
@@ -367,6 +383,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\gfx_widgets.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\gfx_widgets.h"
 				>
 			</File>
@@ -375,10 +395,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\menubar.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\operations.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\engines\sci\gfx\operations.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\sci\gfx\resmgr.cpp"
 				>
 			</File>
@@ -395,7 +423,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\gfx\widgets.cpp"
+				RelativePath="..\..\engines\sci\gfx\sci_widgets.h"
 				>
 			</File>
 			<Filter
@@ -463,11 +491,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sci_memory.cpp"
+				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\sciconsole.cpp"
+				RelativePath="..\..\engines\sci\scicore\sciconsole.h"
 				>
 			</File>
 			<File
@@ -615,62 +643,22 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\event.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\heapmgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\kdebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\kernel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\menubar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sci_memory.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sci_midi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sci_widgets.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\include\sciconsole.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\sciresource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\scitypes.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\script.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\sys_strings.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\uinput.h"
 				>
 			</File>
@@ -679,10 +667,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\include\vm.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\include\vm_types.h"
 				>
 			</File>
@@ -720,6 +704,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\sci_memory.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\sci\sci_memory.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp"
 			>
 		</File>