From 1abe52befdbee423b93ba763f04b4a72485472cd Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 18 Jun 2014 10:55:38 +0400 Subject: [PATCH] Shortened helper procs a little. --- code/__HELPERS/game.dm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index e22f836e07f..11c31fcaf26 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -450,22 +450,13 @@ proc/get_candidates(be_special_flag=0) return mobs_found /proc/GetRedPart(const/hexa) - var/hex = uppertext(hexa) - var/hi = text2ascii(hex, 2) - var/lo = text2ascii(hex, 3) - return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48)) + return hex2num(copytext(hexa,2,4)) /proc/GetGreenPart(const/hexa) - var/hex = uppertext(hexa) - var/hi = text2ascii(hex, 4) - var/lo = text2ascii(hex, 5) - return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48)) + return hex2num(copytext(hexa,4,6)) /proc/GetBluePart(const/hexa) - var/hex = uppertext(hexa) - var/hi = text2ascii(hex, 6) - var/lo = text2ascii(hex, 7) - return (((hi >= 65 ? hi - 55 : hi - 48) << 4) | (lo >= 65 ? lo - 55 : lo - 48)) + return hex2num(copytext(hexa,6,8)) /proc/GetHexColors(const/hexa) var/hex = uppertext(hexa)