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