* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
@@ -162,24 +162,24 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] =
{ 1236.213f, 92.287f, 64.965f, 5.751f },
{ 1215.11f, 57.772f, 64.739f, 5.78f } ,
//Demolishers
{ 1611.597656,-117.270073,8.719355,2.513274},
{ 1575.562500,-158.421875,5.024450,2.129302},
{ 1618.047729,61.424641,7.248210,3.979351},
{ 1575.103149,98.873344,2.830360,3.752458},
{ 1611.597656f,-117.270073f,8.719355f,2.513274f},
{ 1575.562500f,-158.421875f,5.024450f,2.129302f},
{ 1618.047729f,61.424641f,7.248210f,3.979351f},
{ 1575.103149f,98.873344f,2.830360f,3.752458f},
//trigger
{ 1453.49, -250.453, 30.896, 4.2883},
{ 1377.05, 97.036, 30.8605, 2.46539},
{ 1186.05, 58.8048, 56.5491, 2.75992},
{ 1042.83, -72.839, 84.8145, 3.58615},
{ 1233.62, -250.49, 55.4036, 3.7016},
{ 1453.49f, -250.453f, 30.896f, 4.2883f},
{ 1377.05f, 97.036f, 30.8605f, 2.46539f},
{ 1186.05f, 58.8048f, 56.5491f, 2.75992f},
{ 1042.83f, -72.839f, 84.8145f, 3.58615f},
{ 1233.62f, -250.49f, 55.4036f, 3.7016f},
//Npcs
{ 1348.644165, -298.786469, 31.080130, 1.710423},
{ 1358.191040, 195.527786, 31.018187, 4.171337},
{ 1348.644165f, -298.786469f, 31.080130f, 1.710423f},
{ 1358.191040f, 195.527786f, 31.018187f, 4.171337f},
//Demolishers2
{ 1371.055786, -317.071136, 35.007359, 1.947460},
{ 1424.034912, -260.195190, 31.084425, 2.820013},
{ 1353.139893, 223.745438, 35.265411, 4.343684},
{ 1404.809570, 197.027237, 32.046032, 3.605401}
{ 1371.055786f, -317.071136f, 35.007359f, 1.947460f},
{ 1424.034912f, -260.195190f, 31.084425f, 2.820013f},
{ 1353.139893f, 223.745438f, 35.265411f, 4.343684f},
{ 1404.809570f, 197.027237f, 32.046032f, 3.605401f}
};
enum BG_SA_Objects
@@ -223,8 +223,8 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 878.555f, -108.2f, 117.845f, 0.0f },
{ 836.5f, -108.8f, 120.219f, 0.0f },
//Ships
{ 2679.696777, -826.891235, 3.712860, 5.78367f}, //rot2 1 rot3 0.0002
{ 2574.003662, 981.261475, 2.603424, 0.807696},
{ 2679.696777f, -826.891235f, 3.712860f, 5.78367f}, //rot2 1 rot3 0.0002f
{ 2574.003662f, 981.261475f, 2.603424f, 0.807696f},
//Sigils
{ 1414.054f, 106.72f, 41.442f, 5.441f },
{ 1060.63f, -107.8f, 94.7f, 0.034f },
@@ -232,88 +232,88 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 1230.75f, -210.724f, 67.611f, 0.5023f },
{ 1217.8f, 79.532f, 66.58f, 5.745f },
//Flagpoles
{ 1215.114258,-65.711861,70.084267,-3.124123},
{1338.863892,-153.336533,30.895121,-2.530723},
{1309.124268,9.410645,30.893402,-1.623156},
{ 1215.114258f,-65.711861f,70.084267f,-3.124123f},
{1338.863892f,-153.336533f,30.895121f,-2.530723f},
{1309.124268f,9.410645f,30.893402f,-1.623156f},
//Flags
{ 1215.108032,-65.715767,70.084267,-3.124123},
{ 1338.859253,-153.327316,30.895077,-2.530723},
{ 1309.192017,9.416233,30.893402,1.518436},
{ 1215.108032f,-65.715767f,70.084267f,-3.124123f},
{ 1338.859253f,-153.327316f,30.895077f,-2.530723f},
{ 1309.192017f,9.416233f,30.893402f,1.518436f},
//Portal
{1468.380005, -225.798996, 30.896200, 0.0}, //blue
{1394.270020, 72.551399, 31.054300, 0.0},//green
{1065.260010, -89.79501, 81.073402, 0.0},//yellow
{1216.069946, 47.904301, 54.278198,0.0}, //purple
{1255.569946, -233.548996, 56.43699, 0.0},//red
{1468.380005f, -225.798996f, 30.896200f, 0.0f}, //blue
{1394.270020f, 72.551399f, 31.054300f, 0.0f},//green
{1065.260010f, -89.79501f, 81.073402f, 0.0f},//yellow
{1216.069946f, 47.904301f, 54.278198f,0.0f}, //purple
{1255.569946f, -233.548996f, 56.43699f, 0.0f},//red
//Bombs
{1333.45, 211.354, 31.0538, 5.03666},
{1334.29, 209.582, 31.0532, 1.28088},
{1332.72, 210.049, 31.0532, 1.28088},
{1334.28, 210.78, 31.0538, 3.85856},
{1332.64, 211.39, 31.0532, 1.29266},
{1371.41, 194.028, 31.5107, 0.753095},
{1372.39, 194.951, 31.4679, 0.753095},
{1371.58, 196.942, 30.9349, 1.01777},
{1370.43, 196.614, 30.9349, 0.957299},
{1369.46, 196.877, 30.9351, 2.45348},
{1370.35, 197.361, 30.9349, 1.08689},
{1369.47, 197.941, 30.9349, 0.984787},
{1592.49, 47.5969, 7.52271, 4.63218},
{1593.91, 47.8036, 7.65856, 4.63218},
{1593.13, 46.8106, 7.54073, 4.63218},
{1589.22, 36.3616, 7.45975, 4.64396},
{1588.24, 35.5842, 7.55613, 4.79564},
{1588.14, 36.7611, 7.49675, 4.79564},
{1595.74, 35.5278, 7.46602, 4.90246},
{1596, 36.6475, 7.47991, 4.90246},
{1597.03, 36.2356, 7.48631, 4.90246},
{1597.93, 37.1214, 7.51725, 4.90246},
{1598.16, 35.888, 7.50018, 4.90246},
{1579.6, -98.0917, 8.48478, 1.37996},
{1581.2, -98.401, 8.47483, 1.37996},
{1580.38, -98.9556, 8.4772, 1.38781},
{1585.68, -104.966, 8.88551, 0.493246},
{1586.15, -106.033, 9.10616, 0.493246},
{1584.88, -105.394, 8.82985, 0.493246},
{1581.87, -100.899, 8.46164, 0.929142},
{1581.48, -99.4657, 8.46926, 0.929142},
{1583.2, -91.2291, 8.49227, 1.40038},
{1581.94, -91.0119, 8.49977, 1.40038},
{1582.33, -91.951, 8.49353, 1.1844},
{1342.06, -304.049, 30.9532, 5.59507},
{1340.96, -304.536, 30.9458, 1.28323},
{1341.22, -303.316, 30.9413, 0.486051},
{1342.22, -302.939, 30.986, 4.87643},
{1382.16, -287.466, 32.3063, 4.80968},
{1381, -287.58, 32.2805, 4.80968},
{1381.55, -286.536, 32.3929, 2.84225},
{1382.75, -286.354, 32.4099, 1.00442},
{1379.92, -287.34, 32.2872, 3.81615},
{1100.52, -2.41391, 70.2984, 0.131054},
{1099.35, -2.13851, 70.3375, 4.4586},
{1099.59, -1.00329, 70.238, 2.49903},
{1097.79, 0.571316, 70.159, 4.00307},
{1098.74, -7.23252, 70.7972, 4.1523},
{1098.46, -5.91443, 70.6715, 4.1523},
{1097.53, -7.39704, 70.7959, 4.1523},
{1097.32, -6.64233, 70.7424, 4.1523},
{1096.45, -5.96664, 70.7242, 4.1523},
{971.725, 0.496763, 86.8467, 2.09233},
{973.589, 0.119518, 86.7985, 3.17225},
{972.524, 1.25333, 86.8351, 5.28497},
{971.993, 2.05668, 86.8584, 5.28497},
{973.635, 2.11805, 86.8197, 2.36722},
{974.791, 1.74679, 86.7942, 1.5936},
{974.771, 3.0445, 86.8125, 0.647199},
{979.554, 3.6037, 86.7923, 1.69178},
{979.758, 2.57519, 86.7748, 1.76639},
{980.769, 3.48904, 86.7939, 1.76639},
{979.122, 2.87109, 86.7794, 1.76639},
{986.167, 4.85363, 86.8439, 1.5779},
{986.176, 3.50367, 86.8217, 1.5779},
{987.33, 4.67389, 86.8486, 1.5779},
{985.23, 4.65898, 86.8368, 1.5779},
{984.556, 3.54097, 86.8137, 1.5779},
{1333.45f, 211.354f, 31.0538f, 5.03666f},
{1334.29f, 209.582f, 31.0532f, 1.28088f},
{1332.72f, 210.049f, 31.0532f, 1.28088f},
{1334.28f, 210.78f, 31.0538f, 3.85856f},
{1332.64f, 211.39f, 31.0532f, 1.29266f},
{1371.41f, 194.028f, 31.5107f, 0.753095f},
{1372.39f, 194.951f, 31.4679f, 0.753095f},
{1371.58f, 196.942f, 30.9349f, 1.01777f},
{1370.43f, 196.614f, 30.9349f, 0.957299f},
{1369.46f, 196.877f, 30.9351f, 2.45348f},
{1370.35f, 197.361f, 30.9349f, 1.08689f},
{1369.47f, 197.941f, 30.9349f, 0.984787f},
{1592.49f, 47.5969f, 7.52271f, 4.63218f},
{1593.91f, 47.8036f, 7.65856f, 4.63218f},
{1593.13f, 46.8106f, 7.54073f, 4.63218f},
{1589.22f, 36.3616f, 7.45975f, 4.64396f},
{1588.24f, 35.5842f, 7.55613f, 4.79564f},
{1588.14f, 36.7611f, 7.49675f, 4.79564f},
{1595.74f, 35.5278f, 7.46602f, 4.90246f},
{1596, 36.6475f, 7.47991f, 4.90246f},
{1597.03f, 36.2356f, 7.48631f, 4.90246f},
{1597.93f, 37.1214f, 7.51725f, 4.90246f},
{1598.16f, 35.888f, 7.50018f, 4.90246f},
{1579.6f, -98.0917f, 8.48478f, 1.37996f},
{1581.2f, -98.401f, 8.47483f, 1.37996f},
{1580.38f, -98.9556f, 8.4772f, 1.38781f},
{1585.68f, -104.966f, 8.88551f, 0.493246f},
{1586.15f, -106.033f, 9.10616f, 0.493246f},
{1584.88f, -105.394f, 8.82985f, 0.493246f},
{1581.87f, -100.899f, 8.46164f, 0.929142f},
{1581.48f, -99.4657f, 8.46926f, 0.929142f},
{1583.2f, -91.2291f, 8.49227f, 1.40038f},
{1581.94f, -91.0119f, 8.49977f, 1.40038f},
{1582.33f, -91.951f, 8.49353f, 1.1844f},
{1342.06f, -304.049f, 30.9532f, 5.59507f},
{1340.96f, -304.536f, 30.9458f, 1.28323f},
{1341.22f, -303.316f, 30.9413f, 0.486051f},
{1342.22f, -302.939f, 30.986f, 4.87643f},
{1382.16f, -287.466f, 32.3063f, 4.80968f},
{1381, -287.58f, 32.2805f, 4.80968f},
{1381.55f, -286.536f, 32.3929f, 2.84225f},
{1382.75f, -286.354f, 32.4099f, 1.00442f},
{1379.92f, -287.34f, 32.2872f, 3.81615f},
{1100.52f, -2.41391f, 70.2984f, 0.131054f},
{1099.35f, -2.13851f, 70.3375f, 4.4586f},
{1099.59f, -1.00329f, 70.238f, 2.49903f},
{1097.79f, 0.571316f, 70.159f, 4.00307f},
{1098.74f, -7.23252f, 70.7972f, 4.1523f},
{1098.46f, -5.91443f, 70.6715f, 4.1523f},
{1097.53f, -7.39704f, 70.7959f, 4.1523f},
{1097.32f, -6.64233f, 70.7424f, 4.1523f},
{1096.45f, -5.96664f, 70.7242f, 4.1523f},
{971.725f, 0.496763f, 86.8467f, 2.09233f},
{973.589f, 0.119518f, 86.7985f, 3.17225f},
{972.524f, 1.25333f, 86.8351f, 5.28497f},
{971.993f, 2.05668f, 86.8584f, 5.28497f},
{973.635f, 2.11805f, 86.8197f, 2.36722f},
{974.791f, 1.74679f, 86.7942f, 1.5936f},
{974.771f, 3.0445f, 86.8125f, 0.647199f},
{979.554f, 3.6037f, 86.7923f, 1.69178f},
{979.758f, 2.57519f, 86.7748f, 1.76639f},
{980.769f, 3.48904f, 86.7939f, 1.76639f},
{979.122f, 2.87109f, 86.7794f, 1.76639f},
{986.167f, 4.85363f, 86.8439f, 1.5779f},
{986.176f, 3.50367f, 86.8217f, 1.5779f},
{987.33f, 4.67389f, 86.8486f, 1.5779f},
{985.23f, 4.65898f, 86.8368f, 1.5779f},
{984.556f, 3.54097f, 86.8137f, 1.5779f},
};
/* Ships: