From 14a46c5372f8f8f9ed0b5e56e7828cf25864e757 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Mon, 9 Nov 2015 03:27:52 +0200 Subject: [PATCH] Fixed spelling mistake in command function name. Updated collor packing macros to correct type casting. --- source/Command.cpp | 2 +- source/Config.hpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Command.cpp b/source/Command.cpp index 937a9719..2e640866 100644 --- a/source/Command.cpp +++ b/source/Command.cpp @@ -1257,7 +1257,7 @@ bool Register_Cmd(HSQUIRRELVM vm) cmdns.Func(_SC("GetInvoker"), &Cmd_GetInvoker); cmdns.Func(_SC("GetInvokerID"), &Cmd_GetInvokerID); cmdns.Func(_SC("GetName"), &Cmd_GetName); - cmdns.Func(_SC("getText"), &Cmd_GetText); + cmdns.Func(_SC("GetText"), &Cmd_GetText); // Output debugging information LogDbg("Registration of type was successful"); diff --git a/source/Config.hpp b/source/Config.hpp index 4f8df555..a19a7bc3 100644 --- a/source/Config.hpp +++ b/source/Config.hpp @@ -335,12 +335,12 @@ class LocalEvent; * COLOR PACKING */ -#define PACK_RGB(r, g, b) (uint32)(r << 16 | g << 8 | b) -#define PACK_RGBA(r, g, b, a) (uint32)(r << 24 | g << 16 | b << 8 | a) -#define PACK_ARGB(a, r, g, b) (uint32)(a << 24 | r << 16 | g << 8 | b) +#define PACK_RGB(r, g, b) (Uint32)(r << 16 | g << 8 | b) +#define PACK_RGBA(r, g, b, a) (Uint32)(r << 24 | g << 16 | b << 8 | a) +#define PACK_ARGB(a, r, g, b) (Uint32)(a << 24 | r << 16 | g << 8 | b) -#define PACK_RGB_TO_RGBA(r, g, b) (uint32)(r << 24 | g << 16 | b << 8 | 0) -#define PACK_RGB_TO_ARGB(r, g, b) (uint32)(0 << 24 | r << 16 | g << 8 | b) +#define PACK_RGB_TO_RGBA(r, g, b) (Uint32)(r << 24 | g << 16 | b << 8 | 0) +#define PACK_RGB_TO_ARGB(r, g, b) (Uint32)(0 << 24 | r << 16 | g << 8 | b) /* ------------------------------------------------------------------------------------------------ * GENERAL RESPONSES