[Scummvm-cvs-logs] SF.net SVN: scummvm: [24100] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue Oct 3 16:18:23 CEST 2006
Revision: 24100
http://svn.sourceforge.net/scummvm/?rev=24100&view=rev
Author: kirben
Date: 2006-10-03 07:18:17 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
Fix sound effects regression in simon1dos and remove excess game ids
Modified Paths:
--------------
scummvm/trunk/engines/agos/game.cpp
scummvm/trunk/engines/agos/intern.h
Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp 2006-10-03 14:02:14 UTC (rev 24099)
+++ scummvm/trunk/engines/agos/game.cpp 2006-10-03 14:18:17 UTC (rev 24100)
@@ -717,7 +717,7 @@
},
GType_SIMON1,
- GID_SIMON1ACORNDEMO,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -733,7 +733,7 @@
},
GType_SIMON1,
- GID_SIMON1ACORN,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -765,7 +765,7 @@
},
GType_SIMON1,
- GID_SIMON1AMIGA_FR,
+ GID_SIMON1AMIGA,
GF_CRUNCHED | GF_OLD_BUNDLE,
},
@@ -781,7 +781,7 @@
},
GType_SIMON1,
- GID_SIMON1AMIGA_DE,
+ GID_SIMON1AMIGA,
GF_CRUNCHED | GF_OLD_BUNDLE,
},
@@ -829,7 +829,7 @@
},
GType_SIMON1,
- GID_SIMON1CD32_2,
+ GID_SIMON1CD32,
GF_TALKIE | GF_OLD_BUNDLE,
},
@@ -877,7 +877,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_RU,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -893,7 +893,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_INF,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -909,7 +909,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_INF_RU,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -925,7 +925,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_FR,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -941,7 +941,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_DE,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -957,7 +957,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_IT,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -973,7 +973,7 @@
},
GType_SIMON1,
- GID_SIMON1DOS_ES,
+ GID_SIMON1DOS,
GF_OLD_BUNDLE,
},
@@ -1005,7 +1005,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE2,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1021,7 +1021,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_FR,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1037,7 +1037,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_DE,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1053,7 +1053,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_HB,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1069,7 +1069,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_IT,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1086,7 +1086,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_IT2,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1102,7 +1102,7 @@
},
GType_SIMON1,
- GID_SIMON1TALKIE_ES,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1118,7 +1118,7 @@
},
GType_SIMON1,
- GID_SIMON1WIN,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1134,7 +1134,7 @@
},
GType_SIMON1,
- GID_SIMON1WIN_RU,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1150,7 +1150,7 @@
},
GType_SIMON1,
- GID_SIMON1WIN_DE,
+ GID_SIMON1TALKIE,
GF_TALKIE,
},
@@ -1182,7 +1182,7 @@
},
GType_SIMON2,
- GID_SIMON2DOS_RU,
+ GID_SIMON2DOS,
0,
},
@@ -1198,7 +1198,7 @@
},
GType_SIMON2,
- GID_SIMON2DOS2,
+ GID_SIMON2DOS,
0,
},
@@ -1214,7 +1214,7 @@
},
GType_SIMON2,
- GID_SIMON2DOS2_RU,
+ GID_SIMON2DOS,
0,
},
@@ -1230,7 +1230,7 @@
},
GType_SIMON2,
- GID_SIMON2DOS_DE,
+ GID_SIMON2DOS,
0,
},
@@ -1246,7 +1246,7 @@
},
GType_SIMON2,
- GID_SIMON2DOS_IT,
+ GID_SIMON2DOS,
0,
},
@@ -1262,7 +1262,7 @@
},
GType_SIMON2,
- GID_SIMON2DEMO,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1294,7 +1294,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE2,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1310,7 +1310,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_FR,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1326,7 +1326,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_DE,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1342,7 +1342,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_DE2,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1358,7 +1358,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_HB,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1375,7 +1375,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_IT,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1391,7 +1391,7 @@
},
GType_SIMON2,
- GID_SIMON2TALKIE_ES,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1407,7 +1407,7 @@
},
GType_SIMON2,
- GID_SIMON2WIN,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1423,7 +1423,7 @@
},
GType_SIMON2,
- GID_SIMON2WIN_DE,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1439,7 +1439,7 @@
},
GType_SIMON2,
- GID_SIMON2WIN_DE2,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1455,7 +1455,7 @@
},
GType_SIMON2,
- GID_SIMON2WIN_PL,
+ GID_SIMON2TALKIE,
GF_TALKIE,
},
@@ -1471,7 +1471,7 @@
},
GType_FF,
- GID_FEEBLEFILES_AMI_UK,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1487,7 +1487,7 @@
},
GType_FF,
- GID_FEEBLEFILES_AMI_DE,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1503,7 +1503,7 @@
},
GType_FF,
- GID_FEEBLEFILES_MAC_UK,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1519,7 +1519,7 @@
},
GType_FF,
- GID_FEEBLEFILES_MAC_FR,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1535,7 +1535,7 @@
},
GType_FF,
- GID_FEEBLEFILES_MAC_DE,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1551,7 +1551,7 @@
},
GType_FF,
- GID_FEEBLEFILES_MAC_ES,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
},
@@ -1567,7 +1567,7 @@
},
GType_FF,
- GID_FEEBLEFILES_2CD,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
@@ -1583,7 +1583,7 @@
},
GType_FF,
- GID_FEEBLEFILES_4CD,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
@@ -1599,7 +1599,7 @@
},
GType_FF,
- GID_FEEBLEFILES_FR,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
@@ -1615,7 +1615,7 @@
},
GType_FF,
- GID_FEEBLEFILES_DE,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
@@ -1631,7 +1631,7 @@
},
GType_FF,
- GID_FEEBLEFILES_IT,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
@@ -1647,7 +1647,7 @@
},
GType_FF,
- GID_FEEBLEFILES_ES,
+ GID_FEEBLEFILES,
GF_OLD_BUNDLE | GF_TALKIE,
},
Modified: scummvm/trunk/engines/agos/intern.h
===================================================================
--- scummvm/trunk/engines/agos/intern.h 2006-10-03 14:02:14 UTC (rev 24099)
+++ scummvm/trunk/engines/agos/intern.h 2006-10-03 14:18:17 UTC (rev 24100)
@@ -207,66 +207,16 @@
GID_WAXWORKS,
GID_SIMON1DOS,
- GID_SIMON1DOS_RU,
- GID_SIMON1DOS_INF,
- GID_SIMON1DOS_INF_RU,
- GID_SIMON1DOS_FR,
- GID_SIMON1DOS_DE,
- GID_SIMON1DOS_IT,
- GID_SIMON1DOS_ES,
GID_SIMON1DEMO,
GID_SIMON1AMIGA,
- GID_SIMON1AMIGA_FR,
- GID_SIMON1AMIGA_DE,
GID_SIMON1AMIGADEMO,
GID_SIMON1CD32,
- GID_SIMON1CD32_2,
- GID_SIMON1ACORN,
- GID_SIMON1ACORNDEMO,
GID_SIMON1TALKIE,
- GID_SIMON1TALKIE2,
- GID_SIMON1TALKIE_FR,
- GID_SIMON1TALKIE_DE,
- GID_SIMON1TALKIE_HB,
- GID_SIMON1TALKIE_IT,
- GID_SIMON1TALKIE_IT2,
- GID_SIMON1TALKIE_ES,
- GID_SIMON1WIN,
- GID_SIMON1WIN_RU,
- GID_SIMON1WIN_DE,
GID_SIMON2DOS,
- GID_SIMON2DOS_RU,
- GID_SIMON2DOS2,
- GID_SIMON2DOS2_RU,
- GID_SIMON2DOS_DE,
- GID_SIMON2DOS_IT,
- GID_SIMON2DEMO,
GID_SIMON2TALKIE,
- GID_SIMON2TALKIE2,
- GID_SIMON2TALKIE_FR,
- GID_SIMON2TALKIE_DE,
- GID_SIMON2TALKIE_DE2,
- GID_SIMON2TALKIE_HB,
- GID_SIMON2TALKIE_IT,
- GID_SIMON2TALKIE_ES,
- GID_SIMON2WIN,
- GID_SIMON2WIN_DE,
- GID_SIMON2WIN_DE2,
- GID_SIMON2WIN_PL,
- GID_FEEBLEFILES_AMI_DE,
- GID_FEEBLEFILES_AMI_UK,
- GID_FEEBLEFILES_MAC_FR,
- GID_FEEBLEFILES_MAC_DE,
- GID_FEEBLEFILES_MAC_ES,
- GID_FEEBLEFILES_MAC_UK,
- GID_FEEBLEFILES_2CD,
- GID_FEEBLEFILES_4CD,
- GID_FEEBLEFILES_FR,
- GID_FEEBLEFILES_DE,
- GID_FEEBLEFILES_IT,
- GID_FEEBLEFILES_ES,
+ GID_FEEBLEFILES,
GID_DIMP,
GID_JUMBLE,
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