[Moeng-cvs] BBRpg/data/scripts BBRpgConversationWindow.lua,1.1.1.1,1.2 ConversationWindow.lua,1.5,1.6 FenceSewers.lua,1.4,1.5 GuiTheme.lua,1.7,1.8

[Bj?rn L. <b_l...@us...>]

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28988/data/scripts

Modified Files:
	BBRpgConversationWindow.lua ConversationWindow.lua 
	FenceSewers.lua GuiTheme.lua 
Log Message:
Merged engine changes from DGE RPG agian.


Index: FenceSewers.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/FenceSewers.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FenceSewers.lua	28 Dec 2003 15:49:45 -0000	1.4
--- FenceSewers.lua	25 Apr 2004 16:39:52 -0000	1.5
***************
*** 1,168 ****
! -- 
! -- The Fences in the Sewers.
! -- By Georg Muntingh
! 
! import("Decoration.lua")
! 
! 
! FenceH3 = Decoration:subclass
! {
! 	name = "FenceH3";
! 
! 	init = function(self)
! 		self:updateBitmap()
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
! 	
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 3,
! 		draw_mode = DM_MASKED,
  		bitmaps = extr_array(m_get_bitmap("fence_h3.bmp"), 73, 60),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceH5 = Decoration:subclass
! {
! 	name = "FenceH5";
! 
! 	init = function(self)
! 		self:updateBitmap()
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
! 	
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 5,
! 		draw_mode = DM_MASKED,
! 		bitmaps = extr_array(m_get_bitmap("fence_h5.bmp"), 121, 60),
! 		bitmap = m_get_bitmap("Fence_h5.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceH7 = Decoration:subclass
! {
! 	name = "FenceH7";
! 
! 	init = function(self)
! 		self.bitmap = self.bitmaps[1]
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
  
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
  		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 7,
! 		draw_mode = DM_MASKED,
! 		bitmaps = extr_array(m_get_bitmap("fence_h7.bmp"), 169, 60),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceV8 = Decoration:subclass
! {
! 	name = "FenceV8";
! 
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		offset_y = -34,
  		offset_x = 5,
! 		obstacle = 1,
! 		w = 1,
! 		h = 8,
! 		draw_mode = DM_MASKED,
! 		bitmap = m_get_bitmap("Fence_v8.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceV7 = Decoration:subclass
! {
! 	name = "FenceV7";
! 
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		offset_y = -33,
! 		obstacle = 1,
! 		w = 1,
! 		h = 7,
! 		draw_mode = DM_MASKED,
! 		bitmap = m_get_bitmap("Fence_v7.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
  }
--- 1,168 ----
! -- 
! -- The Fences in the Sewers.
! -- By Georg Muntingh
! 
! import("Decoration.lua")
! 
! 
! FenceH3 = Decoration:subclass
! {
! 	name = "FenceH3";
! 
! 	init = function(self)
! 		self:updateBitmap()
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
! 	
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 3,
! 		draw_mode = DM_MASKED,
  		bitmaps = extr_array(m_get_bitmap("fence_h3.bmp"), 73, 60),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
  
! FenceH5 = Decoration:subclass
! {
! 	name = "FenceH5";
! 
! 	init = function(self)
! 		self:updateBitmap()
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
! 	
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
  		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 5,
! 		draw_mode = DM_MASKED,
! 		bitmaps = extr_array(m_get_bitmap("fence_h5.bmp"), 121, 60),
! 		bitmap = m_get_bitmap("fence_h5.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceH7 = Decoration:subclass
! {
! 	name = "FenceH7";
! 
! 	init = function(self)
! 		self.bitmap = self.bitmaps[1]
! 		Decoration.init(self)
! 	end;
! 
! 	switch = function(self)
! 		if (self.isOpen == false) then
! 			self.isOpen = true
! 			self.obstacle = 0
! 		else
! 			self.isOpen = false
! 			self.obstacle = 1
! 		end
! 
! 		self:updateBitmap()
! 	end;
! 
! 	updateBitmap = function(self)
! 		if (self.isOpen == false) then
! 			self.bitmap = self.bitmaps[1]
! 		else
! 			self.bitmap = self.bitmaps[2]
! 		end
! 	end;
! 
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		isOpen = false,
! 		obstacle = 1,
! 		h = 1,
! 		w = 7,
! 		draw_mode = DM_MASKED,
! 		bitmaps = extr_array(m_get_bitmap("fence_h7.bmp"), 169, 60),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceV8 = Decoration:subclass
! {
! 	name = "FenceV8";
! 
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		offset_y = -34,
  		offset_x = 5,
! 		obstacle = 1,
! 		w = 1,
! 		h = 8,
! 		draw_mode = DM_MASKED,
! 		bitmap = m_get_bitmap("fence_v8.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
! }
! 
! FenceV7 = Decoration:subclass
! {
! 	name = "FenceV7";
! 
! 	defaultproperties = {
! 		bCenterBitmap = false,
! 		bCenterOnTile = false,
! 		offset_y = -33,
! 		obstacle = 1,
! 		w = 1,
! 		h = 7,
! 		draw_mode = DM_MASKED,
! 		bitmap = m_get_bitmap("fence_v7.bmp"),
! 		convTableKeyword = "CantPassFence",
! 	}
  }

Index: BBRpgConversationWindow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgConversationWindow.lua,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BBRpgConversationWindow.lua	7 Dec 2003 02:17:16 -0000	1.1.1.1
--- BBRpgConversationWindow.lua	25 Apr 2004 16:39:52 -0000	1.2
***************
*** 15,19 ****
  		
  		-- Get and set some sizes
! 		self.font = "font_sansserif8.pcx"
  		m_set_font(self.font)
  		self.space_width, self.line_height = m_text_size(" ")
--- 15,19 ----
  		
  		-- Get and set some sizes
! 		self.font = "font_sansserif_8"
  		m_set_font(self.font)
  		self.space_width, self.line_height = m_text_size(" ")

Index: GuiTheme.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/GuiTheme.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GuiTheme.lua	13 Apr 2004 12:26:08 -0000	1.7
--- GuiTheme.lua	25 Apr 2004 16:39:52 -0000	1.8
***************
*** 80,86 ****
  
  		m_set_cursor(x, y + self.borderWidth)
! 		self.canvas:drawRect(bl, self.borderWidth,           h - (self.borderWidth * 2))
  		self.canvas:drawRect(bg, w - (self.borderWidth * 2), h - (self.borderWidth * 2))
! 		self.canvas:drawRect(br, self.borderWidth,           h - (self.borderWidth * 2))
  
  		m_set_cursor(x, y + h - self.borderWidth)
--- 80,86 ----
  
  		m_set_cursor(x, y + self.borderWidth)
! 		self.canvas:drawRect(bl, self.borderWidth, h - (self.borderWidth * 2))
  		self.canvas:drawRect(bg, w - (self.borderWidth * 2), h - (self.borderWidth * 2))
! 		self.canvas:drawRect(br, self.borderWidth, h - (self.borderWidth * 2))
  
  		m_set_cursor(x, y + h - self.borderWidth)
***************
*** 94,98 ****
  	{
  		bitmap = m_get_bitmap("gui_green.bmp"),
! 		font = "font_sansserif8.pcx",
  		borderWidth = 2,
  		canvas = nil,
--- 94,98 ----
  	{
  		bitmap = m_get_bitmap("gui_green.bmp"),
! 		font = "font_sansserif_8",
  		borderWidth = 2,
  		canvas = nil,

Index: ConversationWindow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ConversationWindow.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConversationWindow.lua	13 Apr 2004 12:26:08 -0000	1.5
--- ConversationWindow.lua	25 Apr 2004 16:39:52 -0000	1.6
***************
*** 57,61 ****
  	init = function(self)
  		-- Get and set some sizes
! 		self.font = "font_sansserif8.pcx"
  		m_set_font(self.font)
  		self.space_width, self.line_height = m_text_size(" ")
--- 57,61 ----
  	init = function(self)
  		-- Get and set some sizes
! 		self.font = "font_sansserif_8"
  		m_set_font(self.font)
  		self.space_width, self.line_height = m_text_size(" ")