Refactored bad coding for DrawWidthFactor and DrawHeightFactor

Author: IamInnocent3X

Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h

@@ -233,10 +233,8 @@ class WorldHeightMap : public RefCountClass,
 	Int getDrawOrgX(void) {return m_drawOriginX;}
 	Int getDrawOrgY(void) {return m_drawOriginY;}
 
-	//Int getDrawWidth(void) {return REAL_TO_INT(m_drawWidthX*TheGlobalData->m_drawWidthFactor);}
-	//Int getDrawHeight(void) {return REAL_TO_INT(m_drawHeightY*TheGlobalData->m_drawHeightFactor);}
-	Int getDrawWidth(void);
-	Int getDrawHeight(void);
+	Int getDrawWidth(void) {return m_drawWidthX;}
+	Int getDrawHeight(void) {return m_drawHeightY;}
 	void setDrawWidth(Int width) {m_drawWidthX = width; if (m_drawWidthX>m_width) m_drawWidthX = m_width;}
 	void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;}
 	virtual Int getBorderSize(void) {return m_borderSize;}

Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp

@@ -531,9 +531,26 @@ WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly):
 			}
 		}
 	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		m_drawWidthX=m_width;
-		m_drawHeightY=m_height;
+	if (TheGlobalData) {
+		if( TheGlobalData->m_drawEntireTerrain ){
+			m_drawWidthX=m_width;
+			m_drawHeightY=m_height;
+		} else {
+			if(TheGlobalData->m_drawWidthFactor != 1.0f)
+			{
+				if(m_drawWidthX*TheGlobalData->m_drawWidthFactor >= m_width)
+					m_drawWidthX=m_width;
+				else
+					m_drawWidthX=REAL_TO_INT_FLOOR(m_drawWidthX*TheGlobalData->m_drawWidthFactor);
+			}
+			if(TheGlobalData->m_drawHeightFactor != 1.0f)
+			{
+				if(m_drawHeightY*TheGlobalData->m_drawHeightFactor >= m_height)
+					m_drawHeightY=m_height;
+				else
+					m_drawHeightY=REAL_TO_INT_FLOOR(m_drawHeightY*TheGlobalData->m_drawHeightFactor);
+			}
+		}
 	}
 	if (m_drawWidthX > m_width) {
 		m_drawWidthX = m_width;
@@ -2239,9 +2256,26 @@ Bool WorldHeightMap::setDrawOrg(Int xOrg, Int yOrg)
 		newWidth=STRETCH_DRAW_WIDTH;
 		newHeight=STRETCH_DRAW_HEIGHT;
 	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		newWidth=m_width;
-		newHeight=m_height;
+	if (TheGlobalData) {
+		if( TheGlobalData->m_drawEntireTerrain ){
+			newWidth=m_width;
+			newHeight=m_height;
+		} else {
+			if(TheGlobalData->m_drawWidthFactor != 1.0f)
+			{
+				if(newWidth*TheGlobalData->m_drawWidthFactor >= m_width)
+					newWidth=m_width;
+				else
+					newWidth=REAL_TO_INT_FLOOR(newWidth*TheGlobalData->m_drawWidthFactor);
+			}
+			if(TheGlobalData->m_drawHeightFactor != 1.0f)
+			{
+				if(newHeight*TheGlobalData->m_drawHeightFactor >= m_height)
+					newHeight=m_height;
+				else
+					newHeight=REAL_TO_INT_FLOOR(newHeight*TheGlobalData->m_drawHeightFactor);
+			}
+		}
 	}
 	if (newWidth > m_width) newWidth = m_width;
 	if (newHeight > m_height) newHeight = m_height;
@@ -2557,25 +2591,3 @@ Bool  WorldHeightMap::getRawTileData(Short tileNdx, Int width,
 	}
 	return(false);
 }
-
-Int WorldHeightMap::getDrawWidth(void)
-{
-	if(TheGlobalData->m_drawEntireTerrain)
-		return m_drawWidthX;
-
-	if(m_drawWidthX*TheGlobalData->m_drawWidthFactor >= m_width || m_drawWidthX  >= m_width )
-		return m_width;
-	else 
-		return REAL_TO_INT(m_drawWidthX*TheGlobalData->m_drawWidthFactor);
-}
-
-Int WorldHeightMap::getDrawHeight(void)
-{
-	if(TheGlobalData->m_drawEntireTerrain)
-		return m_drawHeightY;
-
-	if(m_drawHeightY*TheGlobalData->m_drawHeightFactor >= m_height || m_drawHeightY >= m_height )
-		return m_height;
-	else 
-		return REAL_TO_INT(m_drawHeightY*TheGlobalData->m_drawHeightFactor);
-}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp

@@ -1462,6 +1462,8 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			return 0;
 		}
 	}
+
+	const ThingTemplate *projectileTemplate = getProjectileTemplate();
 
 	// New feature, similar to Black Hole Armor.
 	Object* retarget = NULL;
@@ -1471,7 +1473,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 	{
 		ProtectionTypeFlags ShieldedType = victimObj->getShieldByTargetType();
 		Bool hasProtection = false;
-		if(getProjectileTemplate())
+		if(projectileTemplate)
 			hasProtection = !isProjectileDetonation && getProtectionTypeFlag(ShieldedType, PROTECTION_PROJECTILES);
 		else
 			hasProtection = firingWeapon->isLaser() ? getProtectionTypeFlag(ShieldedType, PROTECTION_LASER) : getProtectionTypeFlag(ShieldedType, PROTECTION_BULLETS);
@@ -1558,7 +1560,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 
 				dz = 0.0f;
 			}
-			else if(getProjectileTemplate() != NULL)
+			else if(projectileTemplate != NULL)
 			{
 				if(isStructure)
 				{
@@ -1596,7 +1598,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		else
 		{
 			Real targetHeight = curTarget->getGeometryInfo().getMaxHeightAbovePosition();
-			if(getProjectileTemplate() == NULL && !firingWeapon->isLaser() && !sourceObj->isKindOf(KINDOF_INFANTRY) && distSqr > 0)
+			if(projectileTemplate == NULL && !firingWeapon->isLaser() && !sourceObj->isKindOf(KINDOF_INFANTRY) && distSqr > 0)
 			{
 				Real adjustedHeight = targetHeight;
 				if(!sourceObj->isAboveTerrain() && distSqr < 4 * targetHeight * targetHeight)
@@ -1803,7 +1805,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 	}
 
-	if (getProjectileTemplate() == NULL || isProjectileDetonation)
+	if (projectileTemplate == NULL || isProjectileDetonation)
 	{
 		// see if we need to be called back at a later point to deal the damage.
 		Coord3D v;
@@ -1933,7 +1935,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 	else	// must be a projectile
 	{
 		Player *owningPlayer = sourceObj->getControllingPlayer(); //Need to know so missiles don't collide with firer
-		Object *projectile = TheThingFactory->newObject( getProjectileTemplate(), owningPlayer->getDefaultTeam() );
+		Object *projectile = TheThingFactory->newObject( projectileTemplate, owningPlayer->getDefaultTeam() );
 		projectile->setProducer(sourceObj);
 
 		//If the player has battle plans (America Strategy Center), then apply those bonuses