[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.142,1.143 queen.cpp,1.124,1.125 sound.cpp,1.52,1.53
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Thu Apr 7 01:58:24 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.258,1.259
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.216,1.217 intern.h,2.422,2.423 module.mk,1.47,1.48 script_v90he.cpp,2.214,2.215 scumm.cpp,1.406,1.407 scumm.h,1.565,1.566 wiz_he.cpp,2.40,2.41 wiz_he.h,2.15,2.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2039
Modified Files:
cutaway.cpp queen.cpp sound.cpp
Log Message:
Applied some ScummVM formatting conventions.
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- cutaway.cpp 1 Jan 2005 16:09:07 -0000 1.142
+++ cutaway.cpp 7 Apr 2005 08:57:39 -0000 1.143
@@ -440,7 +440,7 @@
objectType = OBJECT_TYPE_NO_ANIMATION;
}
- switch(object.objectNumber) {
+ switch (object.objectNumber) {
case -2:
// Text to be spoken
objectType = OBJECT_TYPE_TEXT_SPEAK;
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- queen.cpp 25 Mar 2005 17:55:52 -0000 1.124
+++ queen.cpp 7 Apr 2005 08:57:39 -0000 1.125
@@ -71,17 +71,17 @@
}
GameSettings determineTarget(uint32 size) {
- switch(size) {
- case 3724538: //regular demo
- case 3732177:
- return queen_setting[1];
- break;
- case 1915913: //interview demo
- return queen_setting[2];
- break;
- default: //non-demo
- return queen_setting[0];
- break;
+ switch (size) {
+ case 3724538: //regular demo
+ case 3732177:
+ return queen_setting[1];
+ break;
+ case 1915913: //interview demo
+ return queen_setting[2];
+ break;
+ default: //non-demo
+ return queen_setting[0];
+ break;
}
return queen_setting[0];
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sound.cpp 12 Mar 2005 18:55:41 -0000 1.52
+++ sound.cpp 7 Apr 2005 08:57:40 -0000 1.53
@@ -47,37 +47,37 @@
if (!mixer->isReady())
return new SilentSound(mixer, vm);
- switch(compression) {
- case COMPRESSION_NONE:
- return new SBSound(mixer, vm);
- break;
- case COMPRESSION_MP3:
- #ifndef USE_MAD
- warning("Using MP3 compressed datafile, but MP3 support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new MP3Sound(mixer, vm);
- #endif
- break;
- case COMPRESSION_OGG:
- #ifndef USE_VORBIS
- warning("Using OGG compressed datafile, but OGG support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new OGGSound(mixer, vm);
- #endif
- break;
- case COMPRESSION_FLAC:
- #ifndef USE_FLAC
- warning("Using FLAC compressed datafile, but FLAC support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new FLACSound(mixer, vm);
- #endif
- break;
- default:
- warning("Unknown compression type");
- return new SilentSound(mixer, vm);
+ switch (compression) {
+ case COMPRESSION_NONE:
+ return new SBSound(mixer, vm);
+ break;
+ case COMPRESSION_MP3:
+#ifndef USE_MAD
+ warning("Using MP3 compressed datafile, but MP3 support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new MP3Sound(mixer, vm);
+#endif
+ break;
+ case COMPRESSION_OGG:
+#ifndef USE_VORBIS
+ warning("Using OGG compressed datafile, but OGG support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new OGGSound(mixer, vm);
+#endif
+ break;
+ case COMPRESSION_FLAC:
+#ifndef USE_FLAC
+ warning("Using FLAC compressed datafile, but FLAC support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new FLACSound(mixer, vm);
+#endif
+ break;
+ default:
+ warning("Unknown compression type");
+ return new SilentSound(mixer, vm);
}
}
@@ -161,15 +161,15 @@
int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
switch (override) {
- // Override all songs
- case 1:
- break;
- // Alter song settings (such as volume) and exit
- case 2:
- _vm->music()->toggleVChange();
- default:
- return;
- break;
+ // Override all songs
+ case 1:
+ break;
+ // Alter song settings (such as volume) and exit
+ case 2:
+ _vm->music()->toggleVChange();
+ default:
+ return;
+ break;
}
_lastOverride = songNum;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.258,1.259
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.216,1.217 intern.h,2.422,2.423 module.mk,1.47,1.48 script_v90he.cpp,2.214,2.215 scumm.cpp,1.406,1.407 scumm.h,1.565,1.566 wiz_he.cpp,2.40,2.41 wiz_he.h,2.15,2.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list