[Scummvm-cvs-logs] SF.net SVN: scummvm: [31840] scummvm/trunk
buddha_ at users.sourceforge.net
buddha_ at users.sourceforge.net
Sat May 3 15:01:58 CEST 2008
Revision: 31840
http://scummvm.svn.sourceforge.net/scummvm/?rev=31840&view=rev
Author: buddha_
Date: 2008-05-03 06:01:58 -0700 (Sat, 03 May 2008)
Log Message:
-----------
Fix compilation on MSVC (Updated project files and turned a 'int forced to bool' warning off).
Modified Paths:
--------------
scummvm/trunk/dists/msvc7/drascula.vcproj
scummvm/trunk/dists/msvc7/kyra.vcproj
scummvm/trunk/dists/msvc71/drascula.vcproj
scummvm/trunk/dists/msvc71/kyra.vcproj
scummvm/trunk/dists/msvc8/drascula.vcproj
scummvm/trunk/dists/msvc8/kyra.vcproj
scummvm/trunk/dists/msvc9/drascula.vcproj
scummvm/trunk/dists/msvc9/kyra.vcproj
scummvm/trunk/engines/kyra/script_hof.cpp
Modified: scummvm/trunk/dists/msvc7/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/drascula.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc7/drascula.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -112,8 +112,11 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h">
+ RelativePath="..\..\engines\drascula\talk.cpp">
</File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp">
+ </File>
</Files>
<Globals>
</Globals>
Modified: scummvm/trunk/dists/msvc7/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/kyra.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc7/kyra.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -97,6 +97,12 @@
</Configurations>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp">
</File>
<File
@@ -106,9 +112,6 @@
RelativePath="..\..\engines\kyra\animator_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp">
</File>
<File
@@ -142,21 +145,36 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\items_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\items_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\kyra.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\kyra.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_hof.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra_v1.cpp">
</File>
<File
@@ -169,31 +187,31 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.cpp">
+ RelativePath="..\..\engines\kyra\resource.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.h">
+ RelativePath="..\..\engines\kyra\resource.h">
</File>
<File
- RelativePath="..\..\engines\kyra\resource.cpp">
+ RelativePath="..\..\engines\kyra\saveload.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\resource.h">
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\saveload_v1.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp">
+ RelativePath="..\..\engines\kyra\scene.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_v1.cpp">
@@ -202,15 +220,24 @@
RelativePath="..\..\engines\kyra\scene_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\screen.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\screen.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\screen_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_hof.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\screen_v1.cpp">
</File>
<File
@@ -223,16 +250,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.cpp">
+ RelativePath="..\..\engines\kyra\script.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.h">
+ RelativePath="..\..\engines\kyra\script.h">
</File>
<File
- RelativePath="..\..\engines\kyra\script.cpp">
+ RelativePath="..\..\engines\kyra\script_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script.h">
+ RelativePath="..\..\engines\kyra\script_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\script_tim.cpp">
@@ -247,22 +274,19 @@
RelativePath="..\..\engines\kyra\script_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\seqplayer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sound.cpp">
@@ -298,19 +322,19 @@
RelativePath="..\..\engines\kyra\text.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.h">
+ RelativePath="..\..\engines\kyra\text_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.cpp">
+ RelativePath="..\..\engines\kyra\text_mr.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.h">
+ RelativePath="..\..\engines\kyra\text_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\timer.cpp">
@@ -319,13 +343,13 @@
RelativePath="..\..\engines\kyra\timer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp">
+ RelativePath="..\..\engines\kyra\timer_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v2.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v3.cpp">
+ RelativePath="..\..\engines\kyra\timer_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\vqa.cpp">
Modified: scummvm/trunk/dists/msvc71/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/drascula.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc71/drascula.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -126,8 +126,11 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h">
+ RelativePath="..\..\engines\drascula\talk.cpp">
</File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp">
+ </File>
</Files>
<Globals>
</Globals>
Modified: scummvm/trunk/dists/msvc71/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/kyra.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc71/kyra.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -111,6 +111,12 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp">
</File>
<File
@@ -120,9 +126,6 @@
RelativePath="..\..\engines\kyra\animator_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp">
</File>
<File
@@ -156,21 +159,36 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\items_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\items_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\kyra.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\kyra.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_hof.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra_v1.cpp">
</File>
<File
@@ -183,31 +201,31 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.cpp">
+ RelativePath="..\..\engines\kyra\resource.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.h">
+ RelativePath="..\..\engines\kyra\resource.h">
</File>
<File
- RelativePath="..\..\engines\kyra\resource.cpp">
+ RelativePath="..\..\engines\kyra\saveload.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\resource.h">
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\saveload_v1.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp">
+ RelativePath="..\..\engines\kyra\scene.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_v1.cpp">
@@ -216,15 +234,24 @@
RelativePath="..\..\engines\kyra\scene_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\screen.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\screen.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\screen_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_hof.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\screen_v1.cpp">
</File>
<File
@@ -237,16 +264,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.cpp">
+ RelativePath="..\..\engines\kyra\script.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.h">
+ RelativePath="..\..\engines\kyra\script.h">
</File>
<File
- RelativePath="..\..\engines\kyra\script.cpp">
+ RelativePath="..\..\engines\kyra\script_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script.h">
+ RelativePath="..\..\engines\kyra\script_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\script_tim.cpp">
@@ -261,22 +288,19 @@
RelativePath="..\..\engines\kyra\script_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\seqplayer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sound.cpp">
@@ -312,19 +336,19 @@
RelativePath="..\..\engines\kyra\text.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.h">
+ RelativePath="..\..\engines\kyra\text_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.cpp">
+ RelativePath="..\..\engines\kyra\text_mr.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.h">
+ RelativePath="..\..\engines\kyra\text_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\timer.cpp">
@@ -333,13 +357,13 @@
RelativePath="..\..\engines\kyra\timer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp">
+ RelativePath="..\..\engines\kyra\timer_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v2.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v3.cpp">
+ RelativePath="..\..\engines\kyra\timer_v1.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\vqa.cpp">
Modified: scummvm/trunk/dists/msvc8/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/drascula.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc8/drascula.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -181,9 +181,13 @@
>
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h"
+ RelativePath="..\..\engines\drascula\talk.cpp"
>
</File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: scummvm/trunk/dists/msvc8/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/kyra.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc8/kyra.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -161,6 +161,14 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp"
>
</File>
@@ -173,10 +181,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp"
>
</File>
@@ -221,18 +225,22 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp"
+ RelativePath="..\..\engines\kyra\items_v1.cpp"
>
</File>
<File
+ RelativePath="..\..\engines\kyra\items_v2.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra.cpp"
>
</File>
@@ -241,6 +249,22 @@
>
</File>
<File
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_hof.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra_v1.cpp"
>
</File>
@@ -257,23 +281,23 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.cpp"
+ RelativePath="..\..\engines\kyra\resource.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.h"
+ RelativePath="..\..\engines\kyra\resource.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\resource.cpp"
+ RelativePath="..\..\engines\kyra\saveload.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\resource.h"
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload.cpp"
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp"
>
</File>
<File
@@ -281,15 +305,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp"
+ RelativePath="..\..\engines\kyra\scene.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_mr.cpp"
>
</File>
<File
@@ -301,18 +325,30 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp"
+ RelativePath="..\..\engines\kyra\screen.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.cpp"
+ RelativePath="..\..\engines\kyra\screen.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.h"
+ RelativePath="..\..\engines\kyra\screen_hof.cpp"
>
</File>
<File
+ RelativePath="..\..\engines\kyra\screen_hof.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\screen_v1.cpp"
>
</File>
@@ -329,19 +365,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.cpp"
+ RelativePath="..\..\engines\kyra\script.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.h"
+ RelativePath="..\..\engines\kyra\script.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\script.cpp"
+ RelativePath="..\..\engines\kyra\script_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\script.h"
+ RelativePath="..\..\engines\kyra\script_mr.cpp"
>
</File>
<File
@@ -361,10 +397,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp"
>
</File>
@@ -373,15 +405,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp"
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp"
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp"
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp"
>
</File>
<File
@@ -429,23 +461,23 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp"
+ RelativePath="..\..\engines\kyra\text_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.cpp"
+ RelativePath="..\..\engines\kyra\text_hof.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.h"
+ RelativePath="..\..\engines\kyra\text_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.cpp"
+ RelativePath="..\..\engines\kyra\text_mr.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.h"
+ RelativePath="..\..\engines\kyra\text_v1.cpp"
>
</File>
<File
@@ -457,15 +489,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp"
+ RelativePath="..\..\engines\kyra\timer_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v2.cpp"
+ RelativePath="..\..\engines\kyra\timer_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v3.cpp"
+ RelativePath="..\..\engines\kyra\timer_v1.cpp"
>
</File>
<File
Modified: scummvm/trunk/dists/msvc9/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/drascula.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc9/drascula.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -182,9 +182,13 @@
>
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h"
+ RelativePath="..\..\engines\drascula\talk.cpp"
>
</File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: scummvm/trunk/dists/msvc9/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/kyra.vcproj 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/dists/msvc9/kyra.vcproj 2008-05-03 13:01:58 UTC (rev 31840)
@@ -162,6 +162,14 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp"
>
</File>
@@ -174,10 +182,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp"
>
</File>
@@ -222,18 +226,22 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp"
+ RelativePath="..\..\engines\kyra\items_v1.cpp"
>
</File>
<File
+ RelativePath="..\..\engines\kyra\items_v2.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra.cpp"
>
</File>
@@ -242,6 +250,22 @@
>
</File>
<File
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_hof.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\kyra_mr.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\kyra_v1.cpp"
>
</File>
@@ -258,23 +282,23 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.cpp"
+ RelativePath="..\..\engines\kyra\resource.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_v3.h"
+ RelativePath="..\..\engines\kyra\resource.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\resource.cpp"
+ RelativePath="..\..\engines\kyra\saveload.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\resource.h"
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload.cpp"
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp"
>
</File>
<File
@@ -282,15 +306,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp"
+ RelativePath="..\..\engines\kyra\scene.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_mr.cpp"
>
</File>
<File
@@ -302,18 +326,30 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp"
+ RelativePath="..\..\engines\kyra\screen.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.cpp"
+ RelativePath="..\..\engines\kyra\screen.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.h"
+ RelativePath="..\..\engines\kyra\screen_hof.cpp"
>
</File>
<File
+ RelativePath="..\..\engines\kyra\screen_hof.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\screen_mr.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\screen_v1.cpp"
>
</File>
@@ -330,19 +366,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.cpp"
+ RelativePath="..\..\engines\kyra\script.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v3.h"
+ RelativePath="..\..\engines\kyra\script.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\script.cpp"
+ RelativePath="..\..\engines\kyra\script_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\script.h"
+ RelativePath="..\..\engines\kyra\script_mr.cpp"
>
</File>
<File
@@ -362,10 +398,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp"
>
</File>
@@ -374,15 +406,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp"
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp"
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp"
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp"
>
</File>
<File
@@ -430,23 +462,23 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp"
+ RelativePath="..\..\engines\kyra\text_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.cpp"
+ RelativePath="..\..\engines\kyra\text_hof.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v2.h"
+ RelativePath="..\..\engines\kyra\text_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.cpp"
+ RelativePath="..\..\engines\kyra\text_mr.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v3.h"
+ RelativePath="..\..\engines\kyra\text_v1.cpp"
>
</File>
<File
@@ -458,15 +490,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp"
+ RelativePath="..\..\engines\kyra\timer_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v2.cpp"
+ RelativePath="..\..\engines\kyra\timer_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v3.cpp"
+ RelativePath="..\..\engines\kyra\timer_v1.cpp"
>
</File>
<File
Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-03 12:03:24 UTC (rev 31839)
+++ scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-03 13:01:58 UTC (rev 31840)
@@ -649,7 +649,7 @@
restorePage3();
if (disable)
- _animObjects[0].enabled = oldState;
+ _animObjects[0].enabled = (oldState != 0);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list