Menu
▾
▴
[Civ4ccp-svn] SF.net SVN: civ4ccp: [40] CvGameCoreDLL
|
From: <imp...@us...> - 2007-03-12 21:53:01
|
Revision: 40
http://civ4ccp.svn.sourceforge.net/civ4ccp/?rev=40&view=rev
Author: impalerwrg
Date: 2007-03-12 14:52:58 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Incremental TR merger Area.cpp, Player.cpp
Modified Paths:
--------------
CvGameCoreDLL/CvArea.cpp
CvGameCoreDLL/CvGameCoreDLL.depend
CvGameCoreDLL/CvGameTextMgr.cpp
CvGameCoreDLL/CvPlayer.cpp
CvGameCoreDLL/CvXMLLoadUtility.cpp
Modified: CvGameCoreDLL/CvArea.cpp
===================================================================
--- CvGameCoreDLL/CvArea.cpp 2007-03-12 21:31:25 UTC (rev 39)
+++ CvGameCoreDLL/CvArea.cpp 2007-03-12 21:52:58 UTC (rev 40)
@@ -326,19 +326,17 @@
bool CvArea::isLake() const
{
- // Mongoose LakeSizeMod BEGIN
+ // < LakeSizeMod by Mongoose Start >
// ORIGINAL CODE return (isWater() && (getNumTiles() <= GC.getDefineINT("LAKE_MAX_AREA_SIZE")));
- //
+
if (!isWater())
- {
return false;
- }
int iWorldFactor = GC.getNumWorldInfos() - 1;
int iLakeTiles = ((iWorldFactor + (GC.getMapINLINE().getWorldSize() * 3)) * GC.getDefineINT("LAKE_MAX_AREA_SIZE")) / iWorldFactor;
return (getNumTiles() <= iLakeTiles);
- //
- // Mongoose LakeSizeMod END
+
+ // < LakeSizeMod End >
}
Modified: CvGameCoreDLL/CvGameCoreDLL.depend
===================================================================
--- CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:31:25 UTC (rev 39)
+++ CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:52:58 UTC (rev 40)
@@ -26818,7 +26818,7 @@
"CvGameTextMgr.h"
"CvGameCoreUtils.h"
-1173731815 c:\sdk\cccp dll\cvarea.cpp
+1173611507 c:\sdk\cccp dll\cvarea.cpp
"CvGameCoreDLL.h"
"CvArea.h"
"CvMap.h"
@@ -31055,12 +31055,12 @@
"LinkedList.h"
<bitset>
-1173731815 c:\sdk\cccp dll\cvglobals.h
+1173729039 c:\sdk\cccp dll\cvglobals.h
1173731815 c:\sdk\cccp dll\cvgameai.h
"CvGame.h"
-1173732719 c:\sdk\cccp dll\cvgame.h
+1173729085 c:\sdk\cccp dll\cvgame.h
"CvDeal.h"
"CvRandom.h"
@@ -31134,7 +31134,7 @@
"CvInfos.h"
"CvGlobals.h"
-1173731815 c:\sdk\cccp dll\cvcity.cpp
+1173735677 c:\sdk\cccp dll\cvcity.cpp
"CvGameCoreDLL.h"
"CvGlobals.h"
"CvCity.h"
@@ -31362,7 +31362,7 @@
1173731815 c:\sdk\cccp dll\fastarnode.h
-1173731815 c:\sdk\cccp dll\cvgametextmgr.cpp
+1173611322 c:\sdk\cccp dll\cvgametextmgr.cpp
"CvGameCoreDLL.h"
"CvGameTextMgr.h"
"CvGameCoreUtils.h"
@@ -31386,7 +31386,7 @@
"CvDLLUtilityIFaceBase.h"
"CvGlobals.h"
-1173731815 c:\sdk\cccp dll\cvglobals.cpp
+1173735260 c:\sdk\cccp dll\cvglobals.cpp
"CvGameCoreDLL.h"
"CvGlobals.h"
"CvRandom.h"
@@ -31493,7 +31493,7 @@
"CvDLLPythonIFaceBase.h"
"FProfiler.h"
-1173731816 c:\sdk\cccp dll\cvplayer.cpp
+1173735260 c:\sdk\cccp dll\cvplayer.cpp
"CvGameCoreDLL.h"
"CvGlobals.h"
"CvArea.h"
@@ -31749,7 +31749,7 @@
"FProfiler.h"
"FAStarNode.h"
-1173731815 c:\sdk\cccp dll\cvxmlloadutility.cpp
+1173671134 c:\sdk\cccp dll\cvxmlloadutility.cpp
"CvGameCoreDLL.h"
"CvDLLXMLIFaceBase.h"
"CvXMLLoadUtility.h"
Modified: CvGameCoreDLL/CvGameTextMgr.cpp
===================================================================
--- CvGameCoreDLL/CvGameTextMgr.cpp 2007-03-12 21:31:25 UTC (rev 39)
+++ CvGameCoreDLL/CvGameTextMgr.cpp 2007-03-12 21:52:58 UTC (rev 40)
@@ -572,8 +572,7 @@
szString += NEWLINE + gDLL->getText("TXT_KEY_UNIT_CAN_MOVE_IMPASSABLE");
}
- // Update by Mexico 10.1.2007
- // support to show flying tag
+ // support to show flying tag by Mexico
if (pUnit->isFlying())
{
szString += NEWLINE + gDLL->getText("TXT_KEY_UNIT_FLYING");
@@ -4250,8 +4249,7 @@
}
}
- // Update by Mexico 10.1.2007
- // support to show flying tag
+ // support to show flying tag by Mexico
if (GC.getUnitInfo(eUnit).isFlying())
{
szBuffer += NEWLINE + gDLL->getText("TXT_KEY_UNIT_FLYING");
@@ -5082,8 +5080,7 @@
}
}
- // Start Update by Mexico
- // show this only in civpedia
+ // < Replaced By Unit Start >, modified by Mexico (show only in civpedia)
if (bCivilopediaText)
{
// Start Update by Impaler[WrG]
@@ -5104,7 +5101,8 @@
}
}
}
- // End
+ // < Replaced By Unit End >
+
}
void CvGameTextMgr::setBuildingHelp(CvWString &szBuffer, BuildingTypes eBuilding, bool bCivilopediaText, bool bStrategyText, bool bTechChooserText, CvCity* pCity)
@@ -6300,8 +6298,7 @@
}
}
- // Start Update by Mexico
- // Replace by text for unique buildings, based on Lopez's Unit replaced by
+ // < Replaced By Unit Start , modified for buildings by Mexico>
if (bCivilopediaText)
{
// Start Update by Impaler[WrG]
@@ -6321,7 +6318,8 @@
}
}
}
- // End
+ // < Replaced By Unit End , modified for buildings by Mexico >
+
}
@@ -7129,10 +7127,12 @@
szBuffer += gDLL->getText("TXT_KEY_HAPPY_RELIGIOUS_FREEDOM", iHappy) + NEWLINE;
}
- //Start Change MoreCommerceTypes v1.0 Impaler[WrG] 5/10/06
- // Original code iHappy = city.getCommerceHappiness();
- iHappy = city.getCommerceRate(COMMERCE_HAPPY) + city.getCommerceHappiness();
- //End Change
+ iHappy = city.getCommerceHappiness();
+
+ // < Start MoreCommerceTypes by Impaler[WrG] >
+ iHappy += city.getCommerceRate(COMMERCE_HAPPY);
+ // < End MoreCommerceTypes
+
if (iHappy > 0)
{
iTotalHappy += iHappy;
Modified: CvGameCoreDLL/CvPlayer.cpp
===================================================================
--- CvGameCoreDLL/CvPlayer.cpp 2007-03-12 21:31:25 UTC (rev 39)
+++ CvGameCoreDLL/CvPlayer.cpp 2007-03-12 21:52:58 UTC (rev 40)
@@ -8607,7 +8607,7 @@
if (m_iCombatExperience >= iExperienceThreshold && iExperienceThreshold > 0)
{
ORIGINAL CODE END */
-
+
if (iExperience == getCombatExperience())
{
return;
Modified: CvGameCoreDLL/CvXMLLoadUtility.cpp
===================================================================
--- CvGameCoreDLL/CvXMLLoadUtility.cpp 2007-03-12 21:31:25 UTC (rev 39)
+++ CvGameCoreDLL/CvXMLLoadUtility.cpp 2007-03-12 21:52:58 UTC (rev 40)
@@ -488,7 +488,10 @@
int i;
CvString* pszStringArray;
- FAssertMsg(*ppszStringArray == NULL, "Possible memory leak");
+ //FAssertMsg(*ppszStringArray == NULL, "Possible memory leak");
+ SAFE_DELETE_ARRAY(*ppszStringArray);
+ // TODO create some kind of vector here perhaps to apped string lists
+
*piSize = gDLL->getXMLIFace()->GetNumChildren(m_pFXml);
*ppszStringArray = NULL;
if (*piSize > 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
