- bugfix for streflop_test on windows
This commit is contained in:
parent
bf5001a49a
commit
20789087d9
|
@ -10,6 +10,11 @@
|
||||||
// ==============================================================
|
// ==============================================================
|
||||||
|
|
||||||
#include <cppunit/extensions/HelperMacros.h>
|
#include <cppunit/extensions/HelperMacros.h>
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <winsock.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "vec.h"
|
#include "vec.h"
|
||||||
#include "skill_type.h"
|
#include "skill_type.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -207,13 +212,13 @@ public:
|
||||||
height = truncateDecimal<float>(height,6);
|
height = truncateDecimal<float>(height,6);
|
||||||
|
|
||||||
if(cellLandUnitHeight >= 0 && cellLandUnitHeight > airHeight) {
|
if(cellLandUnitHeight >= 0 && cellLandUnitHeight > airHeight) {
|
||||||
height += (std::min((float)cellLandUnitHeight,standardAirHeight * 3) - airHeight);
|
height += (min((float)cellLandUnitHeight,standardAirHeight * 3) - airHeight);
|
||||||
height = truncateDecimal<float>(height,6);
|
height = truncateDecimal<float>(height,6);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(cellObjectHeight >= 0) {
|
if(cellObjectHeight >= 0) {
|
||||||
if(cellObjectHeight > airHeight) {
|
if(cellObjectHeight > airHeight) {
|
||||||
height += (std::min((float)cellObjectHeight,standardAirHeight * 3) - airHeight);
|
height += (min((float)cellObjectHeight,standardAirHeight * 3) - airHeight);
|
||||||
height = truncateDecimal<float>(height,6);
|
height = truncateDecimal<float>(height,6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue