[Civ4mods-svn] SF.net SVN: civ4mods:[4711] realism/bts/trunk/mod/Assets/Python

[<cru...@us...>]

Revision: 4711
          http://sourceforge.net/p/civ4mods/code/4711
Author:   cruel100
Date:     2014-03-18 19:06:22 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
*fix for re-name bug in Worldbuilder (Thanks Jourin) - seens work right but need more tests.

Modified Paths:
--------------
    realism/bts/trunk/mod/Assets/Python/CvEventManager.py
    realism/bts/trunk/mod/Assets/Python/Screens/PlatyBuilder/WBCityEditScreen.py

Modified: realism/bts/trunk/mod/Assets/Python/CvEventManager.py
===================================================================
--- realism/bts/trunk/mod/Assets/Python/CvEventManager.py	2014-03-16 14:35:21 UTC (rev 4710)
+++ realism/bts/trunk/mod/Assets/Python/CvEventManager.py	2014-03-18 19:06:22 UTC (rev 4711)
@@ -1116,7 +1116,7 @@
 				
 	def __eventEditCityNameBegin(self, city, bRename):
 		popup = PyPopup.PyPopup(CvUtil.EventEditCityName, EventContextTypes.EVENTCONTEXT_ALL)
-		popup.setUserData((city.getID(), bRename))
+		popup.setUserData((city.getID(), bRename, CyGame().getActivePlayer()))
 		popup.setHeaderString(localText.getText("TXT_KEY_NAME_CITY", ()))
 		popup.setBodyString(localText.getText("TXT_KEY_SETTLE_NEW_CITY_NAME", ()))
 		popup.createEditBox(city.getName())
@@ -1124,19 +1124,13 @@
 		popup.launch()
 	
 	def __eventEditCityNameApply(self, playerID, userData, popupReturn):	
-		'Edit City Name Event'
-		iCityID = userData[0]
-		bRename = userData[1]
-		player = gc.getPlayer(playerID)
-		city = player.getCity(iCityID)
+		city = gc.getPlayer(userData[2]).getCity(userData[0])
 		cityName = popupReturn.getEditBoxString(0)
-		if (len(cityName) > 30):
-			cityName = cityName[:30]
-		city.setName(cityName, not bRename)
+		city.setName(cityName, not userData[1])
 ## Platy Builder ##
 		if CyGame().GetWorldBuilderMode() and not CyGame().isInAdvancedStart():
-			WBCityEditScreen.WBCityEditScreen().placeStats()
-## Platy Builder ##
+			WBCityEditScreen.WBCityEditScreen(CvPlatyBuilderScreen.CvWorldBuilderScreen()).placeStats()
+# Platy Builder ##
 
 	def __eventPlaceObjectBegin(self, argsList):
 		'Place Object Event'

Modified: realism/bts/trunk/mod/Assets/Python/Screens/PlatyBuilder/WBCityEditScreen.py
===================================================================
--- realism/bts/trunk/mod/Assets/Python/Screens/PlatyBuilder/WBCityEditScreen.py	2014-03-16 14:35:21 UTC (rev 4710)
+++ realism/bts/trunk/mod/Assets/Python/Screens/PlatyBuilder/WBCityEditScreen.py	2014-03-18 19:06:22 UTC (rev 4711)
@@ -61,7 +61,7 @@
 
 	def placeStats(self):
 		screen = CyGInterfaceScreen( "WBCityEditScreen", CvScreenEnums.WB_CITYEDIT)
-		screen.setText("CityName", "Background", "<font=4b>" + pCity.getName() + " (ID: " + str(pCity.getID()) + ")</font>", CvUtil.FONT_CENTER_JUSTIFY, screen.getXResolution()/2, 20, -0.1, FontTypes.GAME_FONT, WidgetTypes.WIDGET_CITY_NAME, -1, -1)
+		screen.setText("CityName", "Background", "<font=4b>" + pCity.getName() + "</font>", CvUtil.FONT_CENTER_JUSTIFY, screen.getXResolution()/2, 20, -0.1, FontTypes.GAME_FONT, WidgetTypes.WIDGET_CITY_NAME, -1, -1)
 		global iPlayer
 		global pPlayer
 		iPlayer = pCity.getOwner()
@@ -329,7 +329,7 @@
 
 		elif inputClass.getFunctionName() == "CityName":
 			popup = Popup.PyPopup(CvUtil.EventEditCityName, EventContextTypes.EVENTCONTEXT_ALL)
-			popup.setUserData((pCity.getID(), True))
+			popup.setUserData((pCity.getID(), True, pCity.getOwner()))
 			popup.setHeaderString(CyTranslator().getText("TXT_KEY_NAME_CITY", ()))
 			popup.setBodyString(CyTranslator().getText("TXT_KEY_SETTLE_NEW_CITY_NAME", ()))
 			popup.createEditBox(pCity.getName())

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