[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