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

[Moeng-cvs] CaveAdventure/src/shared - New directory

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

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

Log Message:
Directory /cvsroot/moeng/CaveAdventure/src/shared added to the repository

[Moeng-cvs] CaveAdventure/src/editor - New directory

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

Update of /cvsroot/moeng/CaveAdventure/src/editor
In directory sc8-pr-cvs1:/tmp/cvs-serv30740/editor

Log Message:
Directory /cvsroot/moeng/CaveAdventure/src/editor added to the repository

[Moeng-cvs] BBRpg/data/samples Huh.wav,NONE,1.1 Hum.wav,NONE,1.1 Oei.wav,NONE,1.1

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

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

Added Files:
	Huh.wav Hum.wav Oei.wav 
Log Message:
Some more funny sounds, not used yet.

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

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

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

[Moeng-cvs] BBRpg TODO,1.37,1.38

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

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** TODO	13 Jan 2004 16:32:34 -0000	1.37
--- TODO	13 Jan 2004 16:46:37 -0000	1.38
***************
*** 9,15 ****
  - Experience fijn tunen
  - Animated tiles in the sewer
- ? Hier en daar een plas op de weg, of smurrie
  
  Bjorn:
  - Experience/levelup weergeven
  ? Fix brother still lying in bed when he slept
--- 9,16 ----
  - Experience fijn tunen
  - Animated tiles in the sewer
  
  Bjorn:
+ ! Ability to quick-forward conversations
+ - Investigate safe-file possibility
  - Experience/levelup weergeven
  ? Fix brother still lying in bed when he slept

[Moeng-cvs] BBRpg/data/music cells.mid,1.1,1.2 city.mid,1.1,1.2 enddemo.mid,1.1,1.2 intro.mid,1.1,1.2 mainmenu.mid,1.1,1.2 sewers.mid,1.1,1.2

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

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

Added Files:
	cells.mid city.mid enddemo.mid intro.mid mainmenu.mid 
	sewers.mid 
Log Message:
Merged bbrpg branch.

[Moeng-cvs] BBRpg/data/bitmaps sewers_map.bmp,1.1,1.2 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 caveman.bmp,1.1.1.1,NONE caveman_dead.bmp,1.1.1.1,NONE caveman_slave.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

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

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

Modified Files:
	sewers_map.bmp 
Removed Files:
	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 
	caveman.bmp caveman_dead.bmp caveman_slave.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:
Merged bbrpg branch.

Index: sewers_map.bmp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/sewers_map.bmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs5LMT58 and /tmp/cvsudIrb6 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 ---

--- caveman.bmp DELETED ---

--- caveman_dead.bmp DELETED ---

--- caveman_slave.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/maps city1.map,1.12,1.13

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

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

Modified Files:
	city1.map 
Log Message:
Merged bbrpg branch.

Index: city1.map
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/maps/city1.map,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
Binary files /tmp/cvsGcwwJk and /tmp/cvs1OrSgm differ

[Moeng-cvs] BBRpg Makefile.in,1.6,1.7 README,1.6,1.7 TODO,1.36,1.37 configure,1.11,1.12 rpg.cfg,1.6,1.7

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

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

Modified Files:
	Makefile.in README TODO configure rpg.cfg 
Log Message:
Merged bbrpg branch.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/moeng/BBRpg/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	2 Jan 2004 01:00:05 -0000	1.6
--- Makefile.in	13 Jan 2004 16:32:34 -0000	1.7
***************
*** 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: README
===================================================================
RCS file: /cvsroot/moeng/BBRpg/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README	4 Jan 2004 00:43:08 -0000	1.6
--- README	13 Jan 2004 16:32:34 -0000	1.7
***************
*** 64,69 ****
  - Allows use of multiple tile bitmaps per map, and the other way around
  
! All the game content except for the music is released as GPL too. Feel free to
! use it in your own game as long as you GPL any added graphics.
  
  
--- 64,69 ----
  - Allows use of multiple tile bitmaps per map, and the other way around
  
! All the game content is released as GPL too. Feel free to use it in your own
! game as long as you GPL anything you add to it as well.
  
  

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** TODO	2 Jan 2004 05:49:28 -0000	1.36
--- TODO	13 Jan 2004 16:32:34 -0000	1.37
***************
*** 9,18 ****
  - Experience fijn tunen
  - 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
  
  Bjorn:
! ! Experience/levelup afmaken
  
  Georg:
--- 9,17 ----
  - Experience fijn tunen
  - Animated tiles in the sewer
  ? Hier en daar een plas op de weg, of smurrie
  
  Bjorn:
! - Experience/levelup weergeven
! ? Fix brother still lying in bed when he slept
  
  Georg:
***************
*** 20,26 ****
  
  Frode:
- - Wachters in de gevangenis
- ? Sneeuw op de autos
  
  Hedde:
- - Sounds effects
--- 19,22 ----

Index: configure
===================================================================
RCS file: /cvsroot/moeng/BBRpg/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure	4 Jan 2004 13:52:13 -0000	1.11
--- configure	13 Jan 2004 16:32:34 -0000	1.12
***************
*** 170,173 ****
--- 170,174 ----
      echo "*** Compiling of lua program failed"
      echo "*** Please install lua. http://www.lua.org"
+     exit 1
  fi
  rm -f conftest*

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rpg.cfg	3 Jan 2004 22:41:02 -0000	1.6
--- rpg.cfg	13 Jan 2004 16:32:34 -0000	1.7
***************
*** 4,7 ****
--- 4,8 ----
  GameClass=BBRpg
  GameSpeed=100
+ LogEnabled=0
  
  [Video]
***************
*** 14,19 ****
  
  [Sound]
! EnableMusic=1
! EnableSfx=1
  MusicVolume=128
  SfxVolume=255
--- 15,21 ----
  
  [Sound]
! MusicEnabled=1
! MusicFormat=MIDI
  MusicVolume=128
+ SfxEnabled=1
  SfxVolume=255

[Moeng-cvs] BBRpg/data/scripts AdvAIRandom.lua,1.6,1.7 BBRpg.lua,1.26,1.27 BBRpgLang.lua,1.31,1.32 BBRpgLangDutch.lua,1.6,1.7 Cells.lua,1.15,1.16 CellsObjects.lua,1.17,1.18 City.lua,1.18,1.19 ConversationWindow.lua,1.3,1.4 Crocodile.lua,1.10,1.11 Effects.lua,1.1.1.1,1.2 ElecDoor.lua,1.8,1.9 EnemyGuard.lua,1.7,1.8 JakesPlace.lua,1.5,1.6 Junk.lua,1.3,1.4 LeesPlace.lua,1.3,1.4 MainMenu.lua,1.33,1.34 MessPile.lua,1.9,1.10 Pawn.lua,1.10,1.11 Player.lua,1.11,1.12 Punk.lua,1.4,1.5 Rat.lua,1.14,1.15 RestPlace.lua,1.4,1.5 Sewers.lua,1.16,1.17 SubcityObjects.lua,1.38,1.39 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 Caveman.lua,1.3,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

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

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

Modified Files:
	AdvAIRandom.lua BBRpg.lua BBRpgLang.lua BBRpgLangDutch.lua 
	Cells.lua CellsObjects.lua City.lua ConversationWindow.lua 
	Crocodile.lua Effects.lua ElecDoor.lua EnemyGuard.lua 
	JakesPlace.lua Junk.lua LeesPlace.lua MainMenu.lua 
	MessPile.lua Pawn.lua Player.lua Punk.lua Rat.lua 
	RestPlace.lua Sewers.lua SubcityObjects.lua 
Removed Files:
	Boss.lua Cave1.lua Cave2.lua Cave3.lua CaveAdventure.lua 
	CaveLang.lua CaveTriggers.lua Caveman.lua DgeMapSwitches.lua 
	EnemySpider.lua Fence.lua Radio.lua Spring.lua Torch.lua Z.lua 
Log Message:
Merged bbrpg branch.

Index: AdvAIRandom.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/AdvAIRandom.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AdvAIRandom.lua	1 Jan 2004 22:39:55 -0000	1.6
--- AdvAIRandom.lua	13 Jan 2004 16:32:35 -0000	1.7
***************
*** 42,47 ****
  	end;
  	notifyWalkFinished = function(self)
!                 if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! 		        -- Reached his goal, pause and choose new goal.
  			if (self.target or self.scaring) then
  				-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
--- 42,47 ----
  	end;
  	notifyWalkFinished = function(self)
! 		if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! 			-- Reached his goal, pause and choose new goal.
  			if (self.target or self.scaring) then
  				-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
***************
*** 93,96 ****
--- 93,97 ----
  	tick = function(self)
  		if (self.pawn.bDead) then return end
+ 		if (self.target and self.target.bDead) then self.target = nil end
  
  		if (self.pawn.charging > 0) then self.pawn.charging = self.pawn.charging - 1 end

Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** BBRpg.lua	4 Jan 2004 00:43:11 -0000	1.26
--- BBRpg.lua	13 Jan 2004 16:32:35 -0000	1.27
***************
*** 63,75 ****
  
  		-- 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)
  
--- 63,75 ----
  
  		-- 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)
  
***************
*** 77,81 ****
  		self.hud:setPlayerSwitcher(self.playerSwitcher)
  
- 
  		-- Show startup screen
  		show_main_menu = 1
--- 77,80 ----
***************
*** 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),
--- 87,91 ----
  		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: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** BBRpgLang.lua	4 Jan 2004 19:13:30 -0000	1.31
--- BBRpgLang.lua	13 Jan 2004 16:32:35 -0000	1.32
***************
*** 213,217 ****
  			{"Jake", "Good plan."},
  			{"Elw00t", "Why don't the three of us start a band?"},
! 		},		
  		WallAndTubeElwood = {
  			{"{PLAYER}", "I can't get in the tube. It's to damn small!"},
--- 213,220 ----
  			{"Jake", "Good plan."},
  			{"Elw00t", "Why don't the three of us start a band?"},
! 		},
! 		NotYetFightGuards = {
! 			{"{PLAYER}","There are guards inside. Before I come back here, I'd better make sure I'm strong enough to defeat them."},
! 		},
  		WallAndTubeElwood = {
  			{"{PLAYER}", "I can't get in the tube. It's to damn small!"},
***************
*** 290,293 ****
--- 293,302 ----
  			{"{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."},
+ 		},
+ 		LeaveTown = {
+ 			{"{PLAYER}", "There is no point in leaving the town."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BBRpgLangDutch.lua	4 Jan 2004 19:13:30 -0000	1.6
--- BBRpgLangDutch.lua	13 Jan 2004 16:32:35 -0000	1.7
***************
*** 74,82 ****
  			{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
  			{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! 			{"Jake", "Goed, onze broer Brian, ook wel bekend als The Brain, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
  			{"Elwood", "Een op 100? That is nog behoorlijk groot."},
  			{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
  			{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! 			{"Jake", "Kijk, Brian, alias The Brain, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
  			{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
  			{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
--- 74,82 ----
  			{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
  			{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! 			{"Jake", "Goed, onze broer Brian, ook wel bekend als Het Brein, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
  			{"Elwood", "Een op 100? That is nog behoorlijk groot."},
  			{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
  			{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! 			{"Jake", "Kijk, Brian, alias Het Brein, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
  			{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
  			{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
***************
*** 173,177 ****
  			{"Elwood", "Ach natuurlijk, Lee!"},
  			{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! 			{"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstop in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
  			{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
  			{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
--- 173,177 ----
  			{"Elwood", "Ach natuurlijk, Lee!"},
  			{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! 			{"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstopt in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
  			{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
  			{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
***************
*** 188,192 ****
  			{"Elwood", "Dit is Lee?"},
  			{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! 			{"Lee", "Inderdaad, ik ben degene die Lee genoemd wordt."},
  			{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
  		},
--- 188,192 ----
  			{"Elwood", "Dit is Lee?"},
  			{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! 			{"Lee", "Juist, ik ben degene die Lee genoemd wordt."},
  			{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
  		},
***************
*** 202,205 ****
--- 202,208 ----
  			{"Elw00t", "Waarom beginnen we niet met zijn drieen een band?"},
  		},		
+ 		NotYetFightGuards = {
+ 			{"{PLAYER}","Daar binnen zitten gevangenisbewaarders. Voordat ik hier terugkom kan ik maar beter zorgen dat ik sterk genoeg ben om ze te verslaan."},
+ 		},
  		WallAndTubeElwood = {
  			{"{PLAYER}", "Ik pas niet in deze buis. Hij is veel te smal!"},
***************
*** 226,230 ****
  			{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
  			{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! 			{"Jake", "Ja, zo mag ik het horen. Laten we Brian the Brain bevrijden!"},
  		},
  		JakesDoorLocked = {
--- 229,233 ----
  			{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
  			{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! 			{"Jake", "Ja, zo mag ik het horen. Laten we Brian het Brein bevrijden!"},
  		},
  		JakesDoorLocked = {
***************
*** 279,282 ****
--- 282,291 ----
  			{"{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."},
+ 		},
+ 		LeaveTown = {
+ 			{"{PLAYER}", "Het heeft geen zin om de stad te verlaten."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: Cells.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Cells.lua	2 Jan 2004 23:06:55 -0000	1.15
--- Cells.lua	13 Jan 2004 16:32:35 -0000	1.16
***************
*** 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: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CellsObjects.lua	3 Jan 2004 22:41:02 -0000	1.17
--- CellsObjects.lua	13 Jan 2004 16:32:35 -0000	1.18
***************
*** 204,208 ****
  		w = 1,
  		offset_x = 0,
! 		offset_y = 0,
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("sewagedrain.bmp"),		
--- 204,209 ----
  		w = 1,
  		offset_x = 0,
! 		offset_y = -24,
! 		offset_z = -24,
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("sewagedrain.bmp"),		
***************
*** 350,356 ****
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionSetVariable(jake, "bSleeping", false),
! 					ActionSetVariable(elwood, "bSleeping", false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
--- 351,357 ----
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
! 					ActionCallFunction(jake.setSleeping, jake, false),
! 					ActionCallFunction(elwood.setSleeping, elwood, false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
***************
*** 377,383 ****
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionSetVariable(jake, "bSleeping", false),
! 					ActionSetVariable(elwood, "bSleeping", false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
--- 378,384 ----
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
! 					ActionCallFunction(jake.setSleeping, jake, false),
! 					ActionCallFunction(elwood.setSleeping, elwood, false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),

Index: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** City.lua	2 Jan 2004 23:06:55 -0000	1.18
--- City.lua	13 Jan 2004 16:32:35 -0000	1.19
***************
*** 10,13 ****
--- 10,15 ----
  
  	init = function(self)
+ 		local obj;
+ 
  		Map.init(self, "data/maps/city1.map")
  
***************
*** 18,25 ****
  		self:spawn(KeyFob, 66, 42)		
  
! 		-- No go areas.
  		self:spawn(TooDangerous,  63, 80)
  		self:spawn(TooDangerous2, 93, 36)
! 		
  		-- Litter the city with stuff
  
--- 20,30 ----
  		self:spawn(KeyFob, 66, 42)		
  
! 		-- No go areas
  		self:spawn(TooDangerous,  63, 80)
  		self:spawn(TooDangerous2, 93, 36)
! 		obj = self:spawn(LeaveTown,  52, 113); obj.w = 6; obj.walkBack = "U1"
! 		obj = self:spawn(LeaveTown,  18,  17); obj.h = 7; obj.walkBack = "R1"
! 		obj = self:spawn(LeaveTown, 121,  17); obj.h = 7; obj.walkBack = "L1"
! 
  		-- Litter the city with stuff
  
***************
*** 82,86 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("suburbs.tga"),
! 		musicFilename = "data/music/4.ogg",
  	}
  }
--- 87,91 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("suburbs.tga"),
! 		musicFilename = "data/music/city.ogg",
  	}
  }

Index: ConversationWindow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ConversationWindow.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConversationWindow.lua	25 Dec 2003 20:50:41 -0000	1.3
--- ConversationWindow.lua	13 Jan 2004 16:32:35 -0000	1.4
***************
*** 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: Crocodile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Crocodile.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Crocodile.lua	2 Jan 2004 07:06:44 -0000	1.10
--- Crocodile.lua	13 Jan 2004 16:32:35 -0000	1.11
***************
*** 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: Effects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Effects.lua,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Effects.lua	7 Dec 2003 02:17:18 -0000	1.1.1.1
--- Effects.lua	13 Jan 2004 16:32:35 -0000	1.2
***************
*** 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: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ElecDoor.lua	2 Jan 2004 04:31:18 -0000	1.8
--- ElecDoor.lua	13 Jan 2004 16:32:35 -0000	1.9
***************
*** 95,104 ****
  	
  	activatedBy = function(self, obj)
! 		if self.isLocked2 then
! 			ActionController:addSequence{
! 				ActionConversation(lang:getConv("PrisonDoorLocked")),
! 			}
! 		else
! 			ElecDoor.activatedBy(self, obj)
  		end
  	end;
--- 95,106 ----
  	
  	activatedBy = function(self, obj)
! 		if (self.firstime == 2) then
! 			if self.isLocked2 then
! 				ActionController:addSequence{
! 					ActionConversation(lang:getConv("PrisonDoorLocked")),
! 				}
! 			else
! 				ElecDoor.activatedBy(self, obj)
! 			end
  		end
  	end;
***************
*** 109,117 ****
  
  	event_bumped_into = function(self, obj)
! 		if (not self.isLocked2) then
  			ElecDoor.event_bumped_into(self, obj)
  		end
  
! 		if (self.firstTime) then
  			ActionController:addSequence{
  				ActionExModeOn(),
--- 111,128 ----
  
  	event_bumped_into = function(self, obj)
! 		if (not (self.firstTime == 0) and not self.isLocked2) then
  			ElecDoor.event_bumped_into(self, obj)
  		end
  
! 		if (self.firstTime == 0) then
! 			ActionController:addSequence{
! 					ActionSequence{
! 						ActionExModeOn(),
! 						ActionConversation(lang:getConv("NotYetFightGuards")),
! 						ActionExModeOff(),
! 					},
! 			};
! 			self.firstTime = 1
! 		elseif (self.firstTime == 1) then
  			ActionController:addSequence{
  				ActionExModeOn(),
***************
*** 137,146 ****
  			};
  
! 			self.firstTime = false
  		end
  	end;
  	
  	defaultproperties = {
! 		firstTime = true,
  		bCenterOnTile = false,
  		bCenterBitmap = false,
--- 148,157 ----
  			};
  
! 			self.firstTime = 2
  		end
  	end;
  	
  	defaultproperties = {
! 		firstTime = 0,
  		bCenterOnTile = false,
  		bCenterBitmap = false,

Index: EnemyGuard.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/EnemyGuard.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EnemyGuard.lua	2 Jan 2004 08:05:43 -0000	1.7
--- EnemyGuard.lua	13 Jan 2004 16:32:35 -0000	1.8
***************
*** 17,22 ****
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 5,
! 		maxHealth = 70,
  
  		bDead = false,
--- 17,22 ----
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 4,
! 		maxHealth = 50,
  
  		bDead = false,
***************
*** 42,47 ****
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 5,
! 		maxHealth = 70,
  
  		bDead = false,
--- 42,47 ----
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 4,
! 		maxHealth = 50,
  
  		bDead = false,

Index: JakesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/JakesPlace.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JakesPlace.lua	3 Jan 2004 00:16:32 -0000	1.5
--- JakesPlace.lua	13 Jan 2004 16:32:35 -0000	1.6
***************
*** 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: Junk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Junk.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Junk.lua	2 Jan 2004 17:46:12 -0000	1.3
--- Junk.lua	13 Jan 2004 16:32:35 -0000	1.4
***************
*** 8,12 ****
  
  	defaultproperties = {
! 		speed = 2,
  		experience = 40,
  		draw_mode = DM_MASKED,
--- 8,13 ----
  
  	defaultproperties = {
! 		speed = 2,
! 		maxHealth = 130,
  		experience = 40,
  		draw_mode = DM_MASKED,

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

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** MainMenu.lua	4 Jan 2004 00:55:48 -0000	1.33
--- MainMenu.lua	13 Jan 2004 16:32:35 -0000	1.34
***************
*** 20,28 ****
--- 20,32 ----
  			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),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
+ --			ActionSetPosition(elwood, 37, 12, DIR_UP, cityMap),
+ --			ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
+ 			ActionSetPosition(copcar, 88, 77),
  			ActionPlaySong(cityMap.musicFilename, 100),
  			ActionFadeInMap(100),
***************
*** 34,40 ****
  			ActionFadeOutMap(50),
  			ActionWait(50),
- 			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")),
--- 38,43 ----
  			ActionFadeOutMap(50),
  			ActionWait(50),
  			ActionSetVariable(_G, "show_main_menu", nil),
! 			ActionPlaySong("data/music/intro.ogg", 100),
  			ActionFadeInMap(100),
  			ActionShowMapName(m_get_bitmap("prison.tga")),
***************
*** 81,84 ****
--- 84,89 ----
  			ActionWalkPath(elwood, "D"),
  			ActionSetVariable(elwood, "dir", DIR_LEFT),
+ 			ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, jake),
+ 			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionConversation(lang:getConv("Intro5")),
  			ActionAddSequence{

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MessPile.lua	4 Jan 2004 00:43:14 -0000	1.9
--- MessPile.lua	13 Jan 2004 16:32:35 -0000	1.10
***************
*** 9,13 ****
  	defaultproperties = {
  		offset_x = -6,
! 		offset_y = 6,
  		w = 2,
  		h = 2,
--- 9,13 ----
  	defaultproperties = {
  		offset_x = -6,
! 		offset_y = 4,
  		w = 2,
  		h = 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(),
***************
*** 39,45 ****
  				ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
  				ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! 				ActionSetVariable(jake, "bSleeping", false),
! 				ActionSetVariable(elwood, "bSleeping", false),
! 				ActionSetVariable(brian, "bSleeping", false),
  				ActionFadeInMap(100),
  				ActionShowMapName(m_get_bitmap("leesplace.tga")),
--- 46,52 ----
  				ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
  				ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! 				ActionCallFunction(jake.setSleeping, jake, false),
! 				ActionCallFunction(elwood.setSleeping, elwood, false),
! 				ActionCallFunction(brian.setSleeping, brian, false),
  				ActionFadeInMap(100),
  				ActionShowMapName(m_get_bitmap("leesplace.tga")),
***************
*** 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
--- 61,65 ----
  				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
  				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/enddemo.ogg", 10),
  			}
  		else

Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Pawn.lua	3 Jan 2004 21:56:19 -0000	1.10
--- Pawn.lua	13 Jan 2004 16:32:35 -0000	1.11
***************
*** 105,108 ****
--- 105,127 ----
  	end;
  
+ 	setSleeping = function(self, sleeping)
+ 		self.bSleeping = sleeping
+ 		if (self.bSleeping) then
+ 			self.shadow.bitmap = nil
+ 			self.alpha = 0
+ 			self.prevBitmap = self.bitmap
+ 			self.bitmap = nil
+ 			self.obstacle = 0
+ 		else
+ 			self.shadow.bitmap = self.shadow.defaultproperties.bitmap
+ 			self.alpha = 255
+ 			if (self.prevBitmap) then
+ 				self.bitmap = self.prevBitmap
+ 				self.prevBitmap = nil
+ 			end
+ 			self.obstacle = 1
+ 		end
+ 	end;
+ 
  
  	attack = function(self)

Index: Player.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Player.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Player.lua	2 Jan 2004 02:49:56 -0000	1.11
--- Player.lua	13 Jan 2004 16:32:35 -0000	1.12
***************
*** 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")),
  	};
  }

Index: Punk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Punk.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Punk.lua	2 Jan 2004 17:46:12 -0000	1.4
--- Punk.lua	13 Jan 2004 16:32:35 -0000	1.5
***************
*** 8,12 ****
  
  	defaultproperties = {
! 		speed = 2.5,
  		experience = 50,
  		draw_mode = DM_MASKED,
--- 8,13 ----
  
  	defaultproperties = {
! 		speed = 2.5,
! 		maxHealth = 160,
  		experience = 50,
  		draw_mode = DM_MASKED,

Index: Rat.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Rat.lua,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Rat.lua	2 Jan 2004 17:46:12 -0000	1.14
--- Rat.lua	13 Jan 2004 16:32:35 -0000	1.15
***************
*** 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")

Index: RestPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/RestPlace.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RestPlace.lua	3 Jan 2004 18:50:44 -0000	1.4
--- RestPlace.lua	13 Jan 2004 16:32:35 -0000	1.5
***************
*** 27,31 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("restplace.tga"),
! 		musicFilename = "data/music/4.ogg",
  	}
  }
--- 27,31 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("restplace.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.17
diff -C2 -d -r1.16 -r1.17
*** Sewers.lua	2 Jan 2004 23:06:55 -0000	1.16
--- Sewers.lua	13 Jan 2004 16:32:35 -0000	1.17
***************
*** 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",
  	}
  }

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** SubcityObjects.lua	4 Jan 2004 19:13:30 -0000	1.38
--- SubcityObjects.lua	13 Jan 2004 16:32:35 -0000	1.39
***************
*** 178,182 ****
  	activatedBy = function(self, obj)
  		local bitmapje = self.bitmap
- 		local schaduwtje = obj.shadow.bitmap
  	
  		if (obj.health == obj.maxHealth) then
--- 178,181 ----
***************
*** 188,206 ****
  				ActionSetVariable(self, "bOccupied", true),
  				ActionConversation(lang:getConv("BedTiredBefore")),
! 				ActionSetVariable(obj, "bSleeping", true),
  				ActionChangeBitmap(self, obj.sleepBitmap),
- 				ActionChangeBitmap(obj.shadow, nil),
- 				ActionSetVariable(obj, "alpha", 0),
- 				ActionSetVariable(obj, "bitmap"),
- 				ActionSetVariable(obj, "obstacle", 0),
  				ActionSetVariable(obj, "onActivate",
  					function(self2)
- 						self2.bSleeping = false
  						self2.onActivate = nil
  						ActionController:addSequence{
! 							ActionSetVariable(obj, "alpha", 255),
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
- 							ActionChangeBitmap(obj.shadow, schaduwtje),
  							ActionConversation(lang:getConv("BedTiredAfter")),
  							ActionSetVariable(obj, "obstacle", 1),
--- 187,199 ----
  				ActionSetVariable(self, "bOccupied", true),
  				ActionConversation(lang:getConv("BedTiredBefore")),
! 				ActionCallFunction(obj.setSleeping, obj, true),
  				ActionChangeBitmap(self, obj.sleepBitmap),
  				ActionSetVariable(obj, "onActivate",
  					function(self2)
  						self2.onActivate = nil
  						ActionController:addSequence{
! 							ActionCallFunction(obj.setSleeping, obj, false),
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
  							ActionConversation(lang:getConv("BedTiredAfter")),
  							ActionSetVariable(obj, "obstacle", 1),
***************
*** 733,736 ****
--- 726,753 ----
  }
  
+ LeaveTown = Actor:subclass
+ {
+ 	name = "LeaveTown";
+ 
+ 	event_stand_on = function(self, obj)
+ 		if ((obj == brian) or (obj == elwood) or (obj == jake)) then
+ 			ActionController:addSequence{
+ 				ActionExModeOn(),	
+ 				ActionConversation(lang:getConv("LeaveTown")),
+ 				ActionWalkPath(obj, self.walkBack),
+ 				ActionExModeOff(),
+ 			}
+ 		end
+ 	end;
+ 
+ 	defaultproperties = {
+ 		bCanActivate = true,
+ 		walkBack = "R1",
+ 		obstacle = 0,
+ 		w = 1,
+ 		h = 1,
+ 	}
+ }
+ 
  WalkieTalkie = Actor:subclass
  {

--- Boss.lua DELETED ---

--- Cave1.lua DELETED ---

--- Cave2.lua DELETED ---

--- Cave3.lua DELETED ---

--- CaveAdventure.lua DELETED ---

--- CaveLang.lua DELETED ---

--- CaveTriggers.lua DELETED ---

--- Caveman.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/src rpg.cpp,1.8,1.9 script.cpp,1.13,1.14 sound.cpp,1.8,1.9 sound.h,1.6,1.7

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

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

Modified Files:
	rpg.cpp script.cpp sound.cpp sound.h 
Log Message:
Merged bbrpg branch.

Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rpg.cpp	3 Jan 2004 22:41:02 -0000	1.8
--- rpg.cpp	13 Jan 2004 16:32:35 -0000	1.9
***************
*** 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,117 ----
  	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;
+ 	console.enableLogfile = (get_config_int("Engine", "LogEnabled", 1));
  
  	// Screen initialisation
***************
*** 170,177 ****
  	}
  
- 	// 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...");
--- 172,175 ----
***************
*** 179,182 ****
--- 177,184 ----
  	}
  
+ 	// Lua initialisation
+ 	console.log(CON_LOG, CON_ALWAYS, "Initialising Lua scripting environment...");
+ 	initScripting();
+ 
  	console.log(CON_LOG, CON_ALWAYS, "Installing timers...");
  	LOCK_VARIABLE(frames_to_do);			// Game speed handler

Index: script.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/script.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** script.cpp	3 Jan 2004 21:56:19 -0000	1.13
--- script.cpp	13 Jan 2004 16:32:35 -0000	1.14
***************
*** 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
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sound.cpp	3 Jan 2004 22:41:02 -0000	1.8
--- sound.cpp	13 Jan 2004 16:32:35 -0000	1.9
***************
*** 28,34 ****
  int sfx_vol = 255;
  int music_vol = 255;
  
  
- #ifdef ENABLE_MUSIC
  // Currently playing OGG file
  struct {
--- 28,34 ----
  int sfx_vol = 255;
  int music_vol = 255;
+ int music_format = 0;
  
  
  // Currently playing OGG file
  struct {
***************
*** 39,43 ****
  	char filename[128];
  } channels[CHANNELS];
- #endif
  
  char *error;
--- 39,42 ----
***************
*** 46,63 ****
  
  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);
  
  	// Initialize alogg
  #ifdef ENABLE_MUSIC
! 	alogg_init();
  #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;
--- 45,68 ----
  
  void init_sound() {
  	// To achieve the max possible volume
  	set_volume_per_voice(0);
  
  	// Initialize alogg
+ 
+ 	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)) {
  #ifdef ENABLE_MUSIC
! 		alogg_init();
  #endif
+ 		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;
***************
*** 76,80 ****
  
  
- #ifdef ENABLE_MUSIC
  
  /* play_music(filename, channel)
--- 81,84 ----
***************
*** 88,111 ****
  	error = NULL;
  
! 	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);
--- 92,119 ----
  	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);
! 			
! 			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 {
! #ifdef ENABLE_MUSIC
! 			// Stop currently playing music
! 			stop_music(channel);
! 			
! 			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);
***************
*** 113,142 ****
  			channels[channel].ass = alogg_get_audio_stream(channels[channel].stream);
  			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;
  }
  
  /* adjust_channel(channel, volume, panning, speed)
   */
--- 121,141 ----
  			channels[channel].ass = alogg_get_audio_stream(channels[channel].stream);
  			voice_set_volume(channels[channel].ass->voice, music_vol);
! #endif
  		}
  	}
! 	
! 	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;
  }
  
+ 
+ #ifdef ENABLE_MUSIC
+ 
  /* adjust_channel(channel, volume, panning, speed)
   */
***************
*** 148,152 ****
  	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";}
--- 147,151 ----
  	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";}
***************
*** 157,161 ****
  		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 {
--- 156,159 ----
***************
*** 177,194 ****
  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;
  			}
  		}
--- 175,194 ----
  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;
  				}
  			}
  		}
***************
*** 206,210 ****
  	}
  	*/
! 	if (channels[channel].stream) {
  		alogg_stop_streaming(channels[channel].stream);
  		channels[channel].stream = NULL;
--- 206,210 ----
  	}
  	*/
! 	if (music_format != MUSIC_MIDI && channels[channel].stream) {
  		alogg_stop_streaming(channels[channel].stream);
  		channels[channel].stream = NULL;
***************
*** 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 {
--- 243,250 ----
  
  	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 {
***************
*** 265,269 ****
  	}
  
! 	alogg_exit();
  #endif
  }
--- 263,269 ----
  	}
  
! 	if (sound_enabled && music_format != MUSIC_MIDI) {
! 		alogg_exit();
! 	}
  #endif
  }

Index: sound.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sound.h	3 Jan 2004 22:41:02 -0000	1.6
--- sound.h	13 Jan 2004 16:32:35 -0000	1.7
***************
*** 25,31 ****
  extern int sfx_vol;
  extern int music_vol;
  
- //#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
--- 25,34 ----
  extern int sfx_vol;
  extern int music_vol;
+ extern int music_format;
+ 
+ #define MUSIC_MIDI 0
+ #define MUSIC_OGG  1
+ 
  
  #define CHANNELS (1 << 1)  /* (2)     number of channels */
  #define BLOCK_SIZE 40960
***************
*** 35,44 ****
  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.2 console.h,1.1,1.2

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

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

Modified Files:
	console.cpp console.h 
Log Message:
Merged bbrpg branch.

Index: console.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/shared/console.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console.cpp	9 Dec 2003 01:03:34 -0000	1.1
--- console.cpp	13 Jan 2004 16:32:35 -0000	1.2
***************
*** 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.2
diff -C2 -d -r1.1 -r1.2
*** console.h	9 Dec 2003 01:03:34 -0000	1.1
--- console.h	13 Jan 2004 16:32:35 -0000	1.2
***************
*** 39,42 ****
--- 39,44 ----
  	void log(int where, int when, const char* what, ...);
  
+ 	bool enableLogfile;
+ 
  private:
  	FILE* logFile;

[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.30.2.2,1.30.2.3 BBRpgLangDutch.lua,1.5.2.3,1.5.2.4 City.lua,1.18.2.1,1.18.2.2 MainMenu.lua,1.33.2.4,1.33.2.5 MessPile.lua,1.9.2.4,1.9.2.5 SubcityObjects.lua,1.37.2.1,1.37.2.2

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

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

Modified Files:
      Tag: bbrpg
	BBRpgLang.lua BBRpgLangDutch.lua City.lua MainMenu.lua 
	MessPile.lua SubcityObjects.lua 
Log Message:
- Added more natural boundaries to the city area.
- Corrected a spellingmistake

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -C2 -d -r1.30.2.2 -r1.30.2.3
*** BBRpgLang.lua	9 Jan 2004 19:03:32 -0000	1.30.2.2
--- BBRpgLang.lua	13 Jan 2004 00:16:41 -0000	1.30.2.3
***************
*** 296,299 ****
--- 296,302 ----
  			{"{PLAYER}", "Ah, there are the mini-rocket engines! But alas, I am already carrying all I can."},
  		},
+ 		LeaveTown = {
+ 			{"{PLAYER}", "There is no point in leaving the town."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -d -r1.5.2.3 -r1.5.2.4
*** BBRpgLangDutch.lua	10 Jan 2004 21:30:28 -0000	1.5.2.3
--- BBRpgLangDutch.lua	13 Jan 2004 00:16:41 -0000	1.5.2.4
***************
*** 110,114 ****
  		},
  		FindKeyFob = {
! 			{"{PLAYER}", "Daar ligt ie! I zie de sleutelbos!"},
  			{"Jake", "We hebben mijn gelukssleutelbos!"},
  			{"Elwood", "Dus je probeert me duidelijk te maken dat dit allemaal was om jouw tentakelsleutelbos te vinden?"},
--- 110,114 ----
  		},
  		FindKeyFob = {
! 			{"{PLAYER}", "Daar ligt ie! Ik zie de sleutelbos!"},
  			{"Jake", "We hebben mijn gelukssleutelbos!"},
  			{"Elwood", "Dus je probeert me duidelijk te maken dat dit allemaal was om jouw tentakelsleutelbos te vinden?"},
***************
*** 285,288 ****
--- 285,291 ----
  			{"{PLAYER}", "Ah, daar zijn de mini-raket motoren! Maar helaas, ik heb al teveel bij me."},
  		},
+ 		LeaveTown = {
+ 			{"{PLAYER}", "Het heeft geen zin om de stad te verlaten."},
+ 		},
  
  		-- Conversation tables. Used for random events.

Index: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C2 -d -r1.18.2.1 -r1.18.2.2
*** City.lua	6 Jan 2004 23:19:56 -0000	1.18.2.1
--- City.lua	13 Jan 2004 00:16:41 -0000	1.18.2.2
***************
*** 10,13 ****
--- 10,15 ----
  
  	init = function(self)
+ 		local obj;
+ 
  		Map.init(self, "data/maps/city1.map")
  
***************
*** 18,25 ****
  		self:spawn(KeyFob, 66, 42)		
  
! 		-- No go areas.
  		self:spawn(TooDangerous,  63, 80)
  		self:spawn(TooDangerous2, 93, 36)
! 		
  		-- Litter the city with stuff
  
--- 20,30 ----
  		self:spawn(KeyFob, 66, 42)		
  
! 		-- No go areas
  		self:spawn(TooDangerous,  63, 80)
  		self:spawn(TooDangerous2, 93, 36)
! 		obj = self:spawn(LeaveTown,  52, 113); obj.w = 6; obj.walkBack = "U1"
! 		obj = self:spawn(LeaveTown,  18,  17); obj.h = 7; obj.walkBack = "R1"
! 		obj = self:spawn(LeaveTown, 121,  17); obj.h = 7; obj.walkBack = "L1"
! 
  		-- Litter the city with stuff
  

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -d -r1.33.2.4 -r1.33.2.5
*** MainMenu.lua	10 Jan 2004 20:23:19 -0000	1.33.2.4
--- MainMenu.lua	13 Jan 2004 00:16:41 -0000	1.33.2.5
***************
*** 24,27 ****
--- 24,28 ----
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
+ --			ActionSetPosition(elwood, 37, 12, DIR_UP, cityMap),
  --			ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** MessPile.lua	10 Jan 2004 20:31:21 -0000	1.9.2.4
--- MessPile.lua	13 Jan 2004 00:16:41 -0000	1.9.2.5
***************
*** 9,13 ****
  	defaultproperties = {
  		offset_x = -6,
! 		offset_y = 6,
  		w = 2,
  		h = 2,
--- 9,13 ----
  	defaultproperties = {
  		offset_x = -6,
! 		offset_y = 4,
  		w = 2,
  		h = 2,

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** SubcityObjects.lua	8 Jan 2004 23:57:53 -0000	1.37.2.1
--- SubcityObjects.lua	13 Jan 2004 00:16:41 -0000	1.37.2.2
***************
*** 717,720 ****
--- 717,744 ----
  }
  
+ LeaveTown = Actor:subclass
+ {
+ 	name = "LeaveTown";
+ 
+ 	event_stand_on = function(self, obj)
+ 		if ((obj == brian) or (obj == elwood) or (obj == jake)) then
+ 			ActionController:addSequence{
+ 				ActionExModeOn(),	
+ 				ActionConversation(lang:getConv("LeaveTown")),
+ 				ActionWalkPath(obj, self.walkBack),
+ 				ActionExModeOff(),
+ 			}
+ 		end
+ 	end;
+ 
+ 	defaultproperties = {
+ 		bCanActivate = true,
+ 		walkBack = "R1",
+ 		obstacle = 0,
+ 		w = 1,
+ 		h = 1,
+ 	}
+ }
+ 
  WalkieTalkie = Actor:subclass
  {

[Moeng-cvs] BBRpg/data/maps city1.map,1.12,1.12.2.1

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

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

Modified Files:
      Tag: bbrpg
	city1.map 
Log Message:
- Added more natural boundaries to the city area.
- Corrected a spellingmistake

Index: city1.map
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/maps/city1.map,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
Binary files /tmp/cvs8Qe3NV and /tmp/cvsqgZEiK differ

[Moeng-cvs] BBRpg/data/scripts CellsObjects.lua,1.17.2.2,1.17.2.3 ElecDoor.lua,1.8.2.1,1.8.2.2

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

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

Modified Files:
      Tag: bbrpg
	CellsObjects.lua ElecDoor.lua 
Log Message:
- Fixed bug activating guards door in prison
- Made more natural talkpositions when returning in Jake's place with Brian

Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -d -r1.17.2.2 -r1.17.2.3
*** CellsObjects.lua	9 Jan 2004 19:03:32 -0000	1.17.2.2
--- CellsObjects.lua	11 Jan 2004 23:50:00 -0000	1.17.2.3
***************
*** 351,355 ****
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
  					ActionCallFunction(jake.setSleeping, jake, false),
  					ActionCallFunction(elwood.setSleeping, elwood, false),
--- 351,355 ----
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
  					ActionCallFunction(jake.setSleeping, jake, false),
  					ActionCallFunction(elwood.setSleeping, elwood, false),
***************
*** 378,382 ****
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
  					ActionCallFunction(jake.setSleeping, jake, false),
  					ActionCallFunction(elwood.setSleeping, elwood, false),
--- 378,382 ----
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! 					ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
  					ActionCallFunction(jake.setSleeping, jake, false),
  					ActionCallFunction(elwood.setSleeping, elwood, false),

Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** ElecDoor.lua	9 Jan 2004 19:03:32 -0000	1.8.2.1
--- ElecDoor.lua	11 Jan 2004 23:50:00 -0000	1.8.2.2
***************
*** 95,104 ****
  	
  	activatedBy = function(self, obj)
! 		if self.isLocked2 then
! 			ActionController:addSequence{
! 				ActionConversation(lang:getConv("PrisonDoorLocked")),
! 			}
! 		else
! 			ElecDoor.activatedBy(self, obj)
  		end
  	end;
--- 95,106 ----
  	
  	activatedBy = function(self, obj)
! 		if (self.firstime == 2) then
! 			if self.isLocked2 then
! 				ActionController:addSequence{
! 					ActionConversation(lang:getConv("PrisonDoorLocked")),
! 				}
! 			else
! 				ElecDoor.activatedBy(self, obj)
! 			end
  		end
  	end;

[Moeng-cvs] BBRpg configure,1.10.2.1,1.10.2.2

[<sg...@us...>]

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

Modified Files:
      Tag: bbrpg
	configure 
Log Message:
weer een klein iets waar smunt me op wees, er miste een "exit 1" bij de check op lua. die moet natuurlijk wel echt falen


Index: configure
===================================================================
RCS file: /cvsroot/moeng/BBRpg/configure,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** configure	4 Jan 2004 23:21:48 -0000	1.10.2.1
--- configure	11 Jan 2004 18:43:17 -0000	1.10.2.2
***************
*** 170,173 ****
--- 170,174 ----
      echo "*** Compiling of lua program failed"
      echo "*** Please install lua. http://www.lua.org"
+     exit 1
  fi
  rm -f conftest*

[Moeng-cvs] BBRpg/data/scripts RestPlace.lua,1.4,1.4.2.1

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

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

Modified Files:
      Tag: bbrpg
	RestPlace.lua 
Log Message:
Ai ai ai, another music file fix.

Index: RestPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/RestPlace.lua,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** RestPlace.lua	3 Jan 2004 18:50:44 -0000	1.4
--- RestPlace.lua	10 Jan 2004 21:48:47 -0000	1.4.2.1
***************
*** 27,31 ****
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("restplace.tga"),
! 		musicFilename = "data/music/4.ogg",
  	}
  }
--- 27,31 ----
  	defaultproperties = {
  		mapNameBitmap = m_get_bitmap("restplace.tga"),
! 		musicFilename = "data/music/city.ogg",
  	}
  }

[Moeng-cvs] BBRpg/data/scripts BBRpgLangDutch.lua,1.5.2.2,1.5.2.3

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

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

Modified Files:
      Tag: bbrpg
	BBRpgLangDutch.lua 
Log Message:
Properly translate 'The Brain', suggested by Georg.

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** BBRpgLangDutch.lua	9 Jan 2004 19:03:32 -0000	1.5.2.2
--- BBRpgLangDutch.lua	10 Jan 2004 21:30:28 -0000	1.5.2.3
***************
*** 74,82 ****
  			{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
  			{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! 			{"Jake", "Goed, onze broer Brian, ook wel bekend als The Brain, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
  			{"Elwood", "Een op 100? That is nog behoorlijk groot."},
  			{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
  			{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! 			{"Jake", "Kijk, Brian, alias The Brain, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
  			{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
  			{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
--- 74,82 ----
  			{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
  			{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! 			{"Jake", "Goed, onze broer Brian, ook wel bekend als Het Brein, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
  			{"Elwood", "Een op 100? That is nog behoorlijk groot."},
  			{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
  			{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! 			{"Jake", "Kijk, Brian, alias Het Brein, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
  			{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
  			{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
***************
*** 229,233 ****
  			{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
  			{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! 			{"Jake", "Ja, zo mag ik het horen. Laten we Brian the Brain bevrijden!"},
  		},
  		JakesDoorLocked = {
--- 229,233 ----
  			{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
  			{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! 			{"Jake", "Ja, zo mag ik het horen. Laten we Brian het Brein bevrijden!"},
  		},
  		JakesDoorLocked = {

[Moeng-cvs] BBRpg/data/scripts MessPile.lua,1.9.2.3,1.9.2.4

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

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

Modified Files:
      Tag: bbrpg
	MessPile.lua 
Log Message:
Update script to reflect einddemo > enddemo

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** MessPile.lua	8 Jan 2004 23:57:53 -0000	1.9.2.3
--- MessPile.lua	10 Jan 2004 20:31:21 -0000	1.9.2.4
***************
*** 61,65 ****
  				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
  				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/einddemo.ogg", 10),
  			}
  		else
--- 61,65 ----
  				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
  				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/enddemo.ogg", 10),
  			}
  		else

[Moeng-cvs] BBRpg/data/music enddemo.mid,NONE,1.1.2.1 einddemo.mid,1.1.2.1,NONE

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

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

Added Files:
      Tag: bbrpg
	enddemo.mid 
Removed Files:
      Tag: bbrpg
	einddemo.mid 
Log Message:
Georg renamed einddemo to enddemo for consistency.

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

--- einddemo.mid DELETED ---

[Moeng-cvs] BBRpg/data/scripts AdvAIRandom.lua,1.6,1.6.2.1 MainMenu.lua,1.33.2.3,1.33.2.4

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

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

Modified Files:
      Tag: bbrpg
	AdvAIRandom.lua MainMenu.lua 
Log Message:
AdvAIRandom fix voor bDead, snelstart weer zoals het hoort en blues mobiel goed zetten in snelstart.

Index: AdvAIRandom.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/AdvAIRandom.lua,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** AdvAIRandom.lua	1 Jan 2004 22:39:55 -0000	1.6
--- AdvAIRandom.lua	10 Jan 2004 20:23:19 -0000	1.6.2.1
***************
*** 42,47 ****
  	end;
  	notifyWalkFinished = function(self)
!                 if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! 		        -- Reached his goal, pause and choose new goal.
  			if (self.target or self.scaring) then
  				-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
--- 42,47 ----
  	end;
  	notifyWalkFinished = function(self)
! 		if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! 			-- Reached his goal, pause and choose new goal.
  			if (self.target or self.scaring) then
  				-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
***************
*** 93,96 ****
--- 93,97 ----
  	tick = function(self)
  		if (self.pawn.bDead) then return end
+ 		if (self.target and self.target.bDead) then self.target = nil end
  
  		if (self.pawn.charging > 0) then self.pawn.charging = self.pawn.charging - 1 end

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -C2 -d -r1.33.2.3 -r1.33.2.4
*** MainMenu.lua	9 Jan 2004 19:03:32 -0000	1.33.2.3
--- MainMenu.lua	10 Jan 2004 20:23:19 -0000	1.33.2.4
***************
*** 23,30 ****
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! --			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
  			ActionPlaySong(cityMap.musicFilename, 100),
  			ActionFadeInMap(100),
--- 23,31 ----
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! 			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! --			ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
+ 			ActionSetPosition(copcar, 88, 77),
  			ActionPlaySong(cityMap.musicFilename, 100),
  			ActionFadeInMap(100),

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

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

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

Modified Files:
      Tag: bbrpg
	cells.mid city.mid intro.mid mainmenu.mid sewers.mid 
Log Message:
Nieuwe MIDIs van Georg

Index: cells.mid
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/music/Attic/cells.mid,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvsxV8NG0 and /tmp/cvsKryoPT differ

Index: city.mid
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/music/Attic/city.mid,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvsKqoem5 and /tmp/cvsCgOXH0 differ

Index: intro.mid
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/music/Attic/intro.mid,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvszEwJy7 and /tmp/cvsUQOq84 differ

Index: mainmenu.mid
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/music/Attic/mainmenu.mid,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvsi3FDXe and /tmp/cvsSg3Qfm differ

Index: sewers.mid
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/music/Attic/sewers.mid,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvsQgCMsc and /tmp/cvssloBQc differ

[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.30.2.1,1.30.2.2 BBRpgLangDutch.lua,1.5.2.1,1.5.2.2 CellsObjects.lua,1.17.2.1,1.17.2.2 ElecDoor.lua,1.8,1.8.2.1 EnemyGuard.lua,1.7,1.7.2.1 Junk.lua,1.3,1.3.2.1 MainMenu.lua,1.33.2.2,1.33.2.3 Punk.lua,1.4,1.4.2.1

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

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

Modified Files:
      Tag: bbrpg
	BBRpgLang.lua BBRpgLangDutch.lua CellsObjects.lua ElecDoor.lua 
	EnemyGuard.lua Junk.lua MainMenu.lua Punk.lua 
Log Message:
- Made a warningmessage in front of the controlroom and reduced the health of both guards.
- Changed some minor spellingmistakes
- Made the Junk and the Punk stronger
- Changed the z-coordinate of the sewagedrain because you could walk behind it

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -C2 -d -r1.30.2.1 -r1.30.2.2
*** BBRpgLang.lua	8 Jan 2004 23:43:23 -0000	1.30.2.1
--- BBRpgLang.lua	9 Jan 2004 19:03:32 -0000	1.30.2.2
***************
*** 213,217 ****
  			{"Jake", "Good plan."},
  			{"Elw00t", "Why don't the three of us start a band?"},
! 		},		
  		WallAndTubeElwood = {
  			{"{PLAYER}", "I can't get in the tube. It's to damn small!"},
--- 213,220 ----
  			{"Jake", "Good plan."},
  			{"Elw00t", "Why don't the three of us start a band?"},
! 		},
! 		NotYetFightGuards = {
! 			{"{PLAYER}","There are guards inside. Before I come back here, I'd better make sure I'm strong enough to defeat them."},
! 		},
  		WallAndTubeElwood = {
  			{"{PLAYER}", "I can't get in the tube. It's to damn small!"},

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** BBRpgLangDutch.lua	8 Jan 2004 23:43:23 -0000	1.5.2.1
--- BBRpgLangDutch.lua	9 Jan 2004 19:03:32 -0000	1.5.2.2
***************
*** 173,177 ****
  			{"Elwood", "Ach natuurlijk, Lee!"},
  			{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! 			{"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstop in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
  			{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
  			{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
--- 173,177 ----
  			{"Elwood", "Ach natuurlijk, Lee!"},
  			{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! 			{"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstopt in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
  			{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
  			{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
***************
*** 188,192 ****
  			{"Elwood", "Dit is Lee?"},
  			{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! 			{"Lee", "Inderdaad, ik ben degene die Lee genoemd wordt."},
  			{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
  		},
--- 188,192 ----
  			{"Elwood", "Dit is Lee?"},
  			{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! 			{"Lee", "Juist, ik ben degene die Lee genoemd wordt."},
  			{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
  		},
***************
*** 202,205 ****
--- 202,208 ----
  			{"Elw00t", "Waarom beginnen we niet met zijn drieen een band?"},
  		},		
+ 		NotYetFightGuards = {
+ 			{"{PLAYER}","Daar binnen zitten gevangenisbewaarders. Voordat ik hier terugkom kan ik maar beter zorgen dat ik sterk genoeg ben om ze te verslaan."},
+ 		},
  		WallAndTubeElwood = {
  			{"{PLAYER}", "Ik pas niet in deze buis. Hij is veel te smal!"},

Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -d -r1.17.2.1 -r1.17.2.2
*** CellsObjects.lua	8 Jan 2004 23:57:53 -0000	1.17.2.1
--- CellsObjects.lua	9 Jan 2004 19:03:32 -0000	1.17.2.2
***************
*** 204,208 ****
  		w = 1,
  		offset_x = 0,
! 		offset_y = 0,
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("sewagedrain.bmp"),		
--- 204,209 ----
  		w = 1,
  		offset_x = 0,
! 		offset_y = -24,
! 		offset_z = -24,
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("sewagedrain.bmp"),		

Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** ElecDoor.lua	2 Jan 2004 04:31:18 -0000	1.8
--- ElecDoor.lua	9 Jan 2004 19:03:32 -0000	1.8.2.1
***************
*** 109,117 ****
  
  	event_bumped_into = function(self, obj)
! 		if (not self.isLocked2) then
  			ElecDoor.event_bumped_into(self, obj)
  		end
  
! 		if (self.firstTime) then
  			ActionController:addSequence{
  				ActionExModeOn(),
--- 109,126 ----
  
  	event_bumped_into = function(self, obj)
! 		if (not (self.firstTime == 0) and not self.isLocked2) then
  			ElecDoor.event_bumped_into(self, obj)
  		end
  
! 		if (self.firstTime == 0) then
! 			ActionController:addSequence{
! 					ActionSequence{
! 						ActionExModeOn(),
! 						ActionConversation(lang:getConv("NotYetFightGuards")),
! 						ActionExModeOff(),
! 					},
! 			};
! 			self.firstTime = 1
! 		elseif (self.firstTime == 1) then
  			ActionController:addSequence{
  				ActionExModeOn(),
***************
*** 137,146 ****
  			};
  
! 			self.firstTime = false
  		end
  	end;
  	
  	defaultproperties = {
! 		firstTime = true,
  		bCenterOnTile = false,
  		bCenterBitmap = false,
--- 146,155 ----
  			};
  
! 			self.firstTime = 2
  		end
  	end;
  	
  	defaultproperties = {
! 		firstTime = 0,
  		bCenterOnTile = false,
  		bCenterBitmap = false,

Index: EnemyGuard.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/EnemyGuard.lua,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** EnemyGuard.lua	2 Jan 2004 08:05:43 -0000	1.7
--- EnemyGuard.lua	9 Jan 2004 19:03:32 -0000	1.7.2.1
***************
*** 17,22 ****
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 5,
! 		maxHealth = 70,
  
  		bDead = false,
--- 17,22 ----
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 4,
! 		maxHealth = 50,
  
  		bDead = false,
***************
*** 42,47 ****
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 5,
! 		maxHealth = 70,
  
  		bDead = false,
--- 42,47 ----
  		charging = 0,
  		attackMinDam = 0,
! 		attackMaxDam = 4,
! 		maxHealth = 50,
  
  		bDead = false,

Index: Junk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Junk.lua,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** Junk.lua	2 Jan 2004 17:46:12 -0000	1.3
--- Junk.lua	9 Jan 2004 19:03:32 -0000	1.3.2.1
***************
*** 8,12 ****
  
  	defaultproperties = {
! 		speed = 2,
  		experience = 40,
  		draw_mode = DM_MASKED,
--- 8,13 ----
  
  	defaultproperties = {
! 		speed = 2,
! 		maxHealth = 130,
  		experience = 40,
  		draw_mode = DM_MASKED,

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -C2 -d -r1.33.2.2 -r1.33.2.3
*** MainMenu.lua	8 Jan 2004 07:53:39 -0000	1.33.2.2
--- MainMenu.lua	9 Jan 2004 19:03:32 -0000	1.33.2.3
***************
*** 23,27 ****
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! 			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
--- 23,28 ----
  			ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! --			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
  			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),

Index: Punk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Punk.lua,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** Punk.lua	2 Jan 2004 17:46:12 -0000	1.4
--- Punk.lua	9 Jan 2004 19:03:32 -0000	1.4.2.1
***************
*** 8,12 ****
  
  	defaultproperties = {
! 		speed = 2.5,
  		experience = 50,
  		draw_mode = DM_MASKED,
--- 8,13 ----
  
  	defaultproperties = {
! 		speed = 2.5,
! 		maxHealth = 160,
  		experience = 50,
  		draw_mode = DM_MASKED,

[Moeng-cvs] BBRpg README,1.6,1.6.2.1

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

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

Modified Files:
      Tag: bbrpg
	README 
Log Message:
Music also under GPL

Index: README
===================================================================
RCS file: /cvsroot/moeng/BBRpg/README,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** README	4 Jan 2004 00:43:08 -0000	1.6
--- README	9 Jan 2004 00:04:04 -0000	1.6.2.1
***************
*** 64,69 ****
  - Allows use of multiple tile bitmaps per map, and the other way around
  
! All the game content except for the music is released as GPL too. Feel free to
! use it in your own game as long as you GPL any added graphics.
  
  
--- 64,69 ----
  - Allows use of multiple tile bitmaps per map, and the other way around
  
! All the game content is released as GPL too. Feel free to use it in your own
! game as long as you GPL anything you add to it as well.
  
  

[Moeng-cvs] BBRpg/data/scripts CellsObjects.lua,1.17,1.17.2.1 MessPile.lua,1.9.2.2,1.9.2.3 Pawn.lua,1.10,1.10.2.1 SubcityObjects.lua,1.37,1.37.2.1

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

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

Modified Files:
      Tag: bbrpg
	CellsObjects.lua MessPile.lua Pawn.lua SubcityObjects.lua 
Log Message:
Fix most critical aspect of sleeping problem.

Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** CellsObjects.lua	3 Jan 2004 22:41:02 -0000	1.17
--- CellsObjects.lua	8 Jan 2004 23:57:53 -0000	1.17.2.1
***************
*** 351,356 ****
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
  					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionSetVariable(jake, "bSleeping", false),
! 					ActionSetVariable(elwood, "bSleeping", false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
--- 351,356 ----
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
  					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionCallFunction(jake.setSleeping, jake, false),
! 					ActionCallFunction(elwood.setSleeping, elwood, false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
***************
*** 378,383 ****
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
  					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionSetVariable(jake, "bSleeping", false),
! 					ActionSetVariable(elwood, "bSleeping", false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
--- 378,383 ----
  					ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
  					ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! 					ActionCallFunction(jake.setSleeping, jake, false),
! 					ActionCallFunction(elwood.setSleeping, elwood, false),
  					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** MessPile.lua	8 Jan 2004 23:43:23 -0000	1.9.2.2
--- MessPile.lua	8 Jan 2004 23:57:53 -0000	1.9.2.3
***************
*** 46,52 ****
  				ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
  				ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! 				ActionSetVariable(jake, "bSleeping", false),
! 				ActionSetVariable(elwood, "bSleeping", false),
! 				ActionSetVariable(brian, "bSleeping", false),
  				ActionFadeInMap(100),
  				ActionShowMapName(m_get_bitmap("leesplace.tga")),
--- 46,52 ----
  				ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
  				ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! 				ActionCallFunction(jake.setSleeping, jake, false),
! 				ActionCallFunction(elwood.setSleeping, elwood, false),
! 				ActionCallFunction(brian.setSleeping, brian, false),
  				ActionFadeInMap(100),
  				ActionShowMapName(m_get_bitmap("leesplace.tga")),

Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** Pawn.lua	3 Jan 2004 21:56:19 -0000	1.10
--- Pawn.lua	8 Jan 2004 23:57:53 -0000	1.10.2.1
***************
*** 105,108 ****
--- 105,127 ----
  	end;
  
+ 	setSleeping = function(self, sleeping)
+ 		self.bSleeping = sleeping
+ 		if (self.bSleeping) then
+ 			self.shadow.bitmap = nil
+ 			self.alpha = 0
+ 			self.prevBitmap = self.bitmap
+ 			self.bitmap = nil
+ 			self.obstacle = 0
+ 		else
+ 			self.shadow.bitmap = self.shadow.defaultproperties.bitmap
+ 			self.alpha = 255
+ 			if (self.prevBitmap) then
+ 				self.bitmap = self.prevBitmap
+ 				self.prevBitmap = nil
+ 			end
+ 			self.obstacle = 1
+ 		end
+ 	end;
+ 
  
  	attack = function(self)

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** SubcityObjects.lua	2 Jan 2004 23:06:55 -0000	1.37
--- SubcityObjects.lua	8 Jan 2004 23:57:53 -0000	1.37.2.1
***************
*** 177,181 ****
  	activatedBy = function(self, obj)
  		local bitmapje = self.bitmap
- 		local schaduwtje = obj.shadow.bitmap
  	
  		if (obj.health == obj.maxHealth) then
--- 177,180 ----
***************
*** 187,205 ****
  				ActionSetVariable(self, "bOccupied", true),
  				ActionConversation(lang:getConv("BedTiredBefore")),
! 				ActionSetVariable(obj, "bSleeping", true),
  				ActionChangeBitmap(self, obj.sleepBitmap),
- 				ActionChangeBitmap(obj.shadow, nil),
- 				ActionSetVariable(obj, "alpha", 0),
- 				ActionSetVariable(obj, "bitmap"),
- 				ActionSetVariable(obj, "obstacle", 0),
  				ActionSetVariable(obj, "onActivate",
  					function(self2)
- 						self2.bSleeping = false
  						self2.onActivate = nil
  						ActionController:addSequence{
! 							ActionSetVariable(obj, "alpha", 255),
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
- 							ActionChangeBitmap(obj.shadow, schaduwtje),
  							ActionConversation(lang:getConv("BedTiredAfter")),
  							ActionSetVariable(obj, "obstacle", 1),
--- 186,198 ----
  				ActionSetVariable(self, "bOccupied", true),
  				ActionConversation(lang:getConv("BedTiredBefore")),
! 				ActionCallFunction(obj.setSleeping, obj, true),
  				ActionChangeBitmap(self, obj.sleepBitmap),
  				ActionSetVariable(obj, "onActivate",
  					function(self2)
  						self2.onActivate = nil
  						ActionController:addSequence{
! 							ActionCallFunction(obj.setSleeping, obj, false),
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
  							ActionConversation(lang:getConv("BedTiredAfter")),
  							ActionSetVariable(obj, "obstacle", 1),

[Moeng-cvs] BBRpg TODO,1.36.2.4,1.36.2.5

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

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

Modified Files:
      Tag: bbrpg
	TODO 
Log Message:
Fix most critical aspect of sleeping problem.

Index: TODO
===================================================================
RCS file: /cvsroot/moeng/BBRpg/TODO,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -C2 -d -r1.36.2.4 -r1.36.2.5
*** TODO	8 Jan 2004 23:43:23 -0000	1.36.2.4
--- TODO	8 Jan 2004 23:57:53 -0000	1.36.2.5
***************
*** 12,17 ****
  
  Bjorn:
! ! Experience/levelup afmaken
! - Fix waking up sleeping people in sequences
  
  Georg:
--- 12,17 ----
  
  Bjorn:
! - Experience/levelup weergeven
! ? Fix brother still lying in bed when he slept
  
  Georg: