From 4b71f2006f6e3cbd4d33afd649ad4a47d3c18999 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Thu, 29 Oct 2015 22:56:40 +0200 Subject: [PATCH] Update the sprite reference type to use the short notation of squirrel's 32bit unsigned integer. --- source/Entity/Sprite.cpp | 16 ++++++++-------- source/Entity/Sprite.hpp | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/Entity/Sprite.cpp b/source/Entity/Sprite.cpp index 4ec771bf..e40491c8 100644 --- a/source/Entity/Sprite.cpp +++ b/source/Entity/Sprite.cpp @@ -125,7 +125,7 @@ void CSprite::SetPositionAll(const Vector2u & pos) const noexcept } // ------------------------------------------------------------------------------------------------ -void CSprite::SetPositionAllEx(SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept +void CSprite::SetPositionAllEx(SQUint32 x, SQUint32 y) const noexcept { if (VALID_ENTITY(m_ID)) { @@ -156,7 +156,7 @@ void CSprite::SetPositionFor(const Reference< CPlayer > & player, const Vector2u } // ------------------------------------------------------------------------------------------------ -void CSprite::SetPositionForEx(const Reference< CPlayer > & player, SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept +void CSprite::SetPositionForEx(const Reference< CPlayer > & player, SQUint32 x, SQUint32 y) const noexcept { if (VALID_ENTITY(m_ID) && player) { @@ -209,7 +209,7 @@ void CSprite::SetCenterAll(const Vector2u & pos) const noexcept } // ------------------------------------------------------------------------------------------------ -void CSprite::SetCenterAllEx(SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept +void CSprite::SetCenterAllEx(SQUint32 x, SQUint32 y) const noexcept { if (VALID_ENTITY(m_ID)) { @@ -239,7 +239,7 @@ void CSprite::SetCenterFor(const Reference< CPlayer > & player, const Vector2u & } // ------------------------------------------------------------------------------------------------ -void CSprite::SetCenterForEx(const Reference< CPlayer > & player, SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept +void CSprite::SetCenterForEx(const Reference< CPlayer > & player, SQUint32 x, SQUint32 y) const noexcept { if (VALID_ENTITY(m_ID) && player) { @@ -428,21 +428,21 @@ bool Register_CSprite(HSQUIRRELVM vm) /* Overloads */ .Overload< void (CSprite::*)(const Vector2u &) const > (_SC("set_position_all"), &CSprite::SetPositionAll) - .Overload< void (CSprite::*)(SQUnsignedInteger32, SQUnsignedInteger32) const > + .Overload< void (CSprite::*)(SQUint32, SQUint32) const > (_SC("set_position_all"), &CSprite::SetPositionAllEx) .Overload< void (CSprite::*)(const Reference< CPlayer > &, const Vector2u &) const > (_SC("set_position_for"), &CSprite::SetPositionFor) - .Overload< void (CSprite::*)(const Reference< CPlayer > &, SQUnsignedInteger32, SQUnsignedInteger32) const > + .Overload< void (CSprite::*)(const Reference< CPlayer > &, SQUint32, SQUint32) const > (_SC("set_position_for"), &CSprite::SetPositionForEx) .Overload< void (CSprite::*)(SQInt32, SQInt32, const Vector2u &) const > (_SC("set_position_range"), &CSprite::SetPositionRange) .Overload< void (CSprite::*)(const Vector2u &) const > (_SC("set_center_all"), &CSprite::SetCenterAll) - .Overload< void (CSprite::*)(SQUnsignedInteger32, SQUnsignedInteger32) const > + .Overload< void (CSprite::*)(SQUint32, SQUint32) const > (_SC("set_center_all"), &CSprite::SetCenterAllEx) .Overload< void (CSprite::*)(const Reference< CPlayer > &, const Vector2u &) const > (_SC("set_center_for"), &CSprite::SetCenterFor) - .Overload< void (CSprite::*)(const Reference< CPlayer > &, SQUnsignedInteger32, SQUnsignedInteger32) const > + .Overload< void (CSprite::*)(const Reference< CPlayer > &, SQUint32, SQUint32) const > (_SC("set_center_for"), &CSprite::SetCenterForEx) .Overload< void (CSprite::*)(SQInt32, SQInt32, const Vector2u &) const > (_SC("set_center_range"), &CSprite::SetCenterRange) diff --git a/source/Entity/Sprite.hpp b/source/Entity/Sprite.hpp index 282b2b50..cf89f27a 100644 --- a/source/Entity/Sprite.hpp +++ b/source/Entity/Sprite.hpp @@ -54,7 +54,7 @@ public: /* -------------------------------------------------------------------------------------------- * */ - void SetPositionAllEx(SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept; + void SetPositionAllEx(SQUint32 x, SQUint32 y) const noexcept; /* -------------------------------------------------------------------------------------------- * @@ -64,7 +64,7 @@ public: /* -------------------------------------------------------------------------------------------- * */ - void SetPositionForEx(const Reference< CPlayer > & player, SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept; + void SetPositionForEx(const Reference< CPlayer > & player, SQUint32 x, SQUint32 y) const noexcept; /* -------------------------------------------------------------------------------------------- * @@ -79,7 +79,7 @@ public: /* -------------------------------------------------------------------------------------------- * */ - void SetCenterAllEx(SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept; + void SetCenterAllEx(SQUint32 x, SQUint32 y) const noexcept; /* -------------------------------------------------------------------------------------------- * @@ -89,7 +89,7 @@ public: /* -------------------------------------------------------------------------------------------- * */ - void SetCenterForEx(const Reference< CPlayer > & player, SQUnsignedInteger32 x, SQUnsignedInteger32 y) const noexcept; + void SetCenterForEx(const Reference< CPlayer > & player, SQUint32 x, SQUint32 y) const noexcept; /* -------------------------------------------------------------------------------------------- *