[Moeng-cvs] BBRpg/src rpg.cpp,1.8.2.1,1.8.2.2 script.cpp,1.13,1.13.2.1 sound.cpp,1.8.2.2,1.8.2.3 sound.h,1.6.2.1,1.6.2.2

[<b_l...@us...>]

Update of /cvsroot/moeng/BBRpg/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14867/src

Modified Files:
      Tag: bbrpg
	rpg.cpp script.cpp sound.cpp sound.h 
Log Message:
Logfile optional and MIDI used also when alogg not present.

Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** rpg.cpp	6 Jan 2004 23:16:33 -0000	1.8.2.1
--- rpg.cpp	7 Jan 2004 20:56:48 -0000	1.8.2.2
***************
*** 113,116 ****
--- 113,117 ----
  	sfx_vol = get_config_int("Sound", "SfxVolume", 255);
  	music_format = (strcmp(get_config_string("Sound", "MusicFormat", "MIDI"), "MIDI") == 0) ? MUSIC_MIDI : MUSIC_OGG;
+ 	console.enableLogfile = (get_config_int("Engine", "LogEnabled", 1));
  
  	// Screen initialisation

Index: script.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/script.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** script.cpp	3 Jan 2004 21:56:19 -0000	1.13
--- script.cpp	7 Jan 2004 20:56:48 -0000	1.13.2.1
***************
*** 170,180 ****
  
  	lua_register(L, "m_play_sample",    l_play_sample);
- #ifdef ENABLE_MUSIC
  	lua_register(L, "m_play_music",     l_play_music);
  	lua_register(L, "m_stop_music",     l_stop_music);
  	lua_register(L, "m_adjust_channel", l_adjust_channel);
  	lua_register(L, "m_get_number_of_channels", l_get_number_of_channels);
  #else
- 	lua_register(L, "m_play_music",     l_dummy);
  	lua_register(L, "m_stop_music",     l_dummy);
  	lua_register(L, "m_adjust_channel", l_dummy);
--- 170,179 ----
  
  	lua_register(L, "m_play_sample",    l_play_sample);
  	lua_register(L, "m_play_music",     l_play_music);
+ #ifdef ENABLE_MUSIC
  	lua_register(L, "m_stop_music",     l_stop_music);
  	lua_register(L, "m_adjust_channel", l_adjust_channel);
  	lua_register(L, "m_get_number_of_channels", l_get_number_of_channels);
  #else
  	lua_register(L, "m_stop_music",     l_dummy);
  	lua_register(L, "m_adjust_channel", l_dummy);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.cpp,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** sound.cpp	7 Jan 2004 18:14:03 -0000	1.8.2.2
--- sound.cpp	7 Jan 2004 20:56:48 -0000	1.8.2.3
***************
*** 31,35 ****
  
  
- #ifdef ENABLE_MUSIC
  // Currently playing OGG file
  struct {
--- 31,34 ----
***************
*** 40,44 ****
  	char filename[128];
  } channels[CHANNELS];
- #endif
  
  char *error;
--- 39,42 ----
***************
*** 83,87 ****
  
  
- #ifdef ENABLE_MUSIC
  
  /* play_music(filename, channel)
--- 81,84 ----
***************
*** 95,99 ****
  	error = NULL;
  
! 	if (sound_enabled) {
  		if (music_format == MUSIC_MIDI) {
  			replace_extension(channels[channel].filename, get_filename(filename), "mid", 128);
--- 92,98 ----
  	error = NULL;
  
! 	if (channel < 0 || channel > CHANNELS) {error = "invalid channel";}
! 
! 	if (sound_enabled && error == NULL) {
  		if (music_format == MUSIC_MIDI) {
  			replace_extension(channels[channel].filename, get_filename(filename), "mid", 128);
***************
*** 106,114 ****
  			}
  		} else {
  			// Stop currently playing music
  			stop_music(channel);
  			
! 			if (channel < 0 || channel > CHANNELS) {error = "invalid channel";}
! 			else if (!exists(filename)) {error = "file does not exist";}
  			
  			strncpy(channels[channel].filename, filename, 128);
--- 105,113 ----
  			}
  		} else {
+ #ifdef ENABLE_MUSIC
  			// Stop currently playing music
  			stop_music(channel);
  			
! 			if (!exists(filename)) {error = "file does not exist";}
  			
  			strncpy(channels[channel].filename, filename, 128);
***************
*** 122,125 ****
--- 121,125 ----
  			channels[channel].ass = alogg_get_audio_stream(channels[channel].stream);
  			voice_set_volume(channels[channel].ass->voice, music_vol);
+ #endif
  		}
  	}
***************
*** 134,137 ****
--- 134,140 ----
  	return 0;
  }
+ 
+ 
+ #ifdef ENABLE_MUSIC
  
  /* adjust_channel(channel, volume, panning, speed)

Index: sound.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** sound.h	6 Jan 2004 23:16:33 -0000	1.6.2.1
--- sound.h	7 Jan 2004 20:56:48 -0000	1.6.2.2
***************
*** 31,36 ****
  
  
- //#define DATASZ   (1 << 15) /* (32768) amount of data to read from disk each time */
- //#define BUFSZ    (1 << 16) /* (65536) size of audiostream buffer */
  #define CHANNELS (1 << 1)  /* (2)     number of channels */
  #define BLOCK_SIZE 40960
--- 31,34 ----
***************
*** 40,49 ****
  void exit_sound();
  
- #ifdef ENABLE_MUSIC
  void play_music(const char *filename);
  void stop_music(int channel);
  void poll_sound();
  int l_get_number_of_channels(lua_State *L);
- int l_play_music(lua_State *L);
  int l_stop_music(lua_State *L);
  int l_adjust_channel(lua_State *L);
--- 38,48 ----
  void exit_sound();
  
  void play_music(const char *filename);
+ int l_play_music(lua_State *L);
+ 
+ #ifdef ENABLE_MUSIC
  void stop_music(int channel);
  void poll_sound();
  int l_get_number_of_channels(lua_State *L);
  int l_stop_music(lua_State *L);
  int l_adjust_channel(lua_State *L);