Merged revisions 42087-42088,42093-42095,42097-42099,42104-42107,42110,42112-42113,42115-42132,42134-42150,42153-42155,42161-42162 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42087 | thebluegr | 2009-07-04 21:24:09 +1000 (Sat, 04 Jul 2009) | 1 line
  
  Newer DoSound() semantics are now detected automatically, by the existence of the "setVol" selector. Removed game flag GF_SCI1_NEWDOSOUND
........
  r42088 | thebluegr | 2009-07-04 21:33:51 +1000 (Sat, 04 Jul 2009) | 1 line
  
  Removed silly FIXME (mixup between debug and engine debug levels)
........
  r42093 | thebluegr | 2009-07-05 01:22:42 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Added a new console command, "selector", which attempts to find a selector by name
........
  r42094 | thebluegr | 2009-07-05 01:39:31 +1000 (Sun, 05 Jul 2009) | 1 line
  
  - Changed some comments to DOxygen style
........
  r42095 | thebluegr | 2009-07-05 01:45:04 +1000 (Sun, 05 Jul 2009) | 3 lines
  
  - Kernel function names are no longer loaded from vocab.999, but are constructed from the hardcoded function table, depending on the SCI version used
  - SCI0 games using older graphics functions are now detected by the presence of the "curAngle" selector
  - SCI0 games using a SCI1 table (like KQ1 demo version and full version) are detected by the presence of the "sightAngle" selector (as no SCI0 game seems to have it)
........
  r42097 | thebluegr | 2009-07-05 02:30:20 +1000 (Sun, 05 Jul 2009) | 3 lines
  
  - Merged the "early" and "late" SCI1 versions - these are functionally equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early")
  - Cleanup of the vocabulary setting functions
  - Cleanup of the cursor manipulation code
........
  r42098 | thebluegr | 2009-07-05 02:36:56 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Merged SCI1 versions in one more file
........
  r42099 | thebluegr | 2009-07-05 03:39:43 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Cursors without a palette are now initialized correctly (from patch #2816652). Fixes the cursor transparent color in QFG3
........
  r42104 | lordhoto | 2009-07-05 04:54:06 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Add GCC_PRINTF parameter.
........
  r42105 | lordhoto | 2009-07-05 04:54:27 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Fix mismatching format arguments.
........
  r42106 | lordhoto | 2009-07-05 04:54:43 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Kyra1 PC-98 never offered English as language settings, thus remove it. (The CD version *does* supply English files, but those will work as FM-Towns version, so this causes no drawback for the user and is faithful to the original)
........
  r42107 | lordhoto | 2009-07-05 05:04:39 +1000 (Sun, 05 Jul 2009) | 1 line
  
  After discussing with Max, disable -Wmissing-format-attribute again. Also added a comment explaining why it is disabled.
........
  r42110 | athrxx | 2009-07-05 07:18:20 +1000 (Sun, 05 Jul 2009) | 1 line
  
  KYRA: fix minor bug in Screen::drawShape()
........
  r42112 | wjpalenstijn | 2009-07-05 09:52:24 +1000 (Sun, 05 Jul 2009) | 1 line
  
  When morphing a TeeSongIterator, transfer death listeners to remaining child
........
  r42113 | wjpalenstijn | 2009-07-05 11:16:53 +1000 (Sun, 05 Jul 2009) | 1 line
  
  When creating a CleanupSongIterator, transfer death listeners to it
........
  r42115 | dreammaster | 2009-07-05 17:21:17 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Bugfix for word-wrapping of text, which sometimes failed for strings with special characters
........
  r42116 | jvprat | 2009-07-05 19:34:54 +1000 (Sun, 05 Jul 2009) | 3 lines
  
  - Refactorized Groovie::MusicPlayer to make it extensible
  - Added an empty MusicPlayerMac to let the Macintosh version of The 7th Guest start
........
  r42117 | thebluegr | 2009-07-05 20:34:43 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Removed validity check for atoi, which prevented console commands from interacting with resources with id 0
........
  r42118 | thebluegr | 2009-07-05 21:08:53 +1000 (Sun, 05 Jul 2009) | 1 line
  
  SCI1 games with absolute parameters to lofs instructions are automatically detected now. Removed the GF_SCI1_LOFSABSOLUTE game flag
........
  r42119 | drmccoy | 2009-07-05 21:26:23 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Adding an enum MouseButtons
........
  r42120 | drmccoy | 2009-07-05 21:26:42 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Commenting prepareStr a bit and renaming it to cleanupStr
........
  r42121 | drmccoy | 2009-07-05 21:27:11 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Added a Key and ShortKey enum
........
  r42122 | drmccoy | 2009-07-05 21:27:26 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Added a skipBlock() method
........
  r42123 | drmccoy | 2009-07-05 21:27:54 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Moving the "Collision" stuff to Hotspots in hotspots.cpp/.h
........
  r42124 | drmccoy | 2009-07-05 21:28:09 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Wrapping the block end marker checks into Hotspots::Hotspot::isEnd()
........
  r42125 | drmccoy | 2009-07-05 21:28:25 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Removing the now empty Game_Fascination class
........
  r42126 | drmccoy | 2009-07-05 21:28:38 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Fixing indent
........
  r42127 | drmccoy | 2009-07-05 21:28:57 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Merging Game_v1's and Game_v2's prepareStart()
........
  r42128 | drmccoy | 2009-07-05 21:29:13 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Merging Game's and Game_v6's totSub()
........
  r42129 | drmccoy | 2009-07-05 21:29:30 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Merging playTot()
........
  r42130 | drmccoy | 2009-07-05 21:29:54 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Putting the Urban noCD check into Init_v6::initGame()
........
  r42131 | drmccoy | 2009-07-05 21:30:14 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Removing the now unneeded Game_v* classes
........
  r42132 | thebluegr | 2009-07-05 21:49:05 +1000 (Sun, 05 Jul 2009) | 2 lines
  
  - Fixed feature auto-detection for Conquests of Camelot
  - Auto-detected features are now printed in the console (to ease debugging)
........
  r42134 | thebluegr | 2009-07-05 21:58:42 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Updated the MSVC project files of the gob engine
........
  r42135 | drmccoy | 2009-07-05 22:52:14 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Adding a workaround for an invalid expression in Gob1 EGA
........
  r42136 | thebluegr | 2009-07-05 23:07:11 +1000 (Sun, 05 Jul 2009) | 1 line
  
  Merged the two SCI1 versions in one more file
........
  r42137 | lordhoto | 2009-07-06 00:11:54 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Got rid of HACK, which was used to setup new cursor on theme change.
........
  r42138 | lordhoto | 2009-07-06 00:12:04 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Removed pushing of EVENT_SCREEN_CHANGED on theme load. This event should only be pushed by the backend.
........
  r42139 | marcus_c | 2009-07-06 00:57:03 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Refresh the screen if pollEvent() is called without updateScreen() being called for a long time.
........
  r42140 | athrxx | 2009-07-06 00:58:22 +1000 (Mon, 06 Jul 2009) | 1 line
  
  LOL: - reduce code duplication
........
  r42141 | athrxx | 2009-07-06 02:29:17 +1000 (Mon, 06 Jul 2009) | 1 line
  
  LOL: cleanup
........
  r42142 | drmccoy | 2009-07-06 05:56:03 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Encapsulating hotspot state reading
........
  r42143 | drmccoy | 2009-07-06 05:56:23 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Correcting an input related mistake
........
  r42144 | drmccoy | 2009-07-06 05:56:40 +1000 (Mon, 06 Jul 2009) | 1 line
  
  More state-related encapsulation
........
  r42145 | drmccoy | 2009-07-06 05:56:54 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Split off Hotspots::evaluateNew()
........
  r42146 | drmccoy | 2009-07-06 05:57:08 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Ooops, fixing monospaced text input again
........
  r42147 | drmccoy | 2009-07-06 05:57:22 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Split off some drawing related functions
........
  r42148 | drmccoy | 2009-07-06 05:57:37 +1000 (Mon, 06 Jul 2009) | 1 line
  
  More input related split-offs
........
  r42149 | drmccoy | 2009-07-06 05:57:55 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Renaming FontDesc::extraData to charWidths
........
  r42150 | drmccoy | 2009-07-06 05:58:09 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Reordering some methods
........
  r42153 | drmccoy | 2009-07-06 07:39:55 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Renaming the last occurences of "Collision" to "Hotspot"
........
  r42154 | drmccoy | 2009-07-06 07:40:20 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Adding some hotspot debug messages
........
  r42155 | drmccoy | 2009-07-06 07:40:51 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Added an enum for the hotspot states
........
  r42161 | drmccoy | 2009-07-06 11:41:29 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Adding more comments
........
  r42162 | dreammaster | 2009-07-06 12:46:59 +1000 (Mon, 06 Jul 2009) | 1 line
  
  Bugfix for node enabling/disabling, which was previously allowing the player to walk through closed doors and into the walls
........

svn-id: r42165

4 files changed, 170 insertions, 184 deletions

diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 1f74676279..fd1cbb9dfe 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -173,24 +173,6 @@
 			RelativePath="..\..\engines\gob\demos\batplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\resources.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\dataio.cpp">
 		</File>
 		<File
@@ -230,22 +212,16 @@
 			RelativePath="..\..\engines\gob\driver_vga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game_fascin.cpp">
+			RelativePath="..\..\engines\gob\expression.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v1.cpp">
+			RelativePath="..\..\engines\gob\expression.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v2.cpp">
+			RelativePath="..\..\engines\gob\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v6.cpp">
+			RelativePath="..\..\engines\gob\game.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\global.cpp">
@@ -281,6 +257,12 @@
 			RelativePath="..\..\engines\gob\helper.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\hotspots.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\hotspots.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp">
 		</File>
 		<File
@@ -296,6 +278,9 @@
 			RelativePath="..\..\engines\gob\init_v3.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v6.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp">
 		</File>
 		<File
@@ -359,58 +344,58 @@
 			RelativePath="..\..\engines\gob\palanim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.cpp">
+			RelativePath="..\..\engines\gob\resources.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.h">
+			RelativePath="..\..\engines\gob\resources.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.h">
+			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h">
+			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.h">
+			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
+			RelativePath="..\..\engines\gob\save\savefile.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
+			RelativePath="..\..\engines\gob\save\savefile.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
+			RelativePath="..\..\engines\gob\save\savehandler.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
+			RelativePath="..\..\engines\gob\save\savehandler.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h">
+			RelativePath="..\..\engines\gob\save\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
+			RelativePath="..\..\engines\gob\save\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\scenery.cpp">
@@ -431,6 +416,18 @@
 			RelativePath="..\..\engines\gob\demos\scnplayer.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\script.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\script.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\util.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index bbeef85109..b005dbbd6e 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -187,24 +187,6 @@
 			RelativePath="..\..\engines\gob\demos\batplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\resources.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\dataio.cpp">
 		</File>
 		<File
@@ -244,22 +226,16 @@
 			RelativePath="..\..\engines\gob\driver_vga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game_fascin.cpp">
+			RelativePath="..\..\engines\gob\expression.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v1.cpp">
+			RelativePath="..\..\engines\gob\expression.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v2.cpp">
+			RelativePath="..\..\engines\gob\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v6.cpp">
+			RelativePath="..\..\engines\gob\game.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\global.cpp">
@@ -295,6 +271,12 @@
 			RelativePath="..\..\engines\gob\helper.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\hotspots.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\hotspots.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp">
 		</File>
 		<File
@@ -310,6 +292,9 @@
 			RelativePath="..\..\engines\gob\init_v3.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v6.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp">
 		</File>
 		<File
@@ -373,58 +358,58 @@
 			RelativePath="..\..\engines\gob\palanim.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.cpp">
+			RelativePath="..\..\engines\gob\resources.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.h">
+			RelativePath="..\..\engines\gob\resources.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.h">
+			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h">
+			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.h">
+			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp">
+			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
+			RelativePath="..\..\engines\gob\save\savefile.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
+			RelativePath="..\..\engines\gob\save\savefile.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
+			RelativePath="..\..\engines\gob\save\savehandler.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
+			RelativePath="..\..\engines\gob\save\savehandler.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h">
+			RelativePath="..\..\engines\gob\save\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp">
+			RelativePath="..\..\engines\gob\save\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp">
+			RelativePath="..\..\engines\gob\save\saveload_v6.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\scenery.cpp">
@@ -445,6 +430,18 @@
 			RelativePath="..\..\engines\gob\demos\scnplayer.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\script.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\script.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\util.cpp">
 		</File>
 		<File
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 13bdeb9384..14259ac2fd 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -259,30 +259,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\resources.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\dataio.cpp"
 			>
 		</File>
@@ -335,27 +311,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game_fascin.cpp"
+			RelativePath="..\..\engines\gob\expression.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v1.cpp"
+			RelativePath="..\..\engines\gob\expression.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v2.cpp"
+			RelativePath="..\..\engines\gob\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v6.cpp"
+			RelativePath="..\..\engines\gob\game.h"
 			>
 		</File>
 		<File
@@ -403,6 +371,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\hotspots.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\hotspots.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
@@ -423,6 +399,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v6.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp"
 			>
 		</File>
@@ -507,11 +487,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.cpp"
+			RelativePath="..\..\engines\gob\resources.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.h"
+			RelativePath="..\..\engines\gob\resources.h"
 			>
 		</File>
 		<File
@@ -603,6 +583,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\script.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\script.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\util.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index 98bc1a935f..60385473a5 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -260,30 +260,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\resources.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\dataio.cpp"
 			>
 		</File>
@@ -336,27 +312,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game_fascin.cpp"
+			RelativePath="..\..\engines\gob\expression.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v1.cpp"
+			RelativePath="..\..\engines\gob\expression.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v2.cpp"
+			RelativePath="..\..\engines\gob\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\game_v6.cpp"
+			RelativePath="..\..\engines\gob\game.h"
 			>
 		</File>
 		<File
@@ -404,6 +372,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\hotspots.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\hotspots.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
@@ -424,6 +400,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v6.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp"
 			>
 		</File>
@@ -508,75 +488,75 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.cpp"
+			RelativePath="..\..\engines\gob\resources.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\expression.h"
+			RelativePath="..\..\engines\gob\resources.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.h"
+			RelativePath="..\..\engines\gob\save\saveconverter.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp"
+			RelativePath="..\..\engines\gob\save\saveconverter.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h"
+			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp"
+			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.h"
+			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp"
+			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp"
+			RelativePath="..\..\engines\gob\save\savefile.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp"
+			RelativePath="..\..\engines\gob\save\savefile.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp"
+			RelativePath="..\..\engines\gob\save\savehandler.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp"
+			RelativePath="..\..\engines\gob\save\savehandler.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h"
+			RelativePath="..\..\engines\gob\save\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp"
+			RelativePath="..\..\engines\gob\save\saveload.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp"
+			RelativePath="..\..\engines\gob\save\saveload_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp"
+			RelativePath="..\..\engines\gob\save\saveload_v3.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp"
+			RelativePath="..\..\engines\gob\save\saveload_v4.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp"
+			RelativePath="..\..\engines\gob\save\saveload_v6.cpp"
 			>
 		</File>
 		<File
@@ -604,6 +584,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\script.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\script.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\totfile.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\util.cpp"
 			>
 		</File>