moeng-cvs — CVS commits will be send to this list.

[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.30,1.30.2.1 BBRpgLangDutch.lua,1.5,1.5.2.1 MessPile.lua,1.9.2.1,1.9.2.2

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

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv9445/data/scripts

Modified Files:
      Tag: bbrpg
	BBRpgLang.lua BBRpgLangDutch.lua MessPile.lua 
Log Message:
Fix voor max inventory problem (for BBRpg only)

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** BBRpgLang.lua	4 Jan 2004 02:29:19 -0000	1.30
--- BBRpgLang.lua	8 Jan 2004 23:43:23 -0000	1.30.2.1
***************
*** 290,293 ****
--- 290,296 ----
  			{"{PLAYER}", "Damn, these levers are rusty. I can't pull them... Maybe Elwood can."},
  		},
+ 		InventoryFullAtRockets = {
+ 			{"{PLAYER}", "Ah, there are the mini-rocket engines! But alas, I am already carrying all I can."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** BBRpgLangDutch.lua	4 Jan 2004 13:17:20 -0000	1.5
--- BBRpgLangDutch.lua	8 Jan 2004 23:43:23 -0000	1.5.2.1
***************
*** 279,282 ****
--- 279,285 ----
  			{"{PLAYER}", "Aargh, deze hendel is roestig. Ik krijg hem niet om. Misschien lukt Elwood dit."},
  		},
+ 		InventoryFullAtRockets = {
+ 			{"{PLAYER}", "Ah, daar zijn de mini-raket motoren! Maar helaas, ik heb al teveel bij me."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** MessPile.lua	6 Jan 2004 23:16:33 -0000	1.9.2.1
--- MessPile.lua	8 Jan 2004 23:43:23 -0000	1.9.2.2
***************
*** 26,30 ****
  	bPlaceable = true;
  	activatedBy = function(self, obj)
! 		if self.containsEngines then
  			ActionController:addSequence{
  				ActionExModeOn(),
--- 26,37 ----
  	bPlaceable = true;
  	activatedBy = function(self, obj)
! 		if (self.containsEngines) then
! 			if (table.getn(obj.inventory) >= 3) then
! 				ActionController:addSequence{
! 					ActionConversation(lang:getConv("InventoryFullAtRockets")),
! 				}
! 				return
! 			end
! 
  			ActionController:addSequence{
  				ActionExModeOn(),

[Moeng-cvs] BBRpg TODO,1.36.2.3,1.36.2.4

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

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

Modified Files:
      Tag: bbrpg
	TODO 
Log Message:
Fix voor max inventory problem (for BBRpg only)

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -C2 -d -r1.36.2.3 -r1.36.2.4
*** TODO	6 Jan 2004 01:38:52 -0000	1.36.2.3
--- TODO	8 Jan 2004 23:43:23 -0000	1.36.2.4
***************
*** 13,20 ****
  Bjorn:
  ! Experience/levelup afmaken
- - Fix inventory not to go wrong with more than three items
  - Fix waking up sleeping people in sequences
- - Add MIDI playback to the engine
- - Make game try OGG first, and MIDI if OGG files not available
  
  Georg:
--- 13,17 ----

[Moeng-cvs] BBRpg/data/scripts BBRpg.lua,1.26.2.1,1.26.2.2 MainMenu.lua,1.33.2.1,1.33.2.2

[<geo...@us...>]

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv1825/scripts

Modified Files:
      Tag: bbrpg
	BBRpg.lua MainMenu.lua 
Log Message:
- Jake is now added to the party in the introdemo

Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C2 -d -r1.26.2.1 -r1.26.2.2
*** BBRpg.lua	6 Jan 2004 23:16:33 -0000	1.26.2.1
--- BBRpg.lua	8 Jan 2004 07:53:39 -0000	1.26.2.2
***************
*** 63,80 ****
  
  		-- Call superfunction
- 		Game.init(self)
- 
  		gameCameraTarget = CameraTarget() -- GLOBAL!?
  		self.playerSwitcher = PlayerSwitcher(playerController, gameCameraTarget)
  		playerSwitcher = self.playerSwitcher -- Can't do without this global var for the moment
  		self.viewPort.target = gameCameraTarget
  
  		self.playerSwitcher:addPlayerHost(elwood)
! 		self.playerSwitcher:addPlayerHost(jake)
  		--self.playerSwitcher:addPlayerHost(brian)
  
  		-- Tell the HUD about the playerSwitcher
  		self.hud:setPlayerSwitcher(self.playerSwitcher)
- 
  
  		-- Show startup screen
--- 63,79 ----
  
  		-- Call superfunction
  		gameCameraTarget = CameraTarget() -- GLOBAL!?
  		self.playerSwitcher = PlayerSwitcher(playerController, gameCameraTarget)
  		playerSwitcher = self.playerSwitcher -- Can't do without this global var for the moment
+ 		Game.init(self)
+ 
  		self.viewPort.target = gameCameraTarget
  
  		self.playerSwitcher:addPlayerHost(elwood)
! 		--self.playerSwitcher:addPlayerHost(jake)
  		--self.playerSwitcher:addPlayerHost(brian)
  
  		-- Tell the HUD about the playerSwitcher
  		self.hud:setPlayerSwitcher(self.playerSwitcher)
  
  		-- Show startup screen

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C2 -d -r1.33.2.1 -r1.33.2.2
*** MainMenu.lua	6 Jan 2004 23:16:33 -0000	1.33.2.1
--- MainMenu.lua	8 Jan 2004 07:53:39 -0000	1.33.2.2
***************
*** 20,23 ****
--- 20,24 ----
  			ActionWait(50),
  			ActionSetVariable(_G, "show_main_menu", nil),
+ 			ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, jake),
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
***************
*** 34,38 ****
  			ActionFadeOutMap(50),
  			ActionWait(50),
- 			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionSetVariable(_G, "show_main_menu", nil),
  			ActionPlaySong("data/music/intro.ogg", 100),
--- 35,38 ----
***************
*** 81,84 ****
--- 81,86 ----
  			ActionWalkPath(elwood, "D"),
  			ActionSetVariable(elwood, "dir", DIR_LEFT),
+ 			ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, jake),
+ 			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionConversation(lang:getConv("Intro5")),
  			ActionAddSequence{

[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);

[Moeng-cvs] BBRpg/src/shared console.cpp,1.1,1.1.2.1 console.h,1.1,1.1.2.1

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

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

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

Index: console.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/shared/console.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** console.cpp	9 Dec 2003 01:03:34 -0000	1.1
--- console.cpp	7 Jan 2004 20:56:48 -0000	1.1.2.1
***************
*** 35,38 ****
--- 35,39 ----
  	progress = 0;
  	active = false;
+ 	enableLogfile = true;
  }
  
***************
*** 108,126 ****
  			time(&t);
  
! 			logFile = fopen(logFilename, "a");
! 			fprintf(
! 				logFile,
! 				"[%s%d:%s%d:%s%d] ",
! 				(((t / 60) / 60) % 24 < 10) ? "0" : "",
! 				(int)(((t / 60) / 60) % 24),
! 				((t / 60) % 60 < 10) ? "0" : "",
! 				(int)((t / 60) % 60),
! 				(t % 60 < 10) ? "0" : "",
! 				(int)(t % 60)
! 			);
! 			fprintf(logFile, buf);
! 			fprintf(logFile, "\n");
  			if (where & CON_QUIT)
  			{
  				fprintf(logFile, "FATAL ERROR!\n");
  				fclose(logFile);
--- 109,132 ----
  			time(&t);
  
! 			if (enableLogfile) {
! 				logFile = fopen(logFilename, "a");
! 				fprintf(
! 					logFile,
! 					"[%s%d:%s%d:%s%d] ",
! 					(((t / 60) / 60) % 24 < 10) ? "0" : "",
! 					(int)(((t / 60) / 60) % 24),
! 					((t / 60) % 60 < 10) ? "0" : "",
! 					(int)((t / 60) % 60),
! 					(t % 60 < 10) ? "0" : "",
! 					(int)(t % 60)
! 				);
! 				fprintf(logFile, buf);
! 				fprintf(logFile, "\n");
! 				fclose(logFile);
! 			}
! 
  			if (where & CON_QUIT)
  			{
+ 				logFile = fopen(logFilename, "a");
  				fprintf(logFile, "FATAL ERROR!\n");
  				fclose(logFile);
***************
*** 129,133 ****
  				exit(1);
  			}
- 			fclose(logFile);
  		}
  
--- 135,138 ----

Index: console.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/shared/console.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** console.h	9 Dec 2003 01:03:34 -0000	1.1
--- console.h	7 Jan 2004 20:56:48 -0000	1.1.2.1
***************
*** 39,42 ****
--- 39,44 ----
  	void log(int where, int when, const char* what, ...);
  
+ 	bool enableLogfile;
+ 
  private:
  	FILE* logFile;

[Moeng-cvs] BBRpg rpg.cfg,1.6.2.2,1.6.2.3

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

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

Modified Files:
      Tag: bbrpg
	rpg.cfg 
Log Message:
Logfile optional and MIDI used also when alogg not present.

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** rpg.cfg	6 Jan 2004 23:16:33 -0000	1.6.2.2
--- rpg.cfg	7 Jan 2004 20:56:48 -0000	1.6.2.3
***************
*** 4,7 ****
--- 4,8 ----
  GameClass=BBRpg
  GameSpeed=100
+ LogEnabled=0
  
  [Video]

[Moeng-cvs] BBRpg/src sound.cpp,1.8.2.1,1.8.2.2

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

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

Modified Files:
      Tag: bbrpg
	sound.cpp 
Log Message:
MIDI changes and crash fix.

Index: sound.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.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
*** sound.cpp	6 Jan 2004 23:16:33 -0000	1.8.2.1
--- sound.cpp	7 Jan 2004 18:14:03 -0000	1.8.2.2
***************
*** 51,57 ****
  
  	// Initialize alogg
- #ifdef ENABLE_MUSIC
- 	alogg_init();
- #endif
  
  	int midi_driver = MIDI_NONE;
--- 51,54 ----
***************
*** 62,65 ****
--- 59,65 ----
  	}
  	if (sfx_enabled || (sound_enabled && music_format != MUSIC_MIDI)) {
+ #ifdef ENABLE_MUSIC
+ 		alogg_init();
+ #endif
  		sound_driver = DIGI_AUTODETECT;
  	}
***************
*** 144,148 ****
  	error = NULL;
  
! 	if (sound_enabled) {
  		if (channel < 0 || channel > CHANNELS) {error = "invalid channel";}
  		else if (!channels[channel].ass) {error = "no music on this channel to adjust";}
--- 144,148 ----
  	error = NULL;
  
! 	if (sound_enabled && music_format != MUSIC_MIDI) {
  		if (channel < 0 || channel > CHANNELS) {error = "invalid channel";}
  		else if (!channels[channel].ass) {error = "no music on this channel to adjust";}
***************
*** 153,157 ****
  		if (error == NULL) {
  			voice_set_volume(channels[channel].ass->voice, int(vol * (float(music_vol) / 255.0f)));
- 			//alogg_adjust_oggstream(ogg[channel]->s, vol, pan, speed);
  			//console.log(CON_LOG | CON_CONSOLE, CON_ALWAYS, "Adjusted channel parameters (%d, %d, %d, %d)", channel, vol, pan, speed);
  		} else {
--- 153,156 ----
***************
*** 173,190 ****
  void poll_sound()
  {
! 	for (int i = 0; i < CHANNELS; i++) {
! 		if (channels[i].stream) {
! 			int ret = alogg_update_streaming(channels[i].stream);
! 			if (ret == 0) {
! 				// Loop song
! 				stop_music(i);
! 				channels[i].stream = alogg_start_streaming(channels[i].filename, BLOCK_SIZE);
! 				if (!channels[i].stream) {
! 					fprintf(stderr,"Error opening %s\n", channels[i].filename);
! 					alogg_exit();
! 					exit(1);
  				}
- 				channels[i].ass = alogg_get_audio_stream(channels[i].stream);
- 				break;
  			}
  		}
--- 172,191 ----
  void poll_sound()
  {
! 	if (music_format != MUSIC_MIDI) {
! 		for (int i = 0; i < CHANNELS; i++) {
! 			if (channels[i].stream) {
! 				int ret = alogg_update_streaming(channels[i].stream);
! 				if (ret == 0) {
! 					// Loop song
! 					stop_music(i);
! 					channels[i].stream = alogg_start_streaming(channels[i].filename, BLOCK_SIZE);
! 					if (!channels[i].stream) {
! 						fprintf(stderr,"Error opening %s\n", channels[i].filename);
! 						alogg_exit();
! 						exit(1);
! 					}
! 					channels[i].ass = alogg_get_audio_stream(channels[i].stream);
! 					break;
  				}
  			}
  		}
***************
*** 202,206 ****
  	}
  	*/
! 	if (channels[channel].stream) {
  		alogg_stop_streaming(channels[channel].stream);
  		channels[channel].stream = NULL;
--- 203,207 ----
  	}
  	*/
! 	if (music_format != MUSIC_MIDI && channels[channel].stream) {
  		alogg_stop_streaming(channels[channel].stream);
  		channels[channel].stream = NULL;
***************
*** 259,263 ****
  	}
  
! 	alogg_exit();
  #endif
  }
--- 260,266 ----
  	}
  
! 	if (sound_enabled && music_format != MUSIC_MIDI) {
! 		alogg_exit();
! 	}
  #endif
  }

[Moeng-cvs] BBRpg/data/scripts Cells.lua,1.15,1.15.2.1 City.lua,1.18,1.18.2.1 JakesPlace.lua,1.5,1.5.2.1 LeesPlace.lua,1.3,1.3.2.1 Sewers.lua,1.16,1.16.2.1

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

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv3234

Modified Files:
      Tag: bbrpg
	Cells.lua City.lua JakesPlace.lua LeesPlace.lua Sewers.lua 
Log Message:
Updated map music files.

Index: Cells.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** Cells.lua	2 Jan 2004 23:06:55 -0000	1.15
--- Cells.lua	6 Jan 2004 23:19:56 -0000	1.15.2.1
***************
*** 192,196 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("prison.tga"),
! 		musicFilename = "data/music/1.ogg",
  	}
  }
--- 192,196 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("prison.tga"),
! 		musicFilename = "data/music/cells.ogg",
  	}
  }

Index: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** City.lua	2 Jan 2004 23:06:55 -0000	1.18
--- City.lua	6 Jan 2004 23:19:56 -0000	1.18.2.1
***************
*** 82,86 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("suburbs.tga"),
! 		musicFilename = "data/music/4.ogg",
  	}
  }
--- 82,86 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("suburbs.tga"),
! 		musicFilename = "data/music/city.ogg",
  	}
  }

Index: JakesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/JakesPlace.lua,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** JakesPlace.lua	3 Jan 2004 00:16:32 -0000	1.5
--- JakesPlace.lua	6 Jan 2004 23:19:56 -0000	1.5.2.1
***************
*** 31,35 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("jakesplace.tga"),
! 		musicFilename = "data/music/4.ogg",
  	};
  }
--- 31,35 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("jakesplace.tga"),
! 		musicFilename = "data/music/city.ogg",
  	};
  }

Index: LeesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/LeesPlace.lua,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** LeesPlace.lua	2 Jan 2004 04:49:53 -0000	1.3
--- LeesPlace.lua	6 Jan 2004 23:19:56 -0000	1.3.2.1
***************
*** 28,31 ****
--- 28,32 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("leesplace.tga"),
+ 		musicFilename = "data/music/city.ogg",
  	}
  }

Index: Sewers.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Sewers.lua,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** Sewers.lua	2 Jan 2004 23:06:55 -0000	1.16
--- Sewers.lua	6 Jan 2004 23:19:56 -0000	1.16.2.1
***************
*** 57,61 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("sewers.tga"),
! 		musicFilename = "data/music/5.ogg",
  	}
  }
--- 57,61 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("sewers.tga"),
! 		musicFilename = "data/music/sewers.ogg",
  	}
  }

[Moeng-cvs] BBRpg/src rpg.cpp,1.8,1.8.2.1 sound.cpp,1.8,1.8.2.1 sound.h,1.6,1.6.2.1

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

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

Modified Files:
      Tag: bbrpg
	rpg.cpp sound.cpp sound.h 
Log Message:
Done some MIDI stuff (not finished)

Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** rpg.cpp	3 Jan 2004 22:41:02 -0000	1.8
--- rpg.cpp	6 Jan 2004 23:16:33 -0000	1.8.2.1
***************
*** 108,115 ****
  	bVSync = get_config_int("Video", "VSync", 0);
  	
! 	sound_enabled = (get_config_int("Sound", "EnableMusic", 1)) ? 1 : 0;
! 	sfx_enabled = (get_config_int("Sound", "EnableSfx", 1)) ? 1 : 0;
  	music_vol = get_config_int("Sound", "MusicVolume", 255);
  	sfx_vol = get_config_int("Sound", "SfxVolume", 255);
  
  	// Screen initialisation
--- 108,116 ----
  	bVSync = get_config_int("Video", "VSync", 0);
  	
! 	sound_enabled = (get_config_int("Sound", "MusicEnabled", 1)) ? 1 : 0;
! 	sfx_enabled = (get_config_int("Sound", "SfxEnabled", 1)) ? 1 : 0;
  	music_vol = get_config_int("Sound", "MusicVolume", 255);
  	sfx_vol = get_config_int("Sound", "SfxVolume", 255);
+ 	music_format = (strcmp(get_config_string("Sound", "MusicFormat", "MIDI"), "MIDI") == 0) ? MUSIC_MIDI : MUSIC_OGG;
  
  	// Screen initialisation
***************
*** 170,181 ****
  	}
  
- 	// Lua initialisation
- 	console.log(CON_LOG, CON_ALWAYS, "Initialising Lua scripting environment...");
- 	initScripting();
- 
  	if (sound_enabled || sfx_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Initialising sound...");
  		init_sound();
  	}
  
  	console.log(CON_LOG, CON_ALWAYS, "Installing timers...");
--- 171,182 ----
  	}
  
  	if (sound_enabled || sfx_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Initialising sound...");
  		init_sound();
  	}
+ 
+ 	// Lua initialisation
+ 	console.log(CON_LOG, CON_ALWAYS, "Initialising Lua scripting environment...");
+ 	initScripting();
  
  	console.log(CON_LOG, CON_ALWAYS, "Installing timers...");

Index: sound.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** sound.cpp	3 Jan 2004 22:41:02 -0000	1.8
--- sound.cpp	6 Jan 2004 23:16:33 -0000	1.8.2.1
***************
*** 28,31 ****
--- 28,32 ----
  int sfx_vol = 255;
  int music_vol = 255;
+ int music_format = 0;
  
  
***************
*** 46,53 ****
  
  void init_sound() {
- 	// Read config variables
- 	//ChunkSize = (get_config_int("Sound", "StreamChunkSize", 1<<15));
- 	//BufferSize = (get_config_int("Sound", "BufferSize", 1<<16));
- 
  	// To achieve the max possible volume
  	set_volume_per_voice(0);
--- 47,50 ----
***************
*** 58,63 ****
  #endif
  
  	// Install sound driver
! 	if (install_sound(DIGI_AUTODETECT, MIDI_NONE, NULL) != 0) {
  		console.log(CON_LOG, CON_ALWAYS, "Error initialising sound system: %s", allegro_error);
  		return;
--- 55,70 ----
  #endif
  
+ 	int midi_driver = MIDI_NONE;
+ 	int sound_driver = DIGI_NONE;
+ 
+ 	if (music_format == MUSIC_MIDI) {
+ 		midi_driver = MIDI_AUTODETECT;
+ 	}
+ 	if (sfx_enabled || (sound_enabled && music_format != MUSIC_MIDI)) {
+ 		sound_driver = DIGI_AUTODETECT;
+ 	}
+ 
  	// Install sound driver
! 	if (install_sound(sound_driver, midi_driver, NULL) != 0) {
  		console.log(CON_LOG, CON_ALWAYS, "Error initialising sound system: %s", allegro_error);
  		return;
***************
*** 89,111 ****
  
  	if (sound_enabled) {
! 		// Stop currently playing music
! 		stop_music(channel);
! 
! 		if (channel < 0 || channel > CHANNELS) {error = "invalid channel";}
! 		else if (!exists(filename)) {error = "file does not exist";}
! 		
! 		if (error == NULL) {
! 			/*
! 			channels[channel].sample = alogg_load_ogg(filename);
! 			if (!channels[channel].sample) {
! 				fprintf(stderr,"Error loading %s (%d)\n", filename, alogg_error_code);
! 				alogg_exit();
! 				exit(1);
  			}
! 			*/
  			strncpy(channels[channel].filename, filename, 128);
  			channels[channel].stream = alogg_start_streaming(channels[channel].filename, BLOCK_SIZE);
  			if (!channels[channel].stream) {
! 				fprintf(stderr,"Error opening %s\n", filename);
  				alogg_exit();
  				exit(1);
--- 96,120 ----
  
  	if (sound_enabled) {
! 		if (music_format == MUSIC_MIDI) {
! 			replace_extension(channels[channel].filename, get_filename(filename), "mid", 128);
! 			
! 			DATAFILE *found_object = find_datafile_object(bitmap_data, channels[channel].filename);
! 			if (found_object) {
! 				play_looped_midi((MIDI*)found_object->dat, 0, -1);
! 			} else {
! 				console.log(CON_QUIT, CON_ALWAYS, "Could not find MIDI file in datafile (%s)", channels[channel].filename);
  			}
! 		} 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);
+ 			
  			channels[channel].stream = alogg_start_streaming(channels[channel].filename, BLOCK_SIZE);
  			if (!channels[channel].stream) {
! 				fprintf(stderr,"Error opening %s\n", channels[channel].filename);
  				alogg_exit();
  				exit(1);
***************
*** 114,139 ****
  			voice_set_volume(channels[channel].ass->voice, music_vol);
  		}
- 
- 		/*
- 		channels[channel].voice = allocate_voice(channels[channel].sample);
- 		if (channels[channel].voice == -1) {
- 			error = "unable to allocate a voice";
- 		}
- 		*/
- 
- 		if (error == NULL) {
- 			/*
- 			voice_start(channels[channel].voice);
- 			release_voice(channels[channel].voice);
- 			channels[channel].voice = 0;
- 			channels[channel].sample = NULL;
- 			*/
- 			console.log(CON_LOG | CON_CONSOLE, CON_ALWAYS, "Playing OGG file (%s)", filename);
- 		}
- 		else {
- 			console.log(CON_LOG | CON_CONSOLE, CON_ALWAYS, "Error playing OGG file \"%s\" (%s)", filename, error);
- 		}
  	}
! 
  	return 0;
  }
--- 123,135 ----
  			voice_set_volume(channels[channel].ass->voice, music_vol);
  		}
  	}
! 	
! 	if (error == NULL) {
! 		console.log(CON_LOG | CON_CONSOLE, CON_ALWAYS, "Playing music file (%s)", filename);
! 	}
! 	else {
! 		console.log(CON_LOG | CON_CONSOLE, CON_ALWAYS, "Error playing music file \"%s\" (%s)", filename, error);
! 	}
! 	
  	return 0;
  }
***************
*** 243,252 ****
  
  	if (sfx_enabled) {
- 		console.log(CON_LOG, CON_ALWAYS, "Trying to play sample: %s", name);
- 
  		DATAFILE *found_object = find_datafile_object(bitmap_data, name);
  
  		if (found_object) {
! 			//int play_sample(const SAMPLE *spl, int vol, int pan, int freq, int loop);
  			play_sample((SAMPLE*)found_object->dat, sfx_vol, 128, 1000, 0);
  		} else {
--- 239,246 ----
  
  	if (sfx_enabled) {
  		DATAFILE *found_object = find_datafile_object(bitmap_data, name);
  
  		if (found_object) {
! 			console.log(CON_LOG, CON_ALWAYS, "Playing sample: %s", name);
  			play_sample((SAMPLE*)found_object->dat, sfx_vol, 128, 1000, 0);
  		} else {

Index: sound.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** sound.h	3 Jan 2004 22:41:02 -0000	1.6
--- sound.h	6 Jan 2004 23:16:33 -0000	1.6.2.1
***************
*** 25,28 ****
--- 25,33 ----
  extern int sfx_vol;
  extern int music_vol;
+ extern int music_format;
+ 
+ #define MUSIC_MIDI 0
+ #define MUSIC_OGG  1
+ 
  
  //#define DATASZ   (1 << 15) /* (32768) amount of data to read from disk each time */

[Moeng-cvs] BBRpg/data/music cells.mid,NONE,1.1.2.1 city.mid,NONE,1.1.2.1 einddemo.mid,NONE,1.1.2.1 intro.mid,NONE,1.1.2.1 mainmenu.mid,NONE,1.1.2.1 sewers.mid,NONE,1.1.2.1

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

Update of /cvsroot/moeng/BBRpg/data/music
In directory sc8-pr-cvs1:/tmp/cvs-serv2502/data/music

Added Files:
      Tag: bbrpg
	cells.mid city.mid einddemo.mid intro.mid mainmenu.mid 
	sewers.mid 
Log Message:
Done some MIDI stuff (not finished)

--- NEW FILE: cells.mid ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: city.mid ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: einddemo.mid ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: intro.mid ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mainmenu.mid ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sewers.mid ---
(This appears to be a binary file; contents omitted.)

[Moeng-cvs] BBRpg/data/scripts BBRpg.lua,1.26,1.26.2.1 ConversationWindow.lua,1.3,1.3.2.1 MainMenu.lua,1.33,1.33.2.1 MessPile.lua,1.9,1.9.2.1

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

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2502/data/scripts

Modified Files:
      Tag: bbrpg
	BBRpg.lua ConversationWindow.lua MainMenu.lua MessPile.lua 
Log Message:
Done some MIDI stuff (not finished)

Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -d -r1.26 -r1.26.2.1
*** BBRpg.lua	4 Jan 2004 00:43:11 -0000	1.26
--- BBRpg.lua	6 Jan 2004 23:16:33 -0000	1.26.2.1
***************
*** 88,92 ****
  		ActionController:addSequence{
  			ActionExModeOn(),
! 			ActionPlaySong("data/music/3.ogg", 100),
  			ActionTweenVariable(main_menu_bg, "alpha", 100, 255),
  			ActionCallFunction(self.interactionMaster.addInteraction, self.interactionMaster, self.playerSwitcher),
--- 88,92 ----
  		ActionController:addSequence{
  			ActionExModeOn(),
! 			ActionPlaySong("data/music/mainmenu.ogg", 100),
  			ActionTweenVariable(main_menu_bg, "alpha", 100, 255),
  			ActionCallFunction(self.interactionMaster.addInteraction, self.interactionMaster, self.playerSwitcher),

Index: ConversationWindow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ConversationWindow.lua,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** ConversationWindow.lua	25 Dec 2003 20:50:41 -0000	1.3
--- ConversationWindow.lua	6 Jan 2004 23:16:33 -0000	1.3.2.1
***************
*** 206,209 ****
--- 206,210 ----
  		m_set_font(self.font)
  
+ 		--[[
  		if (self.state ~= CB_SCALING) then
  			-- Draw the shadow of the text
***************
*** 219,222 ****
--- 220,224 ----
  			end
  		end
+ ]]
  
  		-- Draw the box

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -C2 -d -r1.33 -r1.33.2.1
*** MainMenu.lua	4 Jan 2004 00:55:48 -0000	1.33
--- MainMenu.lua	6 Jan 2004 23:16:33 -0000	1.33.2.1
***************
*** 36,40 ****
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionSetVariable(_G, "show_main_menu", nil),
! 			ActionPlaySong("data/music/2.ogg", 100),
  			ActionFadeInMap(100),
  			ActionShowMapName(m_get_bitmap("prison.tga")),
--- 36,40 ----
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionSetVariable(_G, "show_main_menu", nil),
! 			ActionPlaySong("data/music/intro.ogg", 100),
  			ActionFadeInMap(100),
  			ActionShowMapName(m_get_bitmap("prison.tga")),

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** MessPile.lua	4 Jan 2004 00:43:14 -0000	1.9
--- MessPile.lua	6 Jan 2004 23:16:33 -0000	1.9.2.1
***************
*** 54,58 ****
  				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
  				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/6.ogg", 10),
  			}
  		else
--- 54,58 ----
  				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
  				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/einddemo.ogg", 10),
  			}
  		else

[Moeng-cvs] BBRpg Makefile.in,1.6,1.6.2.1 rpg.cfg,1.6.2.1,1.6.2.2

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

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

Modified Files:
      Tag: bbrpg
	Makefile.in rpg.cfg 
Log Message:
Done some MIDI stuff (not finished)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/moeng/BBRpg/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** Makefile.in	2 Jan 2004 01:00:05 -0000	1.6
--- Makefile.in	6 Jan 2004 23:16:33 -0000	1.6.2.1
***************
*** 24,27 ****
--- 24,28 ----
  DATA_MAP := $(wildcard data/maps/*.map)
  DATA_SAMPS := $(wildcard data/samples/*.wav)
+ DATA_MIDIS := $(wildcard data/music/*.mid)
  
  .PHONY: default remake clean
***************
*** 45,49 ****
  # voegt ze toe aan de bij de groep behorende variabele en update dan de juiste groepen (door te 
  # testen op niet lege variables
! data.dat: $(DATA_LUA) $(DATA_BMP) $(DATA_FONT) $(DATA_MAP) $(DATA_SAMPS)
  	@list='$?'; \
  	for file in $$list; do \
--- 46,50 ----
  # voegt ze toe aan de bij de groep behorende variabele en update dan de juiste groepen (door te 
  # testen op niet lege variables
! data.dat: $(DATA_LUA) $(DATA_BMP) $(DATA_FONT) $(DATA_MAP) $(DATA_SAMPS) $(DATA_MIDIS)
  	@list='$?'; \
  	for file in $$list; do \
***************
*** 63,66 ****
--- 64,70 ----
  	    DESAMPS="$$DESAMPS $$file"; \
  	  fi; \
+ 	  if echo "$(DATA_MIDIS)" | grep "$$file" > /dev/null 2>/dev/null ; then \
+ 	    DEMIDIS="$$DEMIDIS $$file"; \
+ 	  fi; \
  	done;\
  	if test -n "$$DELUAS" ; then dat -a -k -t LUA data.dat $$DELUAS; fi; \
***************
*** 69,70 ****
--- 73,75 ----
  	if test -n "$$DEMAPS" ; then dat -a -k -t MAP data.dat $$DEMAPS; fi; \
  	if test -n "$$DESAMPS" ; then dat -a -k -t SAMP data.dat $$DESAMPS; fi; \
+ 	if test -n "$$DEMIDIS" ; then dat -a -k -t MIDI data.dat $$DEMIDIS; fi; \

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** rpg.cfg	4 Jan 2004 19:38:10 -0000	1.6.2.1
--- rpg.cfg	6 Jan 2004 23:16:33 -0000	1.6.2.2
***************
*** 7,11 ****
  [Video]
  Fullscreen=0
! DoubleSize=0
  VSync=0
  ResolutionWidth=320
--- 7,11 ----
  [Video]
  Fullscreen=0
! DoubleSize=1
  VSync=0
  ResolutionWidth=320
***************
*** 14,19 ****
  
  [Sound]
! EnableMusic=0
! EnableSfx=0
  MusicVolume=128
  SfxVolume=255
--- 14,20 ----
  
  [Sound]
! MusicEnabled=1
! MusicFormat=MIDI
  MusicVolume=128
+ SfxEnabled=1
  SfxVolume=255

[Moeng-cvs] BBRpg TODO,1.36.2.2,1.36.2.3

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

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

Modified Files:
      Tag: bbrpg
	TODO 
Log Message:
Some new todo items.

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -d -r1.36.2.2 -r1.36.2.3
*** TODO	4 Jan 2004 23:24:11 -0000	1.36.2.2
--- TODO	6 Jan 2004 01:38:52 -0000	1.36.2.3
***************
*** 15,18 ****
--- 15,20 ----
  - Fix inventory not to go wrong with more than three items
  - Fix waking up sleeping people in sequences
+ - Add MIDI playback to the engine
+ - Make game try OGG first, and MIDI if OGG files not available
  
  Georg:

[Moeng-cvs] BBRpg TODO,1.36.2.1,1.36.2.2

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

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

Modified Files:
      Tag: bbrpg
	TODO 
Log Message:
Small TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -C2 -d -r1.36.2.1 -r1.36.2.2
*** TODO	4 Jan 2004 19:38:10 -0000	1.36.2.1
--- TODO	4 Jan 2004 23:24:11 -0000	1.36.2.2
***************
*** 9,17 ****
  - Experience fijn tunen
  - Animated tiles in the sewer
- - Fading music
  ? Hier en daar een plas op de weg, of smurrie
  
  Bjorn:
  ! Experience/levelup afmaken
  
  Georg:
--- 9,18 ----
  - Experience fijn tunen
  - Animated tiles in the sewer
  ? Hier en daar een plas op de weg, of smurrie
  
  Bjorn:
  ! Experience/levelup afmaken
+ - Fix inventory not to go wrong with more than three items
+ - Fix waking up sleeping people in sequences
  
  Georg:

[Moeng-cvs] BBRpg configure,1.10,1.10.2.1 update.bat,1.1,1.1.2.1

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

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

Modified Files:
      Tag: bbrpg
	configure update.bat 
Log Message:
Some changes from main trunk.

Index: configure
===================================================================
RCS file: /cvsroot/moeng/BBRpg/configure,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** configure	3 Jan 2004 21:56:19 -0000	1.10
--- configure	4 Jan 2004 23:21:48 -0000	1.10.2.1
***************
*** 1,4 ****
--- 1,6 ----
  #!/bin/sh
  
+ # thanks to Smunt for some tips :)
+ 
  CC=g++
  LIBS=
***************
*** 17,21 ****
  # echo $MYRETVAL
  # a b c d
! function CLEAN () {
      MYRETVAL=""
      for arg do
--- 19,23 ----
  # echo $MYRETVAL
  # a b c d
! CLEAN () {
      MYRETVAL=""
      for arg do

Index: update.bat
===================================================================
RCS file: /cvsroot/moeng/BBRpg/update.bat,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** update.bat	30 Dec 2003 13:42:46 -0000	1.1
--- update.bat	4 Jan 2004 23:21:48 -0000	1.1.2.1
***************
*** 4,5 ****
--- 4,6 ----
  dat -a -k -t FONT data.dat data\bitmaps\font_*.*
  dat -a -k -t MAP  data.dat data\maps\*.map
+ dat -a -k -t SAMP data.dat data\samples\*.wav

[Moeng-cvs] BBRpg/data/bitmaps putdeksel.bmp,1.1,1.2 tiles_subcity.bmp,1.6,1.7

[<geo...@us...>]

Update of /cvsroot/moeng/BBRpg/data/bitmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv29030/bitmaps

Modified Files:
	putdeksel.bmp tiles_subcity.bmp 
Log Message:
- Little spellchecks and interaction with more objects.
- Added snow to the putdeksels

Index: putdeksel.bmp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/putdeksel.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvshjS2Tn and /tmp/cvskGgpCB differ

Index: tiles_subcity.bmp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/tiles_subcity.bmp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsOR1kHo and /tmp/cvsSeC7bG differ

[Moeng-cvs] BBRpg/data/scripts Crocodile.lua,1.10,1.10.2.1 Rat.lua,1.14,1.14.2.1 CaveObjects.lua,1.3,NONE Caveman.lua,1.3,NONE

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

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv5547/data/scripts

Modified Files:
      Tag: bbrpg
	Crocodile.lua Rat.lua 
Removed Files:
      Tag: bbrpg
	CaveObjects.lua Caveman.lua 
Log Message:
Removed lots of stuff, now in right branch (I hope)

Index: Crocodile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Crocodile.lua,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** Crocodile.lua	2 Jan 2004 07:06:44 -0000	1.10
--- Crocodile.lua	4 Jan 2004 20:00:26 -0000	1.10.2.1
***************
*** 4,9 ****
  -- Temporarily blindly copied from Hedde Bosman's rat by Georg Muntingh!
  
! import("Player.lua")
! import("AdvAIRandom")
  
  Crocodile = Enemy:subclass
--- 4,9 ----
  -- Temporarily blindly copied from Hedde Bosman's rat by Georg Muntingh!
  
! import("Enemy.lua")
! import("AdvAIRandom.lua")
  
  Crocodile = Enemy:subclass

Index: Rat.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Rat.lua,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** Rat.lua	2 Jan 2004 17:46:12 -0000	1.14
--- Rat.lua	4 Jan 2004 20:00:26 -0000	1.14.2.1
***************
*** 4,8 ****
  -- bodged by Hedde Bosman
  
! import("Player.lua")
  import("AdvAIRandom.lua")
  import("Shadow.lua")
--- 4,8 ----
  -- bodged by Hedde Bosman
  
! import("Enemy.lua")
  import("AdvAIRandom.lua")
  import("Shadow.lua")

--- CaveObjects.lua DELETED ---

--- Caveman.lua DELETED ---

[Moeng-cvs] BBRpg/data/maps cave1.map,1.1.1.1,NONE cave2.map,1.1.1.1,NONE cave3.map,1.1.1.1,NONE

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

Update of /cvsroot/moeng/BBRpg/data/maps
In directory sc8-pr-cvs1:/tmp/cvs-serv29339/data/maps

Removed Files:
	cave1.map cave2.map cave3.map 
Log Message:
Removed even more Cave Adventure stuff

--- cave1.map DELETED ---

--- cave2.map DELETED ---

--- cave3.map DELETED ---

[Moeng-cvs] BBRpg/data/bitmaps cave.bmp,1.2,1.3 cave.tga,1.2,1.3 cave_entrance.tga,1.2,1.3 cave_entrance2.tga,1.2,1.3 cave_roof.bmp,1.2,1.3 cave_title_1.bmp,1.2,1.3 cave_title_2.bmp,1.2,1.3 cave_title_3.bmp,1.2,1.3 cave_waterfall_exit.bmp,1.2,1.3 cavebridge1.bmp,1.2,1.3 cavebridge2.bmp,1.2,1.3 cavepick.bmp,1.2,1.3 cavepile.bmp,1.2,1.3

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

Update of /cvsroot/moeng/BBRpg/data/bitmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv397/bitmaps

Added Files:
	cave.bmp cave.tga cave_entrance.tga cave_entrance2.tga 
	cave_roof.bmp cave_title_1.bmp cave_title_2.bmp 
	cave_title_3.bmp cave_waterfall_exit.bmp cavebridge1.bmp 
	cavebridge2.bmp cavepick.bmp cavepile.bmp 
Log Message:
Putting back Cave Adventure stuff in main branch.

[Moeng-cvs] BBRpg TODO,1.36,1.36.2.1 rpg.cfg,1.6,1.6.2.1

[<geo...@us...>]

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

Modified Files:
      Tag: bbrpg
	TODO rpg.cfg 
Log Message:
- Added the right putdeksel and tiles_subcity


Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** TODO	2 Jan 2004 05:49:28 -0000	1.36
--- TODO	4 Jan 2004 19:38:10 -0000	1.36.2.1
***************
*** 10,14 ****
  - Animated tiles in the sewer
  - Fading music
- - Na samenbrengen brothers in huis nog opdracht met nitro/rope/skimask
  ? Hier en daar een plas op de weg, of smurrie
  
--- 10,13 ----
***************
*** 20,26 ****
  
  Frode:
- - Wachters in de gevangenis
- ? Sneeuw op de autos
  
  Hedde:
- - Sounds effects
--- 19,22 ----

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** rpg.cfg	3 Jan 2004 22:41:02 -0000	1.6
--- rpg.cfg	4 Jan 2004 19:38:10 -0000	1.6.2.1
***************
*** 7,11 ****
  [Video]
  Fullscreen=0
! DoubleSize=1
  VSync=0
  ResolutionWidth=320
--- 7,11 ----
  [Video]
  Fullscreen=0
! DoubleSize=0
  VSync=0
  ResolutionWidth=320
***************
*** 14,19 ****
  
  [Sound]
! EnableMusic=1
! EnableSfx=1
  MusicVolume=128
  SfxVolume=255
--- 14,19 ----
  
  [Sound]
! EnableMusic=0
! EnableSfx=0
  MusicVolume=128
  SfxVolume=255

[Moeng-cvs] BBRpg/data/bitmaps sewers_map.bmp,1.1,1.1.2.1 barrel2.bmp,1.1.1.1,NONE bielsen_tafel.bmp,1.1.1.1,NONE boss_1.bmp,1.1.1.1,NONE boss_2.bmp,1.1.1.1,NONE boss_a1.bmp,1.1.1.1,NONE boss_a2.bmp,1.1.1.1,NONE boss_a3.bmp,1.1.1.1,NONE boss_a4.bmp,1.1.1.1,NONE boss_dead.bmp,1.1.1.1,NONE boss_shadow.bmp,1.1.1.1,NONE boss_shadow.tga,1.1.1.1,NONE box1.bmp,1.1.1.1,NONE box2.bmp,1.1.1.1,NONE box3.bmp,1.1.1.1,NONE box4.bmp,1.1.1.1,NONE box5.bmp,1.1.1.1,NONE box6.bmp,1.1.1.1,NONE box7.bmp,1.1.1.1,NONE box8.bmp,1.1.1.1,NONE box9.bmp,1.1.1.1,NONE cds.tga,1.1.1.1,NONE fence_1.bmp,1.1.1.1,NONE fence_2.bmp,1.1.1.1,NONE fence_gc.bmp,1.1.1.1,NONE fence_go.bmp,1.1.1.1,NONE fence_l.bmp,1.1.1.1,NONE fence_r.bmp,1.1.1.1,NONE fontijn.tga,1.1.1.1,NONE frode.tga,1.1.1.1,NONE frode_dead.tga,1.1.1.1,NONE frode_hardeaanval.tga,1.1.1.1,NONE frode_sit.bmp,1.1.1.1,NONE frode_sit1.tga,1.1.1.1,NONE frode_sit2.tga,1.1.1.1,NONE gaashekje.bmp,1.1.1.1,NONE glas1.tga,1.1.1.1,NONE glas2.tga,1.1.1.1,NONE glas3.tga,1.1.1.1,NONE glas4.tga,1.1.1.1,NONE hek_buren.bmp,1.1.1.1,NONE hokje.bmp,1.1.1.1,NONE kruk.tga,1.1.1.1,NONE menu.bmp,1.1.1.1,NONE radio.bmp,1.1.1.1,NONE rubble_b.bmp,1.1.1.1,NONE rubble_t.bmp,1.1.1.1,NONE slave_dead.bmp,1.1.1.1,NONE sleepstuff1.bmp,1.1.1.1,NONE sleepstuff2.bmp,1.1.1.1,NONE spark_small.bmp,1.1.1.1,NONE spark_small.tga,1.1.1.1,NONE spider.bmp,1.1.1.1,NONE spider2.bmp,1.1.1.1,NONE spider2_dead.bmp,1.1.1.1,NONE spider3.bmp,1.1.1.1,NONE spider3_dead.bmp,1.1.1.1,NONE spider_dead.bmp,1.1.1.1,NONE spider_small.bmp,1.1.1.1,NONE spider_small_dead.bmp,1.1.1.1,NONE spit1.bmp,1.1.1.1,NONE spit2.bmp,1.1.1.1,NONE start.tga,1.1.1.1,NONE stoel1.tga,1.1.1.1,NONE stone1.tga,1.1.1.1,NONE stone2.tga,1.1.1.1,NONE stone3.tga,1.1.1.1,NONE stone4.tga,1.1.1.1,NONE torch1.bmp,1.1.1.1,NONE torch2.bmp,1.1.1.1,NONE torch3.bmp,1.1.1.1,NONE torch4.bmp,1.1.1.1,NONE torch5.bmp,1.1.1.1,NONE torch6.bmp,1.1.1.1,NONE verbanddoos.tga,1.1.1.1,NONE waterval.bmp,1.1.1.1,NONE web.tga,1.1.1.1,NONE web2.tga,1.1.1.1,NONE z.tga,1.1.1.1,NONE zaklamp.bmp,1.1.1.1,NONE

[<geo...@us...>]

Update of /cvsroot/moeng/BBRpg/data/bitmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv13201/data/bitmaps

Modified Files:
      Tag: bbrpg
	sewers_map.bmp 
Removed Files:
      Tag: bbrpg
	barrel2.bmp bielsen_tafel.bmp boss_1.bmp boss_2.bmp 
	boss_a1.bmp boss_a2.bmp boss_a3.bmp boss_a4.bmp boss_dead.bmp 
	boss_shadow.bmp boss_shadow.tga box1.bmp box2.bmp box3.bmp 
	box4.bmp box5.bmp box6.bmp box7.bmp box8.bmp box9.bmp cds.tga 
	fence_1.bmp fence_2.bmp fence_gc.bmp fence_go.bmp fence_l.bmp 
	fence_r.bmp fontijn.tga frode.tga frode_dead.tga 
	frode_hardeaanval.tga frode_sit.bmp frode_sit1.tga 
	frode_sit2.tga gaashekje.bmp glas1.tga glas2.tga glas3.tga 
	glas4.tga hek_buren.bmp hokje.bmp kruk.tga menu.bmp radio.bmp 
	rubble_b.bmp rubble_t.bmp slave_dead.bmp sleepstuff1.bmp 
	sleepstuff2.bmp spark_small.bmp spark_small.tga spider.bmp 
	spider2.bmp spider2_dead.bmp spider3.bmp spider3_dead.bmp 
	spider_dead.bmp spider_small.bmp spider_small_dead.bmp 
	spit1.bmp spit2.bmp start.tga stoel1.tga stone1.tga stone2.tga 
	stone3.tga stone4.tga torch1.bmp torch2.bmp torch3.bmp 
	torch4.bmp torch5.bmp torch6.bmp verbanddoos.tga waterval.bmp 
	web.tga web2.tga z.tga zaklamp.bmp 
Log Message:
Removed (almost) all non-blues brother content

Index: sewers_map.bmp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/sewers_map.bmp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsa8Sk3T and /tmp/cvs8gofLF differ

--- barrel2.bmp DELETED ---

--- bielsen_tafel.bmp DELETED ---

--- boss_1.bmp DELETED ---

--- boss_2.bmp DELETED ---

--- boss_a1.bmp DELETED ---

--- boss_a2.bmp DELETED ---

--- boss_a3.bmp DELETED ---

--- boss_a4.bmp DELETED ---

--- boss_dead.bmp DELETED ---

--- boss_shadow.bmp DELETED ---

--- boss_shadow.tga DELETED ---

--- box1.bmp DELETED ---

--- box2.bmp DELETED ---

--- box3.bmp DELETED ---

--- box4.bmp DELETED ---

--- box5.bmp DELETED ---

--- box6.bmp DELETED ---

--- box7.bmp DELETED ---

--- box8.bmp DELETED ---

--- box9.bmp DELETED ---

--- cds.tga DELETED ---

--- fence_1.bmp DELETED ---

--- fence_2.bmp DELETED ---

--- fence_gc.bmp DELETED ---

--- fence_go.bmp DELETED ---

--- fence_l.bmp DELETED ---

--- fence_r.bmp DELETED ---

--- fontijn.tga DELETED ---

--- frode.tga DELETED ---

--- frode_dead.tga DELETED ---

--- frode_hardeaanval.tga DELETED ---

--- frode_sit.bmp DELETED ---

--- frode_sit1.tga DELETED ---

--- frode_sit2.tga DELETED ---

--- gaashekje.bmp DELETED ---

--- glas1.tga DELETED ---

--- glas2.tga DELETED ---

--- glas3.tga DELETED ---

--- glas4.tga DELETED ---

--- hek_buren.bmp DELETED ---

--- hokje.bmp DELETED ---

--- kruk.tga DELETED ---

--- menu.bmp DELETED ---

--- radio.bmp DELETED ---

--- rubble_b.bmp DELETED ---

--- rubble_t.bmp DELETED ---

--- slave_dead.bmp DELETED ---

--- sleepstuff1.bmp DELETED ---

--- sleepstuff2.bmp DELETED ---

--- spark_small.bmp DELETED ---

--- spark_small.tga DELETED ---

--- spider.bmp DELETED ---

--- spider2.bmp DELETED ---

--- spider2_dead.bmp DELETED ---

--- spider3.bmp DELETED ---

--- spider3_dead.bmp DELETED ---

--- spider_dead.bmp DELETED ---

--- spider_small.bmp DELETED ---

--- spider_small_dead.bmp DELETED ---

--- spit1.bmp DELETED ---

--- spit2.bmp DELETED ---

--- start.tga DELETED ---

--- stoel1.tga DELETED ---

--- stone1.tga DELETED ---

--- stone2.tga DELETED ---

--- stone3.tga DELETED ---

--- stone4.tga DELETED ---

--- torch1.bmp DELETED ---

--- torch2.bmp DELETED ---

--- torch3.bmp DELETED ---

--- torch4.bmp DELETED ---

--- torch5.bmp DELETED ---

--- torch6.bmp DELETED ---

--- verbanddoos.tga DELETED ---

--- waterval.bmp DELETED ---

--- web.tga DELETED ---

--- web2.tga DELETED ---

--- z.tga DELETED ---

--- zaklamp.bmp DELETED ---

[Moeng-cvs] BBRpg/data/scripts Effects.lua,1.1.1.1,1.1.1.1.2.1 Player.lua,1.11,1.11.2.1 Boss.lua,1.1.1.1,NONE Cave1.lua,1.1.1.1,NONE Cave2.lua,1.1.1.1,NONE Cave3.lua,1.1.1.1,NONE CaveAdventure.lua,1.3,NONE CaveLang.lua,1.3,NONE CaveTriggers.lua,1.1.1.1,NONE DgeMapSwitches.lua,1.1.1.1,NONE EnemySpider.lua,1.2,NONE Fence.lua,1.1.1.1,NONE Radio.lua,1.4,NONE Spring.lua,1.2,NONE Torch.lua,1.2,NONE Z.lua,1.1.1.1,NONE

[<geo...@us...>]

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv13201/data/scripts

Modified Files:
      Tag: bbrpg
	Effects.lua Player.lua 
Removed Files:
      Tag: bbrpg
	Boss.lua Cave1.lua Cave2.lua Cave3.lua CaveAdventure.lua 
	CaveLang.lua CaveTriggers.lua DgeMapSwitches.lua 
	EnemySpider.lua Fence.lua Radio.lua Spring.lua Torch.lua Z.lua 
Log Message:
Removed (almost) all non-blues brother content

Index: Effects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Effects.lua,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** Effects.lua	7 Dec 2003 02:17:18 -0000	1.1.1.1
--- Effects.lua	4 Jan 2004 20:35:25 -0000	1.1.1.1.2.1
***************
*** 78,82 ****
  --
  
! PoisonProjectile = Actor:subclass
  {
  	name = "PoisonProjectile";
--- 78,82 ----
  --
  
! --[[PoisonProjectile = Actor:subclass
  {
  	name = "PoisonProjectile";
***************
*** 95,96 ****
--- 95,97 ----
  	};
  }
+ ]]
\ No newline at end of file

Index: Player.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Player.lua,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** Player.lua	2 Jan 2004 02:49:56 -0000	1.11
--- Player.lua	4 Jan 2004 20:35:25 -0000	1.11.2.1
***************
*** 140,144 ****
  		travel = 1,               -- Player can travel to other maps
  
! 		charAnim = extr_char_anim(m_get_bitmap("frode.tga")),
  	};
  }
--- 140,144 ----
  		travel = 1,               -- Player can travel to other maps
  
! 		charAnim = extr_char_anim(m_get_bitmap("brian.bmp")),
  	};
  }

--- Boss.lua DELETED ---

--- Cave1.lua DELETED ---

--- Cave2.lua DELETED ---

--- Cave3.lua DELETED ---

--- CaveAdventure.lua DELETED ---

--- CaveLang.lua DELETED ---

--- CaveTriggers.lua DELETED ---

--- DgeMapSwitches.lua DELETED ---

--- EnemySpider.lua DELETED ---

--- Fence.lua DELETED ---

--- Radio.lua DELETED ---

--- Spring.lua DELETED ---

--- Torch.lua DELETED ---

--- Z.lua DELETED ---

[Moeng-cvs] BBRpg/data/bitmaps cave.bmp,1.1.1.1,NONE cave.tga,1.1.1.1,NONE cave_entrance.tga,1.1.1.1,NONE cave_entrance2.tga,1.1.1.1,NONE cave_roof.bmp,1.1.1.1,NONE cave_title_1.bmp,1.1.1.1,NONE cave_title_2.bmp,1.1.1.1,NONE cave_title_3.bmp,1.1.1.1,NONE cave_waterfall_exit.bmp,1.1.1.1,NONE cavebridge1.bmp,1.1.1.1,NONE cavebridge2.bmp,1.1.1.1,NONE caveman.bmp,1.1.1.1,NONE caveman_dead.bmp,1.1.1.1,NONE caveman_slave.bmp,1.1.1.1,NONE cavepick.bmp,1.1.1.1,NONE cavepile.bmp,1.1.1.1,NONE

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

Update of /cvsroot/moeng/BBRpg/data/bitmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv5547/data/bitmaps

Removed Files:
      Tag: bbrpg
	cave.bmp cave.tga cave_entrance.tga cave_entrance2.tga 
	cave_roof.bmp cave_title_1.bmp cave_title_2.bmp 
	cave_title_3.bmp cave_waterfall_exit.bmp cavebridge1.bmp 
	cavebridge2.bmp caveman.bmp caveman_dead.bmp caveman_slave.bmp 
	cavepick.bmp cavepile.bmp 
Log Message:
Removed lots of stuff, now in right branch (I hope)

--- cave.bmp DELETED ---

--- cave.tga DELETED ---

--- cave_entrance.tga DELETED ---

--- cave_entrance2.tga DELETED ---

--- cave_roof.bmp DELETED ---

--- cave_title_1.bmp DELETED ---

--- cave_title_2.bmp DELETED ---

--- cave_title_3.bmp DELETED ---

--- cave_waterfall_exit.bmp DELETED ---

--- cavebridge1.bmp DELETED ---

--- cavebridge2.bmp DELETED ---

--- caveman.bmp DELETED ---

--- caveman_dead.bmp DELETED ---

--- caveman_slave.bmp DELETED ---

--- cavepick.bmp DELETED ---

--- cavepile.bmp DELETED ---

[Moeng-cvs] BBRpg/data/maps cave1.map,1.1.1.1,NONE cave2.map,1.1.1.1,NONE cave3.map,1.1.1.1,NONE

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

Update of /cvsroot/moeng/BBRpg/data/maps
In directory sc8-pr-cvs1:/tmp/cvs-serv5547/data/maps

Removed Files:
      Tag: bbrpg
	cave1.map cave2.map cave3.map 
Log Message:
Removed lots of stuff, now in right branch (I hope)

--- cave1.map DELETED ---

--- cave2.map DELETED ---

--- cave3.map DELETED ---

[Moeng-cvs] BBRpg README.CaveAdventure,1.1,NONE

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

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

Removed Files:
      Tag: bbrpg
	README.CaveAdventure 
Log Message:
We don't need this file for BBRpg.

--- README.CaveAdventure DELETED ---