aboutsummaryrefslogtreecommitdiff
path: root/dists/msvc8
diff options
context:
space:
mode:
authorTravis Howell2009-07-11 11:48:01 +0000
committerTravis Howell2009-07-11 11:48:01 +0000
commite3398c0cc73999524e92774fb889a0d22eea552b (patch)
treeff1534d1e5e72f1965b747b21b594ef30d5e16ab /dists/msvc8
parent0577bee93893a55be1b2a067ec18f3c8ad462358 (diff)
parent2ceea652e62b301adea4628cebe4116191aa4998 (diff)
downloadscummvm-rg350-e3398c0cc73999524e92774fb889a0d22eea552b.tar.gz
scummvm-rg350-e3398c0cc73999524e92774fb889a0d22eea552b.tar.bz2
scummvm-rg350-e3398c0cc73999524e92774fb889a0d22eea552b.zip
Merged revisions 42360-42361,42364-42366,42368-42378,42380 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r42360 | Kirben | 2009-07-11 10:38:50 +1000 (Sat, 11 Jul 2009) | 1 line Fix recent regression in AGOSEngine_Simon1::drawImage(). ........ r42361 | wjpalenstijn | 2009-07-11 10:47:32 +1000 (Sat, 11 Jul 2009) | 3 lines Fix SAGA outline generation algorithm for characters that are copies of earlier characters. (5 characters in IHNM.) This fixes #1904624. ........ r42364 | Kirben | 2009-07-11 11:40:53 +1000 (Sat, 11 Jul 2009) | 1 line Fix bug #2819628 - DETECTOR: Atlantis CD sets wrong gui options. ........ r42365 | lordhoto | 2009-07-11 11:54:27 +1000 (Sat, 11 Jul 2009) | 1 line Fix graphics not updating, when loading a save in Kyra1. This fixes problems when loading saves in rooms like Brynn's temple, which play animations directly on scene enter. ........ r42366 | lordhoto | 2009-07-11 11:54:42 +1000 (Sat, 11 Jul 2009) | 1 line Removed the now uneeded "Screen::_disableScreen" flag. ........ r42368 | dreammaster | 2009-07-11 15:10:13 +1000 (Sat, 11 Jul 2009) | 1 line Bugfix to show the mouse cursor when restarting the game after returning to launcher ........ r42369 | dreammaster | 2009-07-11 15:12:17 +1000 (Sat, 11 Jul 2009) | 1 line Active background screens are now properly freed when the game exits ........ r42370 | dreammaster | 2009-07-11 15:14:42 +1000 (Sat, 11 Jul 2009) | 1 line Added initialisation of paging screens when the game starts ........ r42371 | thebluegr | 2009-07-11 16:19:29 +1000 (Sat, 11 Jul 2009) | 1 line Fixed regression in the script parser from commit 42260 ........ r42372 | thebluegr | 2009-07-11 16:33:19 +1000 (Sat, 11 Jul 2009) | 1 line Applied a slightly modified patch from clone2727 which adds static selector names to some demos which are missing them (KQ4, LSL1, LSL3, Iceman and Christmas1992) ........ r42373 | thebluegr | 2009-07-11 16:34:25 +1000 (Sat, 11 Jul 2009) | 1 line Removed an invalid detection entry ........ r42374 | thebluegr | 2009-07-11 16:43:01 +1000 (Sat, 11 Jul 2009) | 1 line Applied slightly modified patch 2819002 - "SCI: resource-view-patch on SQ5/German fix" ........ r42375 | thebluegr | 2009-07-11 16:53:39 +1000 (Sat, 11 Jul 2009) | 1 line Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound" ........ r42376 | Kirben | 2009-07-11 17:03:28 +1000 (Sat, 11 Jul 2009) | 1 line Only error out, if checkStaticSelectorNames() fails. ........ r42377 | dreammaster | 2009-07-11 18:16:55 +1000 (Sat, 11 Jul 2009) | 1 line Bugfix to properly save the currently playing midi music when saving a scene ........ r42378 | wjpalenstijn | 2009-07-11 19:45:25 +1000 (Sat, 11 Jul 2009) | 1 line Fix oversight in r42361 and also handle consecutive copied characters in SAGA. ........ r42380 | drmccoy | 2009-07-11 20:24:06 +1000 (Sat, 11 Jul 2009) | 1 line Explicitely instantiate the decompressWizImage() templates, so that they won't be optimized away, as they are also used in akos.cpp ........ svn-id: r42381
Diffstat (limited to 'dists/msvc8')
-rw-r--r--dists/msvc8/sci.vcproj1
1 files changed, 1 insertions, 0 deletions
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 36053d82a5..eab736cd4c 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -50,6 +50,7 @@
<File RelativePath="..\..\engines\sci\engine\seg_manager.h" />
<File RelativePath="..\..\engines\sci\engine\state.cpp" />
<File RelativePath="..\..\engines\sci\engine\state.h" />
+ <File RelativePath="..\..\engines\sci\engine\static_selectors.cpp" />
<File RelativePath="..\..\engines\sci\engine\stringfrag.cpp" />
<File RelativePath="..\..\engines\sci\engine\vm.cpp" />
<File RelativePath="..\..\engines\sci\engine\vm.h" />