Criminal Rating in Stats menu

Lots of little changes with splashes
Futher code refactoring

git-svn-id: svn://localhost/vcspc/trunk@28 9f344024-d43e-4b27-bde7-3d027e20192d

VCS PC/CDraw.cpp

@@ -131,31 +131,4 @@ void CRGBA::BaseColors__Constructor()
 	this[14].g = 0x8C;
 	this[14].b = 0x2C;
 	this[14].a = 0xFF;
-}
-
-/*RwRGBA RwRGBA::GetBaseColor(BYTE ID)
-{
-	/*DWORD dwFunc = FUNC_GetBaseColor;
-	RwRGBA	dwReturn;
-	_asm
-	{
-		movzx	eax, ID
-		push	eax
-		mov		ecx, dwReturn
-		push	ecx
-		mov		ecx, this
-		call	dwFunc
-		mov		dwReturn, eax
-	}
-	return dwReturn;
-	return ;
-}*/
-
-/*RwRGBA* RwRGBA::Set(BYTE r, BYTE g, BYTE b, BYTE a)
-{
-	this->r = r;
-	this->g = g;
-	this->b = b;
-	this->a = a;
-	return this;
-}*/
+}

VCS PC/CFont.cpp

@@ -339,34 +339,5 @@ void CFont::SetTextAlignment(unsigned char bAlign)
 	}
 }
 
-void CFont::PrintString(float posX, float posY, const char* text)
-{
-	DWORD dwFunc = (DWORD)FUNC_CFont__PrintString;
-	_asm
-	{
-		mov		eax, text
-		push	eax
-		mov		eax, posY
-		push	eax
-		mov		eax, posX
-		push	eax
-		call	dwFunc
-		add		esp, 0Ch
-	}
-}
-
-void CFont::UnkPrintString(float posX, float posY, const char* text)
-{
-	DWORD dwFunc = (DWORD)FUNC_CFont__UnkPrintString;
-	_asm
-	{
-		mov		eax, text
-		push	eax
-		mov		eax, posY
-		push	eax
-		mov		eax, posX
-		push	eax
-		call	dwFunc
-		add		esp, 0Ch
-	}
-}
+WRAPPER void CFont::PrintString(float posX, float posY, const char* pText) { WRAPARG(posX); WRAPARG(posY); WRAPARG(pText); EAXJMP(0x71A700); }
+WRAPPER void CFont::PrintStringFromBottom(float posX, float posY, const char* pText) { WRAPARG(posX); WRAPARG(posY); WRAPARG(pText); EAXJMP(0x71A820); }

VCS PC/CFont.h

@@ -16,8 +16,6 @@
 #define FUNC_CFont__SetTextBackground						0x7195C0
 #define FUNC_CFont__SetTextJustify							0x719600
 #define FUNC_CFont__SetTextAlignment						0x719610
-#define FUNC_CFont__PrintString								0x71A700
-#define FUNC_CFont__UnkPrintString							0x71A820
 
 enum	// Align
 {
@@ -101,8 +99,8 @@ class CFont
 	static void				SetTextUseProportionalValues(bool bUseProportionalValues);
 	static void				SetTextBackground(unsigned char bUseBackground, unsigned char bBackgroundType);
 	static void				SetTextAlignment(unsigned char bAlign);
-	static void				PrintString(float posX, float posY, const char* text);
-	static void				UnkPrintString(float posX, float posY, const char* text);
+	static void				PrintString(float posX, float posY, const char* pText);
+	static void				PrintStringFromBottom(float posX, float posY, const char* pText);
 	static void				SetWrapx(float fWrap);
 };