Changeset 3097

Timestamp:

Mar 12, 2000, 10:33:25 PM (26 years ago)

Author:

mike

Message:

Minor fix for Heroes of M&M III

Location:

trunk

Files:

• changelog (modified) (2 diffs)
• src/dsound/new/OS2PrimBuff.cpp (modified) (1 diff)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.801 2000-03-11 21:52:15 sandervl Exp $ */
+ /* $Id: changelog,v 1.802 2000-03-12 21:33:22 mike Exp $ */
+
+ 2000-03-12: Michal Necasek <mike@mendelu.cz>
+        - dsound\new: Fixed sound in Heroes of M&M III
 
  2000-03-11: Przemyslaw Dobrowolski <dobrawka@asua.org.pl>
-        - OPENGL\GLIDE: Fix for Voodoo 1 glide (missing io ports)
+        - OPENGL\GLIDE: Fix for Voodoo 1 glide (missing io ports)
 
  2000-03-11: knut st. osmundsen <knut.stange.osmundse@pmsc.no>
@@ -11 +14 @@
 
  2000-03-11: Sander van Leeuwen <sandervl@xs4all.nl>
-        - OPENGL\GLUT: Fixed compile problems + cleanup
+        - OPENGL\GLUT: Fixed compile problems + cleanup
                        (use C(XX)FLAGS_WIN32APP so you don't have to
                         explicitely specify which api type you use (ascii or unicode)!)
 
-        - OPENGL\GLIDE: Fixed wrong binary path for voodoo1 glide
-        - include\win\debugtools.h: Disable TRACE, WARN etc when DEBUG is not defined
+        - OPENGL\GLIDE: Fixed wrong binary path for voodoo1 glide
+        - include\win\debugtools.h: Disable TRACE, WARN etc when DEBUG is not defined
 
  2000-03-11: Jeroen van den Horn <J.vandenHorn@fibre.a2000.nl>

trunk/src/dsound/new/OS2PrimBuff.cpp

@@ -454 +454 @@
    OS2PrimBuff *me = (OS2PrimBuff *)This;
 
-   if (me == NULL) {
-      return DSERR_INVALIDPARAM;
+   if (me == NULL || lpfxFormat == NULL) {
+      return DSERR_INVALIDPARAM;
+   }
+
+   /* Note: the software mixer doesn't really support mono output but */
+   /*       we can safely mix in stereo anyway                        */
+   if (lpfxFormat->nChannels == 1) {
+      if (me->parentDS->GetCoopLevel() != DSSCL_WRITEPRIMARY)
+         lpfxFormat->nChannels = 2;
    }