diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index c08ce3499..f07cf8e93 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -867,16 +867,32 @@ static Vec2i _unprojectMap(const Vec2i& pt,const GLdouble* model,const GLdouble* Vec2i pos; if(strcmp(label,"tl") == 0) { +#ifdef USE_STREFLOP pos = Vec2i(streflop::floor(i.x),streflop::floor(i.z)); +#else + pos = Vec2i(floor(i.x),floor(i.z)); +#endif } else if(strcmp(label,"tr") == 0) { +#ifdef USE_STREFLOP pos = Vec2i(streflop::ceil(i.x),streflop::floor(i.z)); +#else + pos = Vec2i(ceil(i.x),floor(i.z)); +#endif } else if(strcmp(label,"bl") == 0) { +#ifdef USE_STREFLOP pos = Vec2i(streflop::floor(i.x),streflop::ceil(i.z)); +#else + pos = Vec2i(floor(i.x),ceil(i.z)); +#endif } else if(strcmp(label,"br") == 0) { +#ifdef USE_STREFLOP pos = Vec2i(streflop::ceil(i.x),streflop::ceil(i.z)); +#else + pos = Vec2i(ceil(i.x),ceil(i.z)); +#endif } if(false) { // print debug info diff --git a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c index 8643edd10..932485167 100644 --- a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c +++ b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c @@ -30,7 +30,7 @@ #if defined(__FreeBSD__) #include #else - #include + //#include #endif #include