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

[Moeng-cvs] BBRpg/data/scripts CaveObjects.lua,1.3,NONE

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

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

Removed Files:
	CaveObjects.lua 
Log Message:
Removed even more Cave Adventure stuff

--- CaveObjects.lua DELETED ---

[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.30,1.31 BBRpgLangDutch.lua,1.5,1.6 SubcityObjects.lua,1.37,1.38

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

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

Modified Files:
	BBRpgLang.lua BBRpgLangDutch.lua SubcityObjects.lua 
Log Message:
- Little spellchecks and interaction with more objects.
- Added snow to the putdeksels

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** BBRpgLang.lua	4 Jan 2004 02:29:19 -0000	1.30
--- BBRpgLang.lua	4 Jan 2004 19:13:30 -0000	1.31
***************
*** 362,365 ****
--- 362,377 ----
  			{{"{PLAYER}", "That's one huge Christmas tree!"}},
  		},
+ 		CopCar = {
+ 			{{"{PLAYER}", "So now we're driving in a policecar. How low can you go..."}},
+ 		},
+ 		Couch = {
+ 			{{"{PLAYER}", "It's a dirty old couch."}},
+ 		},
+ 		TV = {
+ 			{{"{PLAYER}", "This television doesn't work."}},
+ 		},
+ 		Lamppost = {
+ 			{{"{PLAYER}", "Het is een lantaarnpaal."}},
+ 		},
  	};
  

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BBRpgLangDutch.lua	4 Jan 2004 13:17:20 -0000	1.5
--- BBRpgLangDutch.lua	4 Jan 2004 19:13:30 -0000	1.6
***************
*** 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?"},
***************
*** 348,351 ****
--- 348,363 ----
  		ChristmasTree = {
  			{{"{PLAYER}", "Dat is een grote kerstboom!"}},
+ 		},
+ 		CopCar = {
+ 			{{"{PLAYER}", "Dus nu rijden we in een politieauto. Hoe diep kan je zinken..."}},
+ 		},
+ 		Couch = {
+ 			{{"{PLAYER}", "Het is een oude vieze bank."}},
+ 		},
+ 		TV = {
+ 			{{"{PLAYER}", "Deze televisie werkt niet."}},
+ 		},
+ 		Lamppost = {
+ 			{{"{PLAYER}", "It's a lamppost."}},
  		},
  	};

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** SubcityObjects.lua	2 Jan 2004 23:06:55 -0000	1.37
--- SubcityObjects.lua	4 Jan 2004 19:13:30 -0000	1.38
***************
*** 167,170 ****
--- 167,171 ----
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("tv.bmp"),
+ 		convTableKeyword = "TV",
  	}
  }
***************
*** 243,246 ****
--- 244,248 ----
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("bank.bmp"),
+ 		convTableKeyword = "Couch",
  	}
  }
***************
*** 270,273 ****
--- 272,276 ----
  		draw_mode = DM_MASKED,
  		animSeq =  extr_array(m_get_bitmap("car_cop.bmp"),108,50),
+ 		convTableKeyword = "CopCar",
  	}
  }
***************
*** 564,568 ****
  }
  
! LamppostLeft = Actor:subclass
  {
  	name = "LamppostLeft";
--- 567,571 ----
  }
  
! LamppostLeft = Decoration:subclass
  {
  	name = "LamppostLeft";
***************
*** 571,581 ****
  	defaultproperties = {
  		bitmap = m_get_bitmap("lamppost_snow_w.bmp"),
  		offset_y = -15,
  		offset_x = -12,
  		obstacle = 1,
  	};
  }
  
! LamppostRight = Actor:subclass
  {
  	name = "LamppostRight";
--- 574,587 ----
  	defaultproperties = {
  		bitmap = m_get_bitmap("lamppost_snow_w.bmp"),
+ 		bCenterBitmap = false,
+ 		bCenterOnTile = false,
  		offset_y = -15,
  		offset_x = -12,
  		obstacle = 1,
+ 		convTableKeyword = "Lamppost",
  	};
  }
  
! LamppostRight = Decoration:subclass
  {
  	name = "LamppostRight";
***************
*** 584,590 ****
--- 590,599 ----
  	defaultproperties = {
  		bitmap = m_get_bitmap("lamppost_snow_e.bmp"),
+ 		bCenterBitmap = false,
+ 		bCenterOnTile = false,
  		offset_y = -15,
  		offset_x = 9,
  		obstacle = 1,
+ 		convTableKeyword = "Lamppost",
  	};
  }
***************
*** 643,648 ****
  		bCanActivate = true,
  		offset_x = -1,
! 		offset_y = -11,
! 		offset_z = -6,
  		bitmap = m_get_bitmap("putdeksel.bmp"),
  		obstacle = 1,
--- 652,657 ----
  		bCanActivate = true,
  		offset_x = -1,
! 		offset_y = -35,
! 		offset_z = -30,
  		bitmap = m_get_bitmap("putdeksel.bmp"),
  		obstacle = 1,

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

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

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

Removed Files:
	cave.bmp cave.tga cave_entrance.tga cave_entrance2.tga 
	cave_roof.bmp cave_title_1.bmp cave_title_2.bmp 
	cave_title_3.bmp cave_waterfall_exit.bmp cavebridge1.bmp 
	cavebridge2.bmp cavepick.bmp cavepile.bmp 
Log Message:
Removed even more Cave Adventure stuff

--- cave.bmp DELETED ---

--- cave.tga DELETED ---

--- cave_entrance.tga DELETED ---

--- cave_entrance2.tga DELETED ---

--- cave_roof.bmp DELETED ---

--- cave_title_1.bmp DELETED ---

--- cave_title_2.bmp DELETED ---

--- cave_title_3.bmp DELETED ---

--- cave_waterfall_exit.bmp DELETED ---

--- cavebridge1.bmp DELETED ---

--- cavebridge2.bmp DELETED ---

--- cavepick.bmp DELETED ---

--- cavepile.bmp DELETED ---

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

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

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

Modified Files:
      Tag: bbrpg
	putdeksel.bmp tiles_subcity.bmp 
Log Message:
- Added the right putdeksel and tiles_subcity


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

Index: tiles_subcity.bmp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/tiles_subcity.bmp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
Binary files /tmp/cvslufu5v and /tmp/cvs6ujBBS differ

[Moeng-cvs] BBRpg/data/maps cave1.map,1.2,1.3 cave2.map,1.2,1.3 cave3.map,1.2,1.3

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

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

Added Files:
	cave1.map cave2.map cave3.map 
Log Message:
Putting back Cave Adventure stuff in main branch.

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

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

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

Removed Files:
	README.CaveAdventure 
Log Message:
BBRpg doesn't need this readme.

--- README.CaveAdventure DELETED ---

[Moeng-cvs] BBRpg/data/scripts CaveObjects.lua,1.4,1.5

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

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

Added Files:
	CaveObjects.lua 
Log Message:
Added another Cave Adventure file

[Moeng-cvs] BBRpg README.CaveAdventure,1.2,1.3

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

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

Added Files:
	README.CaveAdventure 
Log Message:
Another Cave Adventure file

[Moeng-cvs] BBRpg/data/scripts Actor.lua,1.8,1.9 Decoration.lua,1.4,1.5 SewerObjects.lua,1.6,1.7

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

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

Modified Files:
	Actor.lua Decoration.lua SewerObjects.lua 
Log Message:
Fixed crash on activating tube in sewers.

Index: Actor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Actor.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Actor.lua	2 Jan 2004 02:49:56 -0000	1.8
--- Actor.lua	4 Jan 2004 16:42:25 -0000	1.9
***************
*** 187,190 ****
--- 187,194 ----
  	--== NOTIFICATIONS ==--
  
+ 	-- Acticated (only ever called when self.bCanActivate == true)
+ 	activatedBy = function(self, instigator)
+ 	end;
+ 
  	-- The instigator, damageType, momentum and location are all optional.
  	takeDamage = function(self, damage, instigator, damageType, momentum, location)
***************
*** 344,347 ****
--- 348,352 ----
  		bCenterBitmap = false,
  		bCenterOnTile = false,
+ 		bCanActivate = false,
  
  		xDir = {

Index: Decoration.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Decoration.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Decoration.lua	29 Dec 2003 17:39:59 -0000	1.4
--- Decoration.lua	4 Jan 2004 16:42:25 -0000	1.5
***************
*** 47,51 ****
  
  		convTable = nil,
- 		bCanActivate = false,
  		prev_random = -1,
  		bCenterBitmap = true,
--- 47,50 ----

Index: SewerObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SewerObjects.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SewerObjects.lua	2 Jan 2004 07:38:04 -0000	1.6
--- SewerObjects.lua	4 Jan 2004 16:42:25 -0000	1.7
***************
*** 144,147 ****
--- 144,148 ----
  		Actor.init(self)
  	end;
+ 
  	event_bumped_into = function(self, player)
  		if (player:instanceOf(Elwood)) then
***************
*** 174,178 ****
  		offset_z = 8,
  		obstacle = 1,
- 		bCanActivate = true,
  		draw_mode = DM_MASKED,
  		bitmap = m_get_bitmap("wall_and_tube.bmp"),
--- 175,178 ----
***************
*** 189,193 ****
  
  	event_bumped_into = function(self, player)
- 
  		if (player:instanceOf(Elwood)) then
  			ActionController:addSequence{
--- 189,192 ----
***************
*** 217,221 ****
  	defaultproperties = {
  		obstacle = 1,
- 		bCanActivate = true,
  	}
  }
--- 216,219 ----

[Moeng-cvs] BBRpg configure,1.10,1.11

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

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

Modified Files:
	configure 
Log Message:
smunt wees me op een bourne shell compatibility probleempje, gefixed :)

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

[Moeng-cvs] BBRpg/data/scripts BBRpgLangDutch.lua,1.4,1.5

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

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

Modified Files:
	BBRpgLangDutch.lua 
Log Message:
Some spelling fixes.

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BBRpgLangDutch.lua	4 Jan 2004 02:29:21 -0000	1.4
--- BBRpgLangDutch.lua	4 Jan 2004 13:17:20 -0000	1.5
***************
*** 65,71 ****
  			{"Jake", "Luister eikel: we moeten Brian redden."},
  			{"Elwood", "Wie?"},
! 			{"Jake", "Brian."},
! 			{"Elwood", "Wie?"},
! 			{"Jake", "Once broer, Brian!"},
  			{"Elwood", "Ik weet niks van een derde broer! Al helemaal geen Brian!"},
  			{"Jake", "Hij is geadopteerd, nou je bek houden en me uit laten spreken!"},
--- 65,69 ----
  			{"Jake", "Luister eikel: we moeten Brian redden."},
  			{"Elwood", "Wie?"},
! 			{"Jake", "Onze broer, Brian!"},
  			{"Elwood", "Ik weet niks van een derde broer! Al helemaal geen Brian!"},
  			{"Jake", "Hij is geadopteerd, nou je bek houden en me uit laten spreken!"},
***************
*** 74,78 ****
  			{"Elwood", "Wat?"},
  			{"Jake", "Ze hebben het JOU nooit verteld."},
! 			{"Elwood", "Je bedoeld 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."},
--- 72,76 ----
  			{"Elwood", "Wat?"},
  			{"Jake", "Ze hebben het JOU nooit verteld."},
! 			{"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."},

[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.29,1.30 BBRpgLangDutch.lua,1.3,1.4

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

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

Modified Files:
	BBRpgLang.lua BBRpgLangDutch.lua 
Log Message:
Even zitten snijden in into tekst.

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** BBRpgLang.lua	3 Jan 2004 18:50:44 -0000	1.29
--- BBRpgLang.lua	4 Jan 2004 02:29:19 -0000	1.30
***************
*** 45,49 ****
  			{"Elwood", "Okay. But what's this?"},
  			{"Jake", "What?"},
! 			{"Elwood", "This car. This stupid car. Where's the Cadillac? The Caddy? Where's the Caddy?"},
  			{"Jake", "The what?"},
  			{"Elwood", "The Cadillac we used to have. The Blues Mobile!"},
--- 45,49 ----
  			{"Elwood", "Okay. But what's this?"},
  			{"Jake", "What?"},
! 			{"Elwood", "This car. This stupid car. Where's the Caddy?"},
  			{"Jake", "The what?"},
  			{"Elwood", "The Cadillac we used to have. The Blues Mobile!"},
***************
*** 68,79 ****
  			{"Elwood", "Who?"},
  			{"Jake", "Brian."},
! 			{"Elwood", "Who?"},
! 			{"Jake", "OUR BROTHER BRIAN!"},
! 			{"Elwood", "Our brother Brian? But we don't have another brother! Especially no Brian!"},
  			{"Jake", "He was adopted, now shut up and let me speak!"},
  			{"Elwood", "I can't believe mom and dad never told us..."},
  			{"Jake", "Told you..."},
  			{"Elwood", "What?"},
! 			{"Jake", "I can't believe mom and dad never told YOU."},
  			{"Elwood", "You mean you knew it all the time?"},
  			{"Jake", "Yes, but will you please shut up and let me speak!?"},
--- 68,79 ----
  			{"Elwood", "Who?"},
  			{"Jake", "Brian."},
! 			{"Elwood", "Brian who?"},
! 			{"Jake", "Our brother, Brian!"},
! 			{"Elwood", "I don't know about another brother, especially no Brian!"},
  			{"Jake", "He was adopted, now shut up and let me speak!"},
  			{"Elwood", "I can't believe mom and dad never told us..."},
  			{"Jake", "Told you..."},
  			{"Elwood", "What?"},
! 			{"Jake", "They never told YOU."},
  			{"Elwood", "You mean you knew it all the time?"},
  			{"Jake", "Yes, but will you please shut up and let me speak!?"},
***************
*** 145,149 ****
  			{"Jake", "Told you."},
  			{"Brian", "What?"},
! 			{"Jake", "I can't believe mom and dad never told YOU <sigh>."},
  			{"Brian", "You knew?"},
  			{"Brian", "Then again, I can't believe mom and dad never told him that he's adopted."},
--- 145,149 ----
  			{"Jake", "Told you."},
  			{"Brian", "What?"},
! 			{"Jake", "They never told YOU. <sigh>"},
  			{"Brian", "You knew?"},
  			{"Brian", "Then again, I can't believe mom and dad never told him that he's adopted."},
***************
*** 166,170 ****
  			{"Jake", "Told you."},
  			{"Brian", "What?"},
! 			{"Jake", "I can't believe mom and dad never told YOU <sigh>."},
  			{"Brian", "You knew?"},
  			{"Brian", "Then again, I can't believe mom and dad never told him that he's adopted."},
--- 166,170 ----
  			{"Jake", "Told you."},
  			{"Brian", "What?"},
! 			{"Jake", "They never told YOU. <sigh>"},
  			{"Brian", "You knew?"},
  			{"Brian", "Then again, I can't believe mom and dad never told him that he's adopted."},

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BBRpgLangDutch.lua	4 Jan 2004 00:43:12 -0000	1.3
--- BBRpgLangDutch.lua	4 Jan 2004 02:29:21 -0000	1.4
***************
*** 43,47 ****
  			{"Elwood", "Okee, maar wat is dit?"},
  			{"Jake", "Wat?"},
! 			{"Elwood", "Deze auto. Deze kutauto. Waar is de Cadillac? De Caddy? Waar is de Caddy?"},
  			{"Jake", "De wat?"},
  			{"Elwood", "De Cadillac die we vroeger hadden. Ons Blues Mobiel!"},
--- 43,47 ----
  			{"Elwood", "Okee, maar wat is dit?"},
  			{"Jake", "Wat?"},
! 			{"Elwood", "Deze auto. Deze kutauto. Waar is de Caddy?"},
  			{"Jake", "De wat?"},
  			{"Elwood", "De Cadillac die we vroeger hadden. Ons Blues Mobiel!"},
***************
*** 67,80 ****
  			{"Jake", "Brian."},
  			{"Elwood", "Wie?"},
! 			{"Jake", "ONZE BROER BRIAN!"},
! 			{"Elwood", "Onze broer Brian? Maar we hebben geen andere broer! Helemaal geen Brian!"},
  			{"Jake", "Hij is geadopteerd, nou je bek houden en me uit laten spreken!"},
! 			{"Elwood", "Ik kan maar niet begrijpen dat onze ouders het ons nooit verteld hebben..."},
  			{"Jake", "Het jou nooit verteld hebben..."},
  			{"Elwood", "Wat?"},
! 			{"Jake", "Ik kan maar niet begrijpen dat onze ouders het JOU nooit verteld hebben..."},
  			{"Elwood", "Je bedoeld dat jij het altijd al geweten hebt?"},
  			{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! 			{"Jake", "Maar 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!"},
--- 67,80 ----
  			{"Jake", "Brian."},
  			{"Elwood", "Wie?"},
! 			{"Jake", "Once broer, Brian!"},
! 			{"Elwood", "Ik weet niks van een derde broer! Al helemaal geen Brian!"},
  			{"Jake", "Hij is geadopteerd, nou je bek houden en me uit laten spreken!"},
! 			{"Elwood", "Ik begrijp niet dat onze ouders dat ons nooit verteld hebben..."},
  			{"Jake", "Het jou nooit verteld hebben..."},
  			{"Elwood", "Wat?"},
! 			{"Jake", "Ze hebben het JOU nooit verteld."},
  			{"Elwood", "Je bedoeld 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!"},

[Moeng-cvs] BBRpg/data/scripts MainMenu.lua,1.32,1.33

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

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

Modified Files:
	MainMenu.lua 
Log Message:
Stay there.

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** MainMenu.lua	4 Jan 2004 00:43:12 -0000	1.32
--- MainMenu.lua	4 Jan 2004 00:55:48 -0000	1.33
***************
*** 23,27 ****
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(jake, 33, 11, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
  			ActionPlaySong(cityMap.musicFilename, 100),
--- 23,27 ----
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
  			ActionPlaySong(cityMap.musicFilename, 100),

[Moeng-cvs] BBRpg README,1.5,1.6

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

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

Modified Files:
	README 
Log Message:
Some changes towards release.

Index: README
===================================================================
RCS file: /cvsroot/moeng/BBRpg/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	3 Jan 2004 16:31:15 -0000	1.5
--- README	4 Jan 2004 00:43:08 -0000	1.6
***************
*** 14,17 ****
--- 14,18 ----
  
  The game can be found on: http://www.rpgdx.net
+ Or on source forge:       http://www.sf.net/projects/moeng
  
  
***************
*** 63,66 ****
--- 64,70 ----
  - 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.
+ 
  
  -------------------
***************
*** 76,79 ****
--- 80,86 ----
  If the game runs choppy, try reducing the colordepth to 16 or 15 bit.
  
+ The sound section in the config file allows you to specify the volume of music
+ and sound effects seperately, or turn either off completely.
+ 
  
  -------
***************
*** 81,83 ****
  -------
  
! January, 2nd 8:00 (First public release)
--- 88,99 ----
  -------
  
! 1.1.0 - January, 4th (First post-compo release)
! 
! * Added the Blues music, the biggest thing missing in our previous version
! * Added some more sounds
! * Added Dutch translation
! * Added Quickstart option which skips intro
! * Fixed a few bugs
! 
! 
! 1.0.0 - January, 2nd (First public release)

[Moeng-cvs] BBRpg/data/scripts BBRpg.lua,1.25,1.26 BBRpgLangDutch.lua,1.2,1.3 MainMenu.lua,1.31,1.32 MessPile.lua,1.8,1.9

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

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

Modified Files:
	BBRpg.lua BBRpgLangDutch.lua MainMenu.lua MessPile.lua 
Log Message:
Some changes towards release.

Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** BBRpg.lua	3 Jan 2004 01:12:46 -0000	1.25
--- BBRpg.lua	4 Jan 2004 00:43:11 -0000	1.26
***************
*** 83,86 ****
--- 83,87 ----
  			bm = m_get_bitmap("bb_startup.bmp"),
  			alpha = 0,
+ 			drawMode = DM_TRANS,
  		}
  
***************
*** 95,108 ****
  
  	event_render = function(self)
! 		local width, height = m_screen_size()
  
  		if (show_main_menu) then
! 			self.canvas:setCursor(0,0)
  			self.canvas:setAlpha(main_menu_bg.alpha)
  			self.canvas:drawIcon(main_menu_bg.bm)
  		end
- 
- 		-- Set HUD to invisible while main menu is shown
- 		self.playerSwitcher.bVisible = not show_main_menu
  
  		Game.event_render(self)
--- 96,111 ----
  
  	event_render = function(self)
! 		-- Set HUD to invisible while main menu is shown
! 		self.playerSwitcher.bVisible = not show_main_menu
  
  		if (show_main_menu) then
! 			local width, height = m_screen_size()
! 			local w, h = m_bitmap_size(main_menu_bg.bm)
! 
! 			self.canvas:setDrawMode(main_menu_bg.drawMode)
! 			self.canvas:setCursor((width - w) / 2, (height - h) / 2)
  			self.canvas:setAlpha(main_menu_bg.alpha)
  			self.canvas:drawIcon(main_menu_bg.bm)
  		end
  
  		Game.event_render(self)

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BBRpgLangDutch.lua	3 Jan 2004 18:50:44 -0000	1.2
--- BBRpgLangDutch.lua	4 Jan 2004 00:43:12 -0000	1.3
***************
*** 189,194 ****
  			{"Lee", "Hallo daar."},
  			{"Elwood", "Dit is Lee?"},
! 			{"Jake", "Aannemende dat 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!"},
  		},
--- 189,194 ----
  			{"Lee", "Hallo daar."},
  			{"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!"},
  		},

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** MainMenu.lua	3 Jan 2004 20:08:34 -0000	1.31
--- MainMenu.lua	4 Jan 2004 00:43:12 -0000	1.32
***************
*** 23,27 ****
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
  			ActionPlaySong(cityMap.musicFilename, 100),
--- 23,27 ----
  			ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
  			ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
! 			ActionSetPosition(jake, 33, 11, DIR_UP, cityMap),
  			ActionSetCameraTarget(elwood, false),
  			ActionPlaySong(cityMap.musicFilename, 100),

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MessPile.lua	2 Jan 2004 08:35:15 -0000	1.8
--- MessPile.lua	4 Jan 2004 00:43:14 -0000	1.9
***************
*** 1,31 ****
! 
! import("Decoration.lua")
! 
! 
! MessPile = Decoration:subclass
! {
! 	name = "MessPile";
! 	bPlaceable = true;

! 	defaultproperties = {
! 		offset_x = -6,
! 		offset_y = 6,
! 		w = 2,
! 		h = 2,
! 		obstacle = 1,
! 		draw_mode = DM_ALPHA,
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		bitmap = m_get_bitmap("mess_pile.tga"),
  		convTableKeyword = "MessPile",
! 	}
! }
  
! MessPile2 = Decoration:subclass
! {
! 	name = "MessPile2";
! 	bPlaceable = true;
  	activatedBy = function(self, obj)
  		if self.containsEngines then
  			ActionController:addSequence{
  				ActionSetVariable(obj, "bWalkieTalkie", true),
  				ActionConversation(lang:getConv("FindMiniRocketEngines")),
--- 1,32 ----
! 
! import("Decoration.lua")
! 
! 
! MessPile = Decoration:subclass
! {
! 	name = "MessPile";
! 	bPlaceable = true;
! 	defaultproperties = {
! 		offset_x = -6,
! 		offset_y = 6,
! 		w = 2,
! 		h = 2,
! 		obstacle = 1,
! 		draw_mode = DM_ALPHA,
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		bitmap = m_get_bitmap("mess_pile.tga"),
  		convTableKeyword = "MessPile",
! 	}
! }
  
! MessPile2 = Decoration:subclass
! {
! 	name = "MessPile2";
! 	bPlaceable = true;
  	activatedBy = function(self, obj)
  		if self.containsEngines then
  			ActionController:addSequence{
+ 				ActionExModeOn(),
  				ActionSetVariable(obj, "bWalkieTalkie", true),
  				ActionConversation(lang:getConv("FindMiniRocketEngines")),
***************
*** 35,44 ****
  				ActionWait(100),
  				ActionFadeOutMap(100),
! 				ActionCallFunction(elwood.setMap, elwood, leesMap),
! 				ActionCallFunction(jake.setMap  ,   jake, leesMap),
! 				ActionCallFunction(brian.setMap ,  brian, leesMap),
! 				ActionSetPosition(brian, 30, 19, DIR_RIGHT),
! 				ActionSetPosition(jake, 31, 20, DIR_UP),
! 				ActionSetPosition(elwood, 32, 20, DIR_UP),
  				ActionSetVariable(jake, "bSleeping", false),
  				ActionSetVariable(elwood, "bSleeping", false),
--- 36,42 ----
  				ActionWait(100),
  				ActionFadeOutMap(100),
! 				ActionSetPosition(brian, 30, 19, DIR_RIGHT, leesMap),
! 				ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
! 				ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
  				ActionSetVariable(jake, "bSleeping", false),
  				ActionSetVariable(elwood, "bSleeping", false),
***************
*** 50,54 ****
  				ActionCallFunction(obj.removeFromInventory, obj, cityMap.engines),
  				ActionConversation(lang:getConv("Ending2")),
! 				ActionFadeOutMap(250),
  			}
  		else
--- 48,58 ----
  				ActionCallFunction(obj.removeFromInventory, obj, cityMap.engines),
  				ActionConversation(lang:getConv("Ending2")),
! 				ActionWait(100),
! 				ActionFadeOutMusic(200),
! 				ActionFadeOutMap(200),
! 				ActionSetVariable(_G, "show_main_menu", true),
! 				ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
! 				ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! 				ActionPlaySong("data/music/6.ogg", 10),
  			}
  		else
***************
*** 58,74 ****
  		end
  	end;
! 
  	defaultproperties = {
  		bCanActivate = true,
! 		containsEngines = true,
! 		offset_x = -6,
! 		offset_y = 6,
! 		w = 2,
! 		h = 2,
! 		obstacle = 1,
! 		draw_mode = DM_ALPHA,
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		bitmap = m_get_bitmap("mess_pile.tga"),
! 	}
! }
\ No newline at end of file
--- 62,78 ----
  		end
  	end;
! 
  	defaultproperties = {
  		bCanActivate = true,
! 		containsEngines = true,
! 		offset_x = -6,
! 		offset_y = 6,
! 		w = 2,
! 		h = 2,
! 		obstacle = 1,
! 		draw_mode = DM_ALPHA,
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		bitmap = m_get_bitmap("mess_pile.tga"),
! 	}
! }

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

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

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

Modified Files:
	rpg.cpp sound.cpp sound.h 
Log Message:
- Seperate music and sample volumes.
- Added music change to saving Brian.

Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rpg.cpp	3 Jan 2004 21:56:19 -0000	1.7
--- rpg.cpp	3 Jan 2004 22:41:02 -0000	1.8
***************
*** 108,115 ****
  	bVSync = get_config_int("Video", "VSync", 0);
  	
- #ifdef ENABLE_MUSIC
  	sound_enabled = (get_config_int("Sound", "EnableMusic", 1)) ? 1 : 0;
- #endif
  	sfx_enabled = (get_config_int("Sound", "EnableSfx", 1)) ? 1 : 0;
  
  	// Screen initialisation
--- 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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sound.cpp	3 Jan 2004 21:56:19 -0000	1.7
--- sound.cpp	3 Jan 2004 22:41:02 -0000	1.8
***************
*** 26,29 ****
--- 26,32 ----
  int sound_enabled = 1;
  int sfx_enabled = 1;
+ int sfx_vol = 255;
+ int music_vol = 255;
+ 
  
  #ifdef ENABLE_MUSIC
***************
*** 109,112 ****
--- 112,116 ----
  			}
  			channels[channel].ass = alogg_get_audio_stream(channels[channel].stream);
+ 			voice_set_volume(channels[channel].ass->voice, music_vol);
  		}
  
***************
*** 152,156 ****
  
  		if (error == NULL) {
! 			voice_set_volume(channels[channel].ass->voice, vol);
  			//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);
--- 156,160 ----
  
  		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);
***************
*** 245,249 ****
  		if (found_object) {
  			//int play_sample(const SAMPLE *spl, int vol, int pan, int freq, int loop);
! 			play_sample((SAMPLE*)found_object->dat, 255, 128, 1000, 0);
  		} else {
  			return luaL_error(L, "Error: Cannot find requested sample (%s)!", name);
--- 249,253 ----
  		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 {
  			return luaL_error(L, "Error: Cannot find requested sample (%s)!", name);

Index: sound.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sound.h	3 Jan 2004 21:56:19 -0000	1.5
--- sound.h	3 Jan 2004 22:41:02 -0000	1.6
***************
*** 23,26 ****
--- 23,28 ----
  extern int sound_enabled;
  extern int sfx_enabled;
+ extern int sfx_vol;
+ extern int music_vol;
  
  //#define DATASZ   (1 << 15) /* (32768) amount of data to read from disk each time */

[Moeng-cvs] BBRpg/data/scripts CellsObjects.lua,1.16,1.17

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

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

Modified Files:
	CellsObjects.lua 
Log Message:
- Seperate music and sample volumes.
- Added music change to saving Brian.

Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CellsObjects.lua	2 Jan 2004 08:35:15 -0000	1.16
--- CellsObjects.lua	3 Jan 2004 22:41:02 -0000	1.17
***************
*** 346,349 ****
--- 346,350 ----
  					ActionSetVariable(elwood, "bWalkieTalkie", false),
  					ActionSetVariable(brian, "bWalkieTalkie", false),
+ 					ActionFadeOutMusic(100),
  					ActionFadeOutMap(100),
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
***************
*** 352,355 ****
--- 353,357 ----
  					ActionSetVariable(jake, "bSleeping", false),
  					ActionSetVariable(elwood, "bSleeping", false),
+ 					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
  					ActionShowMapName(m_get_bitmap("jakesplace.tga")),
***************
*** 371,374 ****
--- 373,377 ----
  					ActionSetVariable(jake, "bWalkieTalkie", false),
  					ActionSetVariable(brian, "bWalkieTalkie", false),
+ 					ActionFadeOutMusic(100),
  					ActionFadeOutMap(100),
  					ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
***************
*** 377,380 ****
--- 380,384 ----
  					ActionSetVariable(jake, "bSleeping", false),
  					ActionSetVariable(elwood, "bSleeping", false),
+ 					ActionPlaySong(jakesMap.musicFilename, 100),
  					ActionFadeInMap(100),
  					ActionShowMapName(m_get_bitmap("jakesplace.tga")),

[Moeng-cvs] BBRpg rpg.cfg,1.5,1.6

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

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

Modified Files:
	rpg.cfg 
Log Message:
- Seperate music and sample volumes.
- Added music change to saving Brian.

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rpg.cfg	3 Jan 2004 21:56:19 -0000	1.5
--- rpg.cfg	3 Jan 2004 22:41:02 -0000	1.6
***************
*** 16,17 ****
--- 16,19 ----
  EnableMusic=1
  EnableSfx=1
+ MusicVolume=128
+ SfxVolume=255

[Moeng-cvs] BBRpg update.bat,1.1,1.2

[<mod...@us...>]

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

Modified Files:
	update.bat 
Log Message:
Add samples to datafile in Windows too.

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

[Moeng-cvs] BBRpg/src rpg.cpp,1.6,1.7 script.cpp,1.12,1.13 sound.cpp,1.6,1.7 sound.h,1.4,1.5

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

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

Modified Files:
	rpg.cpp script.cpp sound.cpp sound.h 
Log Message:
Now samples can always be played even if alogg is not available.

Index: rpg.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/rpg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rpg.cpp	3 Jan 2004 00:16:32 -0000	1.6
--- rpg.cpp	3 Jan 2004 21:56:19 -0000	1.7
***************
*** 27,31 ****
  END_OF_FUNCTION(handle_fps_counter);
  
! #ifdef ENABLE_SOUND
  int sound_counter = 0;
  #endif
--- 27,31 ----
  END_OF_FUNCTION(handle_fps_counter);
  
! #ifdef ENABLE_MUSIC
  int sound_counter = 0;
  #endif
***************
*** 108,114 ****
  	bVSync = get_config_int("Video", "VSync", 0);
  	
! 	#ifdef ENABLE_SOUND
  	sound_enabled = (get_config_int("Sound", "EnableMusic", 1)) ? 1 : 0;
! 	#endif
  
  	// Screen initialisation
--- 108,115 ----
  	bVSync = get_config_int("Video", "VSync", 0);
  	
! #ifdef ENABLE_MUSIC
  	sound_enabled = (get_config_int("Sound", "EnableMusic", 1)) ? 1 : 0;
! #endif
! 	sfx_enabled = (get_config_int("Sound", "EnableSfx", 1)) ? 1 : 0;
  
  	// Screen initialisation
***************
*** 173,182 ****
  	initScripting();
  
! #ifdef ENABLE_SOUND
! 	if (sound_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Initialising sound...");
  		init_sound();
  	}
- #endif
  
  	console.log(CON_LOG, CON_ALWAYS, "Installing timers...");
--- 174,181 ----
  	initScripting();
  
! 	if (sound_enabled || sfx_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Initialising sound...");
  		init_sound();
  	}
  
  	console.log(CON_LOG, CON_ALWAYS, "Installing timers...");
***************
*** 246,250 ****
  	console.update();
  
! 	#ifdef ENABLE_SOUND
  	if (sound_enabled && sound_counter == 0) {
  		poll_sound();
--- 245,249 ----
  	console.update();
  
! #ifdef ENABLE_MUSIC
  	if (sound_enabled && sound_counter == 0) {
  		poll_sound();
***************
*** 252,256 ****
  	}
  	sound_counter--;
! 	#endif
  }
  
--- 251,255 ----
  	}
  	sound_counter--;
! #endif
  }
  
***************
*** 310,319 ****
  	unload_datafile(bitmap_data);
  
! #ifdef ENABLE_SOUND
! 	if (sound_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Deinitializing sound...");
  		exit_sound();
  	}
- #endif
  
  	console.log(CON_LOG, CON_ALWAYS, "Destroying screen buffer...");
--- 309,316 ----
  	unload_datafile(bitmap_data);
  
! 	if (sound_enabled || sfx_enabled) {
  		console.log(CON_LOG, CON_ALWAYS, "Deinitializing sound...");
  		exit_sound();
  	}
  
  	console.log(CON_LOG, CON_ALWAYS, "Destroying screen buffer...");

Index: script.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/script.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** script.cpp	2 Jan 2004 00:03:01 -0000	1.12
--- script.cpp	3 Jan 2004 21:56:19 -0000	1.13
***************
*** 169,185 ****
  	lua_register(L, "m_make_noise",     l_make_noise);
  
! 	#ifdef ENABLE_SOUND
  	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);
! 	lua_register(L, "m_play_sample",    l_play_sample);
! 	#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);
  	lua_register(L, "m_get_number_of_channels", l_dummy);
! 	lua_register(L, "m_play_sample",    l_dummy);
! 	#endif
  
  	lua_register(L, "m_quit_game",      l_quit_game);
--- 169,184 ----
  	lua_register(L, "m_make_noise",     l_make_noise);
  
! 	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);
  	lua_register(L, "m_get_number_of_channels", l_dummy);
! #endif
  
  	lua_register(L, "m_quit_game",      l_quit_game);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sound.cpp	3 Jan 2004 16:31:15 -0000	1.6
--- sound.cpp	3 Jan 2004 21:56:19 -0000	1.7
***************
*** 10,19 ****
  */
  
- #ifdef ENABLE_SOUND
  
- #define ALOGG_DLL
  
  #include <allegro.h>
- #include <alogg/alogg.h>
  #include "shared/console.h"
  #include "sound.h"
--- 10,16 ----
***************
*** 22,28 ****
  #include "common.h"
  
! int sound_enabled = 1;
  
  
  // Currently playing OGG file
  struct {
--- 19,31 ----
  #include "common.h"
  
! #ifdef ENABLE_MUSIC
! #include <alogg/alogg.h>
! #endif
! 
  
+ int sound_enabled = 1;
+ int sfx_enabled = 1;
  
+ #ifdef ENABLE_MUSIC
  // Currently playing OGG file
  struct {
***************
*** 33,36 ****
--- 36,40 ----
  	char filename[128];
  } channels[CHANNELS];
+ #endif
  
  char *error;
***************
*** 47,51 ****
--- 51,57 ----
  
  	// Initialize alogg
+ #ifdef ENABLE_MUSIC
  	alogg_init();
+ #endif
  
  	// Install sound driver
***************
*** 55,58 ****
--- 61,65 ----
  	}
  
+ #ifdef ENABLE_MUSIC
  	// Initialize channels to NULL
  	for (int i = 0; i < CHANNELS; i++) {
***************
*** 62,68 ****
--- 69,78 ----
  		channels[i].ass = NULL;
  	}
+ #endif
  }
  
  
+ #ifdef ENABLE_MUSIC
+ 
  /* play_music(filename, channel)
   */
***************
*** 161,188 ****
  
  
! /* play_sample(filename)
!  */
! int l_play_sample(lua_State *L)
  {
! 	char* name;
! 	getLuaArguments(L, "s", &name);
! 
! 	if (sound_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, 255, 128, 1000, 0);
! 		} else {
! 			return luaL_error(L, "Error: Cannot find requested sample (%s)!", name);
  		}
  	}
- 
- 	return 0;
  }
  
- 
  void stop_music(int channel)
  {
--- 171,195 ----
  
  
! 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;
! 			}
  		}
  	}
  }
  
  void stop_music(int channel)
  {
***************
*** 221,247 ****
  }
  
! 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;
! 			}
  		}
  	}
  }
  
  void exit_sound()
  {
  	for (int i = 0; i < CHANNELS; i++) {
  		stop_music(i);
--- 228,260 ----
  }
  
! #endif
! 
! 
! /* play_sample(filename)
!  */
! int l_play_sample(lua_State *L)
  {
! 	char* name;
! 	getLuaArguments(L, "s", &name);
! 
! 	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, 255, 128, 1000, 0);
! 		} else {
! 			return luaL_error(L, "Error: Cannot find requested sample (%s)!", name);
  		}
  	}
+ 
+ 	return 0;
  }
  
  void exit_sound()
  {
+ #ifdef ENABLE_MUSIC
  	for (int i = 0; i < CHANNELS; i++) {
  		stop_music(i);
***************
*** 249,253 ****
  
  	alogg_exit();
  }
- 
- #endif // #ifdef ENABLE_SOUND
--- 262,265 ----
  
  	alogg_exit();
+ #endif
  }

Index: sound.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/sound.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sound.h	2 Jan 2004 00:03:01 -0000	1.4
--- sound.h	3 Jan 2004 21:56:19 -0000	1.5
***************
*** 13,23 ****
  #define _INCLUDED_SOUND_H_
  
- #ifdef ENABLE_SOUND
- 
  #include <allegro.h>
- #include <alogg/alogg.h>
  #include "script.h"
  
  extern int sound_enabled;
  
  //#define DATASZ   (1 << 15) /* (32768) amount of data to read from disk each time */
--- 13,26 ----
  #define _INCLUDED_SOUND_H_
  
  #include <allegro.h>
  #include "script.h"
  
+ #ifdef ENABLE_MUSIC
+ #include <alogg/alogg.h>
+ #endif
+ 
+ 
  extern int sound_enabled;
+ extern int sfx_enabled;
  
  //#define DATASZ   (1 << 15) /* (32768) amount of data to read from disk each time */
***************
*** 27,43 ****
  
  void init_sound();
! void poll_sound();
! void play_music(const char *filename);
! void stop_music(int channel);
  void exit_sound();
  
! 
! int l_play_sample(lua_State *L);
  int l_play_music(lua_State *L);
  int l_stop_music(lua_State *L);
  int l_adjust_channel(lua_State *L);
! int l_get_number_of_channels(lua_State *L);
  
- #endif // #ifdef ENABLE_SOUND
  
  #endif // #ifndef _INCLUDED_SOUND_H_
--- 30,46 ----
  
  void init_sound();
! int l_play_sample(lua_State *L);
  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);
! #endif
  
  
  #endif // #ifndef _INCLUDED_SOUND_H_

[Moeng-cvs] BBRpg configure,1.9,1.10 rpg.cfg,1.4,1.5

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

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

Modified Files:
	configure rpg.cfg 
Log Message:
Now samples can always be played even if alogg is not available.

Index: configure
===================================================================
RCS file: /cvsroot/moeng/BBRpg/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure	2 Jan 2004 01:00:05 -0000	1.9
--- configure	3 Jan 2004 21:56:19 -0000	1.10
***************
*** 182,186 ****
      if alogg-config --version >>$LOG 2>>$LOGERR ; then
  	LIBS_ENGINE="`alogg-config --libs` $LIBS_ENGINE"
! 	CPPFLAGS="$CPPFLAGS `alogg-config --cflags` -DENABLE_SOUND"
  	echo "yes"
      else
--- 182,186 ----
      if alogg-config --version >>$LOG 2>>$LOGERR ; then
  	LIBS_ENGINE="`alogg-config --libs` $LIBS_ENGINE"
! 	CPPFLAGS="$CPPFLAGS `alogg-config --cflags` -DENABLE_MUSIC"
  	echo "yes"
      else
***************
*** 214,218 ****
      # gelukt
      LIBS_ENGINE="-lalogg -logg -lvorbis -lvorbisfile -lvorbisenc $LIBS_ENGINE"
!     CPPFLAGS="$CPPFLAGS -DENABLE_SOUND"
      SOUND=true
      echo "yes"
--- 214,218 ----
      # gelukt
      LIBS_ENGINE="-lalogg -logg -lvorbis -lvorbisfile -lvorbisenc $LIBS_ENGINE"
!     CPPFLAGS="$CPPFLAGS -DENABLE_MUSIC"
      SOUND=true
      echo "yes"

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rpg.cfg	2 Jan 2004 02:49:56 -0000	1.4
--- rpg.cfg	3 Jan 2004 21:56:19 -0000	1.5
***************
*** 15,16 ****
--- 15,17 ----
  [Sound]
  EnableMusic=1
+ EnableSfx=1

[Moeng-cvs] BBRpg/data/scripts Pawn.lua,1.9,1.10

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

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

Modified Files:
	Pawn.lua 
Log Message:
Now samples can always be played even if alogg is not available.

Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Pawn.lua	3 Jan 2004 21:08:58 -0000	1.9
--- Pawn.lua	3 Jan 2004 21:56:19 -0000	1.10
***************
*** 57,61 ****
  			end
  
! 			-- A sample perhapt?
  			if (table.getn(self.hitSounds) > 0) then
  				local sampleFile = self.hitSounds[math.random(table.getn(self.hitSounds))]
--- 57,61 ----
  			end
  
! 			-- A scream perhaps?
  			if (table.getn(self.hitSounds) > 0) then
  				local sampleFile = self.hitSounds[math.random(table.getn(self.hitSounds))]

[Moeng-cvs] BBRpg/data/samples Ah1.wav,NONE,1.1 Au.wav,NONE,1.1 Au2.wav,NONE,1.1 Guhgh.wav,NONE,1.1 Heuw.wav,NONE,1.1 Hey.wav,NONE,1.1 Hoei.wav,NONE,1.1 Huuuw.wav,NONE,1.1 Ow1.wav,NONE,1.1

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

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

Added Files:
	Ah1.wav Au.wav Au2.wav Guhgh.wav Heuw.wav Hey.wav Hoei.wav 
	Huuuw.wav Ow1.wav 
Log Message:
Added some hit sounds (need more volume)

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

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

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

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

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

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

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

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

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

[Moeng-cvs] BBRpg/data/scripts Brian.lua,1.5,1.6 Elwood.lua,1.5,1.6 Jake.lua,1.4,1.5 Pawn.lua,1.8,1.9

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

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

Modified Files:
	Brian.lua Elwood.lua Jake.lua Pawn.lua 
Log Message:
Added some hit sounds (need more volume)

Index: Brian.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Brian.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Brian.lua	2 Jan 2004 04:49:53 -0000	1.5
--- Brian.lua	3 Jan 2004 21:08:58 -0000	1.6
***************
*** 1,16 ****
! 
! import("Player.lua")
! 
! Brian = Player:subclass
! {
! 	name = "Brian";
! 
! 	defaultproperties = {
  		draw_mode = DM_MASKED,
  		talkieBitmap = m_get_bitmap("brian_talk.bmp"),
  		deathBitmap = m_get_bitmap("brian_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_brian.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("brian.bmp"), 23, 40),
! 		free = false,
! 	};
  }
--- 1,21 ----
! 
! import("Player.lua")
! 
! Brian = Player:subclass
! {
! 	name = "Brian";
! 
! 	defaultproperties = {
  		draw_mode = DM_MASKED,
  		talkieBitmap = m_get_bitmap("brian_talk.bmp"),
  		deathBitmap = m_get_bitmap("brian_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_brian.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("brian.bmp"), 23, 40),
! 		free = false,
! 		hitSounds = {
! 			"Guhgh.wav",
! 			"Au.wav",
! 			"Ah1.wav",
! 		},
! 	};
  }

Index: Elwood.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Elwood.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Elwood.lua	1 Jan 2004 20:58:34 -0000	1.5
--- Elwood.lua	3 Jan 2004 21:08:58 -0000	1.6
***************
*** 12,15 ****
--- 12,22 ----
  		sleepBitmap  = m_get_bitmap("bed_elwood.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("elwood.bmp"), 23, 40),
+ 		hitSounds = {
+ 			"Au2.wav",
+ 			"Au2.wav",
+ 			"Ow1.wav",
+ 			"Ow1.wav",
+ 			"Huuuw.wav",
+ 		},
  	};
  }

Index: Jake.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Jake.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Jake.lua	1 Jan 2004 20:58:34 -0000	1.4
--- Jake.lua	3 Jan 2004 21:08:58 -0000	1.5
***************
*** 1,15 ****
! 
! import("Player.lua")
! 
! Jake = Player:subclass
! {
! 	name = "Jake";
! 
! 	defaultproperties = {
! 		draw_mode = DM_MASKED,
  		charAnim = extr_char_anim(m_get_bitmap("jake.bmp"), 23, 43),
  		talkieBitmap = m_get_bitmap("jake_talk.bmp"),
  		deathBitmap = m_get_bitmap("jake_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_jake.bmp"),
! 	};
  }
--- 1,20 ----
! 
! import("Player.lua")
! 
! Jake = Player:subclass
! {
! 	name = "Jake";
! 
! 	defaultproperties = {
! 		draw_mode = DM_MASKED,
  		charAnim = extr_char_anim(m_get_bitmap("jake.bmp"), 23, 43),
  		talkieBitmap = m_get_bitmap("jake_talk.bmp"),
  		deathBitmap = m_get_bitmap("jake_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_jake.bmp"),
! 		hitSounds = {
! 			"Hoei.wav",
! 			"Hey.wav",
! 			"Heuw.wav",
! 		},
! 	};
  }

Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Pawn.lua	31 Dec 2003 17:05:55 -0000	1.8
--- Pawn.lua	3 Jan 2004 21:08:58 -0000	1.9
***************
*** 57,60 ****
--- 57,66 ----
  			end
  
+ 			-- A sample perhapt?
+ 			if (table.getn(self.hitSounds) > 0) then
+ 				local sampleFile = self.hitSounds[math.random(table.getn(self.hitSounds))]
+ 				m_play_sample(sampleFile)
+ 			end
+ 
  			if (self.health <= 0 and not self.bDead) then
  				-- Pawn died
***************
*** 153,156 ****
--- 159,163 ----
  		bCenterBitmap = true,
  
+ 		hitSounds = {},
  		hitEffectClass = BloodSplat,
  		hitEffectHeight = 24,

[Moeng-cvs] BBRpg/data/scripts GuiMenu.lua,1.5,1.6 IngameMenu.lua,1.2,1.3 LanguageMenu.lua,1.1,1.2 MainMenu.lua,1.30,1.31

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

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

Modified Files:
	GuiMenu.lua IngameMenu.lua LanguageMenu.lua MainMenu.lua 
Log Message:
Language choice in game menu + menu height fix

Index: GuiMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/GuiMenu.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GuiMenu.lua	2 Jan 2004 02:49:56 -0000	1.5
--- GuiMenu.lua	3 Jan 2004 20:08:34 -0000	1.6
***************
*** 22,26 ****
  
  		-- Adjust menu size
! 		self.h = self.h + menuItem:getHeight()
  		self.w = math.max(self.w, menuItem:getWidth())
  	end;
--- 22,26 ----
  
  		-- Adjust menu size
! 		self.h = self.h + menuItem:getHeight() + 1
  		self.w = math.max(self.w, menuItem:getWidth())
  	end;
***************
*** 45,49 ****
  		end
  
! 		guiTheme:drawBox(self.x - 2, self.y - 2, self.w + 4, self.h + 6)
  
  		local curr = 0
--- 45,49 ----
  		end
  
! 		guiTheme:drawBox(self.x - 2, self.y - 2, self.w + 4, self.h + 3)
  
  		local curr = 0

Index: IngameMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/IngameMenu.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IngameMenu.lua	25 Dec 2003 20:50:41 -0000	1.2
--- IngameMenu.lua	3 Jan 2004 20:08:34 -0000	1.3
***************
*** 13,16 ****
--- 13,20 ----
  
  		self:addMenuItem(GuiMenuItem(lang:getVar("CONTINUE"), function() self.master:removeInteraction(self); end))
+ 		self:addMenuItem(GuiMenuItem(lang:getVar("LANGUAGE"), function()
+ 			self.master:addInteraction(LanguageMenu(self));
+ 			self.master:removeInteraction(self);
+ 		end))
  		self:addMenuItem(GuiMenuItem(lang:getVar("QUIT"),     function() self.master:removeInteraction(self); m_quit_game() end))
  	end;

Index: LanguageMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/LanguageMenu.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LanguageMenu.lua	3 Jan 2004 18:50:44 -0000	1.1
--- LanguageMenu.lua	3 Jan 2004 20:08:34 -0000	1.2
***************
*** 5,19 ****
  	name = "LanguageMenu";
  
! 	init = function(self)
  		GuiMenu.init(self)
  
  		self:addMenuItem(GuiMenuItem(BBRpgLang.defaultproperties.languageName, function()
  			lang = BBRpgLang()
! 			self.master:addInteraction(MainMenu())
  			self.master:removeInteraction(self)
  		end))
  		self:addMenuItem(GuiMenuItem(BBRpgLangDutch.defaultproperties.languageName, function()
  			lang = BBRpgLangDutch()
! 			self.master:addInteraction(MainMenu())
  			self.master:removeInteraction(self)
  		end))
--- 5,20 ----
  	name = "LanguageMenu";
  
! 	init = function(self, parentMenu)
  		GuiMenu.init(self)
+ 		self.parentMenu = parentMenu
  
  		self:addMenuItem(GuiMenuItem(BBRpgLang.defaultproperties.languageName, function()
  			lang = BBRpgLang()
! 			self.master:addInteraction(_G[parentMenu.name]())
  			self.master:removeInteraction(self)
  		end))
  		self:addMenuItem(GuiMenuItem(BBRpgLangDutch.defaultproperties.languageName, function()
  			lang = BBRpgLangDutch()
! 			self.master:addInteraction(_G[parentMenu.name]())
  			self.master:removeInteraction(self)
  		end))
***************
*** 26,30 ****
  		if (key == "esc") then
  			-- Return without switching language
! 			self.master:addInteraction(MainMenu())
  			self.master:removeInteraction(self)
  			return true
--- 27,31 ----
  		if (key == "esc") then
  			-- Return without switching language
! 			self.master:addInteraction(self.parentMenu)
  			self.master:removeInteraction(self)
  			return true

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** MainMenu.lua	3 Jan 2004 18:50:44 -0000	1.30
--- MainMenu.lua	3 Jan 2004 20:08:34 -0000	1.31
***************
*** 154,158 ****
  		end))
  		self:addMenuItem(GuiMenuItem(lang:getVar("LANGUAGE"), function()
! 			self.master:addInteraction(LanguageMenu());
  			self.master:removeInteraction(self);
  		end))
--- 154,158 ----
  		end))
  		self:addMenuItem(GuiMenuItem(lang:getVar("LANGUAGE"), function()
! 			self.master:addInteraction(LanguageMenu(self));
  			self.master:removeInteraction(self);
  		end))