sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-06-01 17:25:33 +02:00
parent 7cc1b2d47b 8752d1e0f4
commit 17d9cd6e7d
4 changed files with 115 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Math/Box.inl
View File

@@ -133,9 +133,9 @@ namespace Nz
template<typename T>
bool Box<T>::Contains(T X, T Y, T Z) const
{
return X >= x && X <= x + width &&
Y >= y && Y <= y + height &&
Z >= z && Z <= z + depth;
return X >= x && X < x + width &&
Y >= y && Y < y + height &&
Z >= z && Z < z + depth;
}
/*!

4
include/Nazara/Math/Rect.inl
View File

@@ -117,8 +117,8 @@ namespace Nz
template<typename T>
bool Rect<T>::Contains(T X, T Y) const
{
return X >= x && X <= (x + width) &&
Y >= y && Y <= (y + height);
return X >= x && X < (x + width) &&
Y >= y && Y < (y + height);
}
/*!

4
include/Nazara/Network/Algorithm.hpp
View File

@@ -9,12 +9,16 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Network/Config.hpp>
#include <Nazara/Network/Enums.hpp>
#include <functional>
#include <tuple>
#include <type_traits>
namespace Nz
{
NAZARA_NETWORK_API const char* ErrorToString(Nz::ResolveError resolveError);
NAZARA_NETWORK_API const char* ErrorToString(Nz::SocketError socketError);
NAZARA_NETWORK_API bool ParseIPAddress(const char* addressPtr, UInt8 result[16], UInt16* port = nullptr, bool* isIPv6 = nullptr, const char** endOfRead = nullptr);
template<typename T>