pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 21:58:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Static cast floats in atof usages where the datatype is actually float to avoid windows compiler warnings

Browse Source
This commit is contained in:
Akkadius
2020-07-12 17:25:50 -05:00
parent 758a30a080
commit 6a7a78af29
26 changed files with 418 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_zone_repository.h
+60 -60
View File
@@ -392,10 +392,10 @@ public:
entry.file_name = row[2] ? row[2] : "";
entry.long_name = row[3] ? row[3] : "";
entry.map_file_name = row[4] ? row[4] : "";
entry.safe_x = atof(row[5]);
entry.safe_y = atof(row[6]);
entry.safe_z = atof(row[7]);
entry.graveyard_id = atof(row[8]);
entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]);
entry.min_status = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]);
@@ -404,40 +404,40 @@ public:
entry.maxclients = atoi(row[14]);
entry.ruleset = atoi(row[15]);
entry.note = row[16] ? row[16] : "";
entry.underworld = atof(row[17]);
entry.minclip = atof(row[18]);
entry.maxclip = atof(row[19]);
entry.fog_minclip = atof(row[20]);
entry.fog_maxclip = atof(row[21]);
entry.underworld = static_cast<float>(atof(row[17]));
entry.minclip = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]);
entry.fog_red = atoi(row[23]);
entry.fog_green = atoi(row[24]);
entry.sky = atoi(row[25]);
entry.ztype = atoi(row[26]);
entry.zone_exp_multiplier = atof(row[27]);
entry.walkspeed = atof(row[28]);
entry.walkspeed = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]);
entry.fog_red1 = atoi(row[30]);
entry.fog_green1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]);
entry.fog_minclip1 = atof(row[33]);
entry.fog_maxclip1 = atof(row[34]);
entry.fog_minclip1 = static_cast<float>(atof(row[33]));
entry.fog_maxclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]);
entry.fog_green2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]);
entry.fog_minclip2 = atof(row[38]);
entry.fog_maxclip2 = atof(row[39]);
entry.fog_minclip2 = static_cast<float>(atof(row[38]));
entry.fog_maxclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]);
entry.fog_green3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]);
entry.fog_minclip3 = atof(row[43]);
entry.fog_maxclip3 = atof(row[44]);
entry.fog_minclip3 = static_cast<float>(atof(row[43]));
entry.fog_maxclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]);
entry.fog_green4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]);
entry.fog_minclip4 = atof(row[48]);
entry.fog_maxclip4 = atof(row[49]);
entry.fog_density = atof(row[50]);
entry.fog_minclip4 = static_cast<float>(atof(row[48]));
entry.fog_maxclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : "";
entry.canbind = atoi(row[52]);
entry.cancombat = atoi(row[53]);
@@ -465,7 +465,7 @@ public:
entry.snow_duration2 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]);
entry.gravity = atof(row[78]);
entry.gravity = static_cast<float>(atof(row[78]));
entry.type = atoi(row[79]);
entry.skylock = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]);
@@ -845,10 +845,10 @@ public:
entry.file_name = row[2] ? row[2] : "";
entry.long_name = row[3] ? row[3] : "";
entry.map_file_name = row[4] ? row[4] : "";
entry.safe_x = atof(row[5]);
entry.safe_y = atof(row[6]);
entry.safe_z = atof(row[7]);
entry.graveyard_id = atof(row[8]);
entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]);
entry.min_status = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]);
@@ -857,40 +857,40 @@ public:
entry.maxclients = atoi(row[14]);
entry.ruleset = atoi(row[15]);
entry.note = row[16] ? row[16] : "";
entry.underworld = atof(row[17]);
entry.minclip = atof(row[18]);
entry.maxclip = atof(row[19]);
entry.fog_minclip = atof(row[20]);
entry.fog_maxclip = atof(row[21]);
entry.underworld = static_cast<float>(atof(row[17]));
entry.minclip = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]);
entry.fog_red = atoi(row[23]);
entry.fog_green = atoi(row[24]);
entry.sky = atoi(row[25]);
entry.ztype = atoi(row[26]);
entry.zone_exp_multiplier = atof(row[27]);
entry.walkspeed = atof(row[28]);
entry.walkspeed = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]);
entry.fog_red1 = atoi(row[30]);
entry.fog_green1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]);
entry.fog_minclip1 = atof(row[33]);
entry.fog_maxclip1 = atof(row[34]);
entry.fog_minclip1 = static_cast<float>(atof(row[33]));
entry.fog_maxclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]);
entry.fog_green2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]);
entry.fog_minclip2 = atof(row[38]);
entry.fog_maxclip2 = atof(row[39]);
entry.fog_minclip2 = static_cast<float>(atof(row[38]));
entry.fog_maxclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]);
entry.fog_green3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]);
entry.fog_minclip3 = atof(row[43]);
entry.fog_maxclip3 = atof(row[44]);
entry.fog_minclip3 = static_cast<float>(atof(row[43]));
entry.fog_maxclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]);
entry.fog_green4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]);
entry.fog_minclip4 = atof(row[48]);
entry.fog_maxclip4 = atof(row[49]);
entry.fog_density = atof(row[50]);
entry.fog_minclip4 = static_cast<float>(atof(row[48]));
entry.fog_maxclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : "";
entry.canbind = atoi(row[52]);
entry.cancombat = atoi(row[53]);
@@ -918,7 +918,7 @@ public:
entry.snow_duration2 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]);
entry.gravity = atof(row[78]);
entry.gravity = static_cast<float>(atof(row[78]));
entry.type = atoi(row[79]);
entry.skylock = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]);
@@ -955,10 +955,10 @@ public:
entry.file_name = row[2] ? row[2] : "";
entry.long_name = row[3] ? row[3] : "";
entry.map_file_name = row[4] ? row[4] : "";
entry.safe_x = atof(row[5]);
entry.safe_y = atof(row[6]);
entry.safe_z = atof(row[7]);
entry.graveyard_id = atof(row[8]);
entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]);
entry.min_status = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]);
@@ -967,40 +967,40 @@ public:
entry.maxclients = atoi(row[14]);
entry.ruleset = atoi(row[15]);
entry.note = row[16] ? row[16] : "";
entry.underworld = atof(row[17]);
entry.minclip = atof(row[18]);
entry.maxclip = atof(row[19]);
entry.fog_minclip = atof(row[20]);
entry.fog_maxclip = atof(row[21]);
entry.underworld = static_cast<float>(atof(row[17]));
entry.minclip = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]);
entry.fog_red = atoi(row[23]);
entry.fog_green = atoi(row[24]);
entry.sky = atoi(row[25]);
entry.ztype = atoi(row[26]);
entry.zone_exp_multiplier = atof(row[27]);
entry.walkspeed = atof(row[28]);
entry.walkspeed = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]);
entry.fog_red1 = atoi(row[30]);
entry.fog_green1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]);
entry.fog_minclip1 = atof(row[33]);
entry.fog_maxclip1 = atof(row[34]);
entry.fog_minclip1 = static_cast<float>(atof(row[33]));
entry.fog_maxclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]);
entry.fog_green2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]);
entry.fog_minclip2 = atof(row[38]);
entry.fog_maxclip2 = atof(row[39]);
entry.fog_minclip2 = static_cast<float>(atof(row[38]));
entry.fog_maxclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]);
entry.fog_green3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]);
entry.fog_minclip3 = atof(row[43]);
entry.fog_maxclip3 = atof(row[44]);
entry.fog_minclip3 = static_cast<float>(atof(row[43]));
entry.fog_maxclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]);
entry.fog_green4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]);
entry.fog_minclip4 = atof(row[48]);
entry.fog_maxclip4 = atof(row[49]);
entry.fog_density = atof(row[50]);
entry.fog_minclip4 = static_cast<float>(atof(row[48]));
entry.fog_maxclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : "";
entry.canbind = atoi(row[52]);
entry.cancombat = atoi(row[53]);
@@ -1028,7 +1028,7 @@ public:
entry.snow_duration2 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]);
entry.gravity = atof(row[78]);
entry.gravity = static_cast<float>(atof(row[78]));
entry.type = atoi(row[79]);
entry.skylock = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]);