From 1eea9ad1a3ae577195363abe475cfbbee33d153b Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 9 Jul 2012 03:27:21 +0200
Subject: WINTERMUTE: Remove most of the wintype-definitions.

---
 engines/wintermute/utils/PathUtil.cpp | 2 +-
 engines/wintermute/utils/utils.cpp    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/wintermute/utils')

diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp
index cc1f2f3d44..cfc3db916e 100644
--- a/engines/wintermute/utils/PathUtil.cpp
+++ b/engines/wintermute/utils/PathUtil.cpp
@@ -166,7 +166,7 @@ AnsiString PathUtil::getUserDirectory() {
 	buffer[0] = '\0';
 	LPITEMIDLIST pidl = NULL;
 	LPMALLOC pMalloc;
-	if (SUCCEEDED(SHGetMalloc(&pMalloc))) {
+	if (DID_SUCCEED(SHGetMalloc(&pMalloc))) {
 		SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA, &pidl);
 		if (pidl) {
 			SHGetPathFromIDList(pidl, buffer);
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 46e5a8da36..ca68b3c691 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -256,9 +256,9 @@ char *CBUtils::getFilename(const char *filename) {
 
 //////////////////////////////////////////////////////////////////////////
 void CBUtils::RGBtoHSL(uint32 RGBColor, byte *OutH, byte *OutS, byte *OutL) {
-	float var_R = (D3DCOLGetR(RGBColor) / 255.0f);
-	float var_G = (D3DCOLGetG(RGBColor) / 255.0f);
-	float var_B = (D3DCOLGetB(RGBColor) / 255.0f);
+	float var_R = (RGBCOLGetR(RGBColor) / 255.0f);
+	float var_G = (RGBCOLGetG(RGBColor) / 255.0f);
+	float var_B = (RGBCOLGetB(RGBColor) / 255.0f);
 
 	//Min. value of RGB
 	float var_Min = MIN(var_R, var_G);
@@ -328,7 +328,7 @@ uint32 CBUtils::HSLtoRGB(byte  InH, byte InS, byte InL) {
 		G = (byte)(255 * Hue2RGB(var_1, var_2, H));
 		B = (byte)(255 * Hue2RGB(var_1, var_2, H - (1.0f / 3.0f)));
 	}
-	return DRGBA(255, R, G, B);
+	return BYTETORGBA(255, R, G, B);
 }
 
 
-- 
cgit v1.2.3