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

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

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

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

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

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