[Dunelegacy-commit] SF.net SVN: dunelegacy: [270] branches/dunks/include

[<dv...@us...>]

Revision: 270
          http://dunelegacy.svn.sourceforge.net/dunelegacy/?rev=270&view=rev
Author:   dvalin
Date:     2008-05-04 12:18:01 -0700 (Sun, 04 May 2008)

Log Message:
-----------
yet another forgotten commit

Modified Paths:
--------------
    branches/dunks/include/MenuBase.h
    branches/dunks/include/SoundPlayerClass.h

Modified: branches/dunks/include/MenuBase.h
===================================================================
--- branches/dunks/include/MenuBase.h	2008-05-04 19:15:39 UTC (rev 269)
+++ branches/dunks/include/MenuBase.h	2008-05-04 19:18:01 UTC (rev 270)
@@ -18,7 +18,7 @@
         int Execute(float dt);
 
     public:
-        SDL_Surface* m_menuBackground;
+        ImagePtr m_menuBackground;
         Container* m_container;
 };
 

Modified: branches/dunks/include/SoundPlayerClass.h
===================================================================
--- branches/dunks/include/SoundPlayerClass.h	2008-05-04 19:15:39 UTC (rev 269)
+++ branches/dunks/include/SoundPlayerClass.h	2008-05-04 19:18:01 UTC (rev 270)
@@ -62,7 +62,7 @@
 
 	void playVoice(Sound_enum id, HOUSETYPE house);
 	void playSound(Sound_enum soundID);
-	void playSound(Mix_Chunk* sound, int channel = 0);
+	void playSound(Mix_Chunk* sound, int channel = -1);
 	
 	inline int GetSfxVolume() { return sfxVolume; };
 	void SetSfxVolume(int newVolume) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.