Code style (game + scripts only):
"if(" --> "if ("
--HG--
branch : trunk
This commit is contained in:
+25
-25
@@ -835,9 +835,9 @@ struct FactionTemplateEntry
|
||||
// helpers
|
||||
bool IsFriendlyTo(FactionTemplateEntry const& entry) const
|
||||
{
|
||||
if(ID == entry.ID)
|
||||
if (ID == entry.ID)
|
||||
return true;
|
||||
if(entry.faction)
|
||||
if (entry.faction)
|
||||
{
|
||||
for (int i = 0; i < 4; ++i)
|
||||
if (enemyFaction[i] == entry.faction)
|
||||
@@ -850,9 +850,9 @@ struct FactionTemplateEntry
|
||||
}
|
||||
bool IsHostileTo(FactionTemplateEntry const& entry) const
|
||||
{
|
||||
if(ID == entry.ID)
|
||||
if (ID == entry.ID)
|
||||
return false;
|
||||
if(entry.faction)
|
||||
if (entry.faction)
|
||||
{
|
||||
for (int i = 0; i < 4; ++i)
|
||||
if (enemyFaction[i] == entry.faction)
|
||||
@@ -1148,7 +1148,7 @@ struct MapEntry
|
||||
|
||||
bool GetEntrancePos(int32 &mapid, float &x, float &y) const
|
||||
{
|
||||
if(entrance_map < 0)
|
||||
if (entrance_map < 0)
|
||||
return false;
|
||||
mapid = entrance_map;
|
||||
x = entrance_x;
|
||||
@@ -1248,12 +1248,12 @@ struct ScalingStatValuesEntry
|
||||
{
|
||||
if (mask & 0x4001F)
|
||||
{
|
||||
if(mask & 0x00000001) return ssdMultiplier[0];
|
||||
if(mask & 0x00000002) return ssdMultiplier[1];
|
||||
if(mask & 0x00000004) return ssdMultiplier[2];
|
||||
if(mask & 0x00000008) return ssdMultiplier2;
|
||||
if(mask & 0x00000010) return ssdMultiplier[3];
|
||||
if(mask & 0x00040000) return ssdMultiplier3;
|
||||
if (mask & 0x00000001) return ssdMultiplier[0];
|
||||
if (mask & 0x00000002) return ssdMultiplier[1];
|
||||
if (mask & 0x00000004) return ssdMultiplier[2];
|
||||
if (mask & 0x00000008) return ssdMultiplier2;
|
||||
if (mask & 0x00000010) return ssdMultiplier[3];
|
||||
if (mask & 0x00040000) return ssdMultiplier3;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1262,15 +1262,15 @@ struct ScalingStatValuesEntry
|
||||
{
|
||||
if (mask & 0x00F001E0)
|
||||
{
|
||||
if(mask & 0x00000020) return armorMod[0];
|
||||
if(mask & 0x00000040) return armorMod[1];
|
||||
if(mask & 0x00000080) return armorMod[2];
|
||||
if(mask & 0x00000100) return armorMod[3];
|
||||
if (mask & 0x00000020) return armorMod[0];
|
||||
if (mask & 0x00000040) return armorMod[1];
|
||||
if (mask & 0x00000080) return armorMod[2];
|
||||
if (mask & 0x00000100) return armorMod[3];
|
||||
|
||||
if(mask & 0x00100000) return armorMod2[0]; // cloth
|
||||
if(mask & 0x00200000) return armorMod2[1]; // leather
|
||||
if(mask & 0x00400000) return armorMod2[2]; // mail
|
||||
if(mask & 0x00800000) return armorMod2[3]; // plate
|
||||
if (mask & 0x00100000) return armorMod2[0]; // cloth
|
||||
if (mask & 0x00200000) return armorMod2[1]; // leather
|
||||
if (mask & 0x00400000) return armorMod2[2]; // mail
|
||||
if (mask & 0x00800000) return armorMod2[3]; // plate
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1278,12 +1278,12 @@ struct ScalingStatValuesEntry
|
||||
{
|
||||
if (mask&0x7E00)
|
||||
{
|
||||
if(mask & 0x00000200) return dpsMod[0];
|
||||
if(mask & 0x00000400) return dpsMod[1];
|
||||
if(mask & 0x00000800) return dpsMod[2];
|
||||
if(mask & 0x00001000) return dpsMod[3];
|
||||
if(mask & 0x00002000) return dpsMod[4];
|
||||
if(mask & 0x00004000) return dpsMod[5]; // not used?
|
||||
if (mask & 0x00000200) return dpsMod[0];
|
||||
if (mask & 0x00000400) return dpsMod[1];
|
||||
if (mask & 0x00000800) return dpsMod[2];
|
||||
if (mask & 0x00001000) return dpsMod[3];
|
||||
if (mask & 0x00002000) return dpsMod[4];
|
||||
if (mask & 0x00004000) return dpsMod[5]; // not used?
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user