Even more conversion, lots of superfluous macro removal
This commit is contained in:
+16
-16
@@ -126,15 +126,15 @@ void Fog_FogCommand_f(void) {
|
||||
Con_Printf(" \"blue\" is \"%f\"\n", fog_blue);
|
||||
return;
|
||||
case 2:
|
||||
d = Q_atof(command::argv(1)->c_str());
|
||||
d = std::atof(command::argv(1)->c_str());
|
||||
t = 0.0f;
|
||||
r = fog_red;
|
||||
g = fog_green;
|
||||
b = fog_blue;
|
||||
break;
|
||||
case 3: //TEST
|
||||
d = Q_atof(command::argv(1)->c_str());
|
||||
t = Q_atof(command::argv(2)->c_str());
|
||||
d = std::atof(command::argv(1)->c_str());
|
||||
t = std::atof(command::argv(2)->c_str());
|
||||
r = fog_red;
|
||||
g = fog_green;
|
||||
b = fog_blue;
|
||||
@@ -142,23 +142,23 @@ void Fog_FogCommand_f(void) {
|
||||
case 4:
|
||||
d = fog_density;
|
||||
t = 0.0f;
|
||||
r = Q_atof(command::argv(1)->c_str());
|
||||
g = Q_atof(command::argv(2)->c_str());
|
||||
b = Q_atof(command::argv(3)->c_str());
|
||||
r = std::atof(command::argv(1)->c_str());
|
||||
g = std::atof(command::argv(2)->c_str());
|
||||
b = std::atof(command::argv(3)->c_str());
|
||||
break;
|
||||
case 5:
|
||||
d = Q_atof(command::argv(1)->c_str());
|
||||
r = Q_atof(command::argv(2)->c_str());
|
||||
g = Q_atof(command::argv(3)->c_str());
|
||||
b = Q_atof(command::argv(4)->c_str());
|
||||
d = std::atof(command::argv(1)->c_str());
|
||||
r = std::atof(command::argv(2)->c_str());
|
||||
g = std::atof(command::argv(3)->c_str());
|
||||
b = std::atof(command::argv(4)->c_str());
|
||||
t = 0.0f;
|
||||
break;
|
||||
case 6: //TEST
|
||||
d = Q_atof(command::argv(1)->c_str());
|
||||
r = Q_atof(command::argv(2)->c_str());
|
||||
g = Q_atof(command::argv(3)->c_str());
|
||||
b = Q_atof(command::argv(4)->c_str());
|
||||
t = Q_atof(command::argv(5)->c_str());
|
||||
d = std::atof(command::argv(1)->c_str());
|
||||
r = std::atof(command::argv(2)->c_str());
|
||||
g = std::atof(command::argv(3)->c_str());
|
||||
b = std::atof(command::argv(4)->c_str());
|
||||
t = std::atof(command::argv(5)->c_str());
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ float *Fog_GetColor(void) {
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
c[i] = CLAMP(0.f, c[i], 1.f);
|
||||
c[i] = std::clamp(c[i], 0.f, 1.f);
|
||||
}
|
||||
|
||||
//find closest 24-bit RGB value, so solid-colored sky can match the fog perfectly
|
||||
|
||||
Reference in New Issue
Block a user