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