[Gcblue-commits] gcb_wx/include/common tcSound.h,1.10,1.11 wxcommands.h,1.11,1.12

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9771/include/common

Modified Files:
	tcSound.h wxcommands.h 
Log Message:


Index: tcSound.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSound.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcSound.h	29 Feb 2004 22:51:35 -0000	1.10
--- tcSound.h	6 Mar 2004 20:52:28 -0000	1.11
***************
*** 31,34 ****
--- 31,35 ----
  #include <AL/alc.h>
  #include <string>
+ #include <map>
  
  class tcOggStreamer;
***************
*** 57,61 ****
  #define SEFFECT_JETLAUNCH 18
  #define SEFFECT_MUTEDBEEP 19
! #define N_SEFFECT 20
  
  #define N_EFFECT_BUFFERS 16
--- 58,64 ----
  #define SEFFECT_JETLAUNCH 18
  #define SEFFECT_MUTEDBEEP 19
! #define SEFFECT_INTERCOM 20
! #define SEFFECT_FSLIDE 21
! #define N_SEFFECT 22
  
  #define N_EFFECT_BUFFERS 16
***************
*** 81,84 ****
--- 84,88 ----
      bool GetMusicPause() const;
      void PlayEffect(int anEffect);
+     void PlayEffect(std::string effectName);
      void PlayMusic(int anTrack);
      void PlayMusic(std::string song);
***************
*** 102,105 ****
--- 106,111 ----
      ~tcSound();
  
+     std::map<std::string, int> effectMap;
+ 
      tcOggStreamer *oggStreamer; ///< class for streaming Ogg music
      struct _effectbuffinfo 

Index: wxcommands.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/wxcommands.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxcommands.h	29 Feb 2004 22:51:35 -0000	1.11
--- wxcommands.h	6 Mar 2004 20:52:28 -0000	1.12
***************
*** 46,50 ****
      ID_MULTIPLAYERMODE = 150, ///< 0 - none, 1 - client, 2 - server
      ID_CONNECT = 160,
!     ID_CHATTEXT = 170,
  };
  
--- 46,51 ----
      ID_MULTIPLAYERMODE = 150, ///< 0 - none, 1 - client, 2 - server
      ID_CONNECT = 160,
!     ID_SENDTEST = 170,
!     ID_CHATPROTOCOL = 180,
  };