[Gemrb-commits] SF.net SVN: gemrb:[5387] gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py

[<ave...@us...>]

Revision: 5387
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5387&view=rev
Author:   avenger_teambg
Date:     2008-10-04 11:46:19 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
fixed problem with worldmap (didn't reenable gamecontrol)

Modified Paths:
--------------
    gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py

Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-10-04 11:18:46 UTC (rev 5386)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py	2008-10-04 11:46:19 UTC (rev 5387)
@@ -39,7 +39,7 @@
 
 	if CloseOtherWindow (ShowMap):
 		GemRB.UnloadWindow (MapWindow)
-		GemRB.UnloadWindow (OptionsWindow) ;
+		GemRB.UnloadWindow (OptionsWindow)
 
 		MapWindow = None
 		#this window type should block the game
@@ -147,18 +147,18 @@
 	GemRB.SetVisible (Window, 1)
 	GemRB.SetVisible (PortraitWindow, 1)
 	GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED)
+	return
 
-
 def LeftDoublePressMap ():
 	print "MoveToPoint"
 	return
 
 def OpenWorldMapWindowInside ():
+	OpenMapWindow () #closes mapwindow
 	WorldMapWindowCommon (-1)
 	return
 
 def OpenWorldMapWindow ():
-	OpenMapWindow() #closes MapWindow
 	WorldMapWindowCommon (GemRB.GetVar ("Travel"))
 	return
 
@@ -166,18 +166,15 @@
 	global WorldMapWindow, WorldMapControl
 
 	tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl)
-	print tmp
 	CloseWorldMapWindow ()
 	GemRB.CreateMovement (tmp["Destination"], tmp["Entrance"])
 	return
 
-
 def ChangeTooltip ():
 	global WorldMapWindow, WorldMapControl
 	global str
 
 	tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl)
-	print tmp
 	if (tmp):
 		str = "%s: %d"%(GemRB.GetString(23084),tmp["Distance"])
 	else:
@@ -186,8 +183,7 @@
 	GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str)
 	return
 
-
-def CloseWorldMapWindow():
+def CloseWorldMapWindow ():
 	global WorldMapWindow, WorldMapControl
 
 	GemRB.UnloadWindow (WorldMapWindow)
@@ -197,7 +193,6 @@
 	GemRB.UnhideGUI ()
 	return
 
-
 def WorldMapWindowCommon (Travel):
 	global WorldMapWindow, WorldMapControl
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.