From 70e449fed04a84a6a5b79d1e53abb1b80824a2c6 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Fri, 20 Mar 2015 20:44:36 +0100
Subject: [PATCH] lunar64.png stored as a resource

---
 SAFix/Shaders.rc        | Bin 146 -> 109 bytes
 SAFix/SilentPatchSA.cpp | 108 ++++++----------------------------------
 SAFix/lunar64.png       | Bin 0 -> 1018 bytes
 SAFix/resource.h        |   1 +
 4 files changed, 16 insertions(+), 93 deletions(-)
 create mode 100644 SAFix/lunar64.png

diff --git a/SAFix/Shaders.rc b/SAFix/Shaders.rc
index be9fe6e12fa29318e7349eb8e44a30e69efc32a7..7de812c25fc11be2f3cb697e2c8a0a4dac8a402d 100644
GIT binary patch
literal 109
zcmY$+%uCKGO-WTyDoQQRFD*(=)yq)g<>KY?bP0<03v&+kaCC7E;tX<jaSU<fRMOLn
zi3!fkNzE$>NGwUth>6K7OV&#+&If7%Y48d4a||*w;e@NtDa}hPGBeRD$V&$*0RRdG
BAHx6u

literal 146
zcmW-a!3u&<6hzO~pnnkCzkd)DY7>#sN)S<@Kwe<h=V!+l=H6k3duRFXco69rdDAnH
zk}<hoJas0MfxumN%jVA`doDDbxKU7XAlE7N5?QEot}^i^h+0&(jDCvDoN1k%Ki4Gk
KQ3ts;X8ZtR!x&ot

diff --git a/SAFix/SilentPatchSA.cpp b/SAFix/SilentPatchSA.cpp
index 3419845..6e19b99 100644
--- a/SAFix/SilentPatchSA.cpp
+++ b/SAFix/SilentPatchSA.cpp
@@ -240,95 +240,6 @@ static struct
 							{ ".m4a", DECODER_QUICKTIME }, { ".mov", DECODER_QUICKTIME },
 							{ ".fla", DECODER_FLAC }, { ".flac", DECODER_FLAC } };
 
-// lunar.png
-static const BYTE	gMoonMaskPNG[] = {
-	0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D,
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40,
-	0x08, 0x06, 0x00, 0x00, 0x00, 0xAA, 0x69, 0x71, 0xDE, 0x00, 0x00, 0x03,
-	0xC1, 0x49, 0x44, 0x41, 0x54, 0x78, 0xDA, 0xED, 0x9B, 0xD7, 0x6B, 0x54,
-	0x51, 0x10, 0xC6, 0x27, 0x96, 0x68, 0xEC, 0xA2, 0x41, 0x09, 0x16, 0xAC,
-	0x60, 0x50, 0x51, 0xAC, 0xB1, 0xF7, 0x8A, 0x3E, 0xC4, 0x06, 0xBE, 0x08,
-	0x3E, 0xE8, 0x83, 0x82, 0xE8, 0x1F, 0xA2, 0x08, 0xFA, 0xA0, 0x0F, 0x82,
-	0x2F, 0x82, 0xF5, 0xC1, 0x10, 0x7B, 0x8F, 0x5D, 0x83, 0xA2, 0xA2, 0x60,
-	0xC5, 0x42, 0x50, 0x54, 0xEC, 0xC6, 0x12, 0xCB, 0xF7, 0x31, 0xB3, 0x70,
-	0x73, 0xD9, 0x9B, 0xCD, 0x66, 0xDB, 0xBD, 0x39, 0xFB, 0xC1, 0x8F, 0x90,
-	0x6C, 0x58, 0x76, 0xBE, 0x33, 0x67, 0x66, 0xCE, 0xDD, 0x7B, 0x0B, 0xC4,
-	0x71, 0x15, 0xE4, 0xFA, 0x03, 0xE4, 0x5A, 0xD9, 0x30, 0xA0, 0x15, 0xE8,
-	0x06, 0x3A, 0x83, 0x8E, 0xA0, 0x1D, 0x68, 0x0B, 0x0A, 0x41, 0x0B, 0xFB,
-	0x9F, 0xBF, 0xE0, 0x17, 0xF8, 0x01, 0xBE, 0x83, 0x2F, 0xE0, 0x13, 0x78,
-	0x0F, 0xEA, 0xA2, 0x68, 0x40, 0x11, 0x28, 0x01, 0x3D, 0x41, 0x77, 0xD0,
-	0x05, 0x74, 0x00, 0xED, 0xED, 0xB5, 0x42, 0x33, 0xA6, 0xA5, 0xFD, 0xFF,
-	0x1F, 0x0B, 0x94, 0x26, 0xD4, 0x82, 0x6F, 0xE0, 0x2B, 0xF8, 0x08, 0xDE,
-	0x81, 0xD7, 0xA0, 0xC6, 0x5E, 0x0B, 0xB5, 0x01, 0x3D, 0x40, 0x5F, 0xD0,
-	0x0B, 0x14, 0x8B, 0xAE, 0x7C, 0x57, 0xD0, 0xDB, 0xCC, 0x28, 0xF6, 0x98,
-	0x51, 0x64, 0x26, 0x88, 0x05, 0x5F, 0xEB, 0x09, 0xFA, 0xAD, 0x05, 0xFD,
-	0x12, 0x7C, 0x10, 0xCD, 0x04, 0xFE, 0xED, 0x15, 0x78, 0x0E, 0xDE, 0x84,
-	0xCD, 0x00, 0x06, 0x3E, 0xD0, 0x82, 0x2F, 0xB1, 0xDF, 0x87, 0x80, 0x41,
-	0xA0, 0x1F, 0x68, 0xDD, 0xC4, 0xF7, 0xFD, 0x0D, 0x9E, 0x81, 0x47, 0xE0,
-	0x81, 0x05, 0x5E, 0x63, 0x26, 0x3C, 0x4E, 0x87, 0x11, 0xA9, 0x1A, 0xC0,
-	0x55, 0x2C, 0xB5, 0x40, 0xFB, 0x58, 0xB0, 0x23, 0xC1, 0x70, 0x7B, 0x2D,
-	0x9D, 0x62, 0x86, 0xDC, 0x01, 0xB7, 0xCC, 0x94, 0x17, 0x66, 0xCC, 0x7D,
-	0x49, 0x61, 0x6B, 0xA4, 0x62, 0x00, 0x03, 0x1E, 0x06, 0xFA, 0x1B, 0x65,
-	0x60, 0x6C, 0x8A, 0xEF, 0xD9, 0x18, 0xFD, 0x03, 0xD7, 0xC1, 0x15, 0xF0,
-	0xD4, 0xB8, 0x6B, 0x86, 0x64, 0xCD, 0x00, 0xAE, 0xF0, 0x50, 0xD1, 0x95,
-	0x1F, 0x03, 0x26, 0x83, 0x4E, 0x19, 0x0E, 0xDC, 0xAF, 0xCF, 0xA0, 0x0A,
-	0xDC, 0x10, 0xCD, 0x84, 0x7B, 0xA2, 0x19, 0x92, 0x51, 0x03, 0x58, 0xB4,
-	0x46, 0x8B, 0xAE, 0xFC, 0x60, 0x30, 0xC7, 0xCC, 0xC8, 0xA5, 0x18, 0xF4,
-	0x09, 0xF0, 0x50, 0x34, 0x13, 0x6E, 0x4A, 0x12, 0xAD, 0x33, 0x19, 0x03,
-	0xDA, 0x88, 0xA6, 0x38, 0x03, 0x1E, 0x01, 0x16, 0x88, 0x16, 0xBC, 0x30,
-	0x88, 0x85, 0xF1, 0x08, 0xB8, 0x6D, 0x86, 0x70, 0x8B, 0xFC, 0x4C, 0xA7,
-	0x01, 0x5C, 0xF9, 0x32, 0x0B, 0x9C, 0x26, 0x2C, 0x96, 0xEC, 0xA7, 0x7C,
-	0x22, 0x71, 0x4B, 0x1C, 0xB6, 0xE0, 0x69, 0x04, 0x6B, 0x44, 0xC2, 0x4C,
-	0x68, 0xAC, 0x01, 0xE3, 0xC1, 0x28, 0xFB, 0xB9, 0x44, 0xD2, 0x5F, 0xE1,
-	0xD3, 0x25, 0x76, 0x83, 0x83, 0xE0, 0x2A, 0xA8, 0xB6, 0x9F, 0x29, 0x1B,
-	0xC0, 0x94, 0x1F, 0x27, 0xBA, 0xF2, 0xCB, 0x25, 0x7C, 0x2B, 0xEF, 0x17,
-	0x33, 0x61, 0x9F, 0x68, 0x26, 0x5C, 0x93, 0x04, 0x85, 0x31, 0x91, 0x01,
-	0x6C, 0x75, 0x93, 0x44, 0x7B, 0xFB, 0x4A, 0x09, 0xCF, 0x9E, 0x4F, 0x24,
-	0xD6, 0x84, 0x3D, 0xA2, 0x33, 0xC3, 0x45, 0x69, 0xA0, 0x45, 0x36, 0x64,
-	0x00, 0xD3, 0x7C, 0x86, 0x68, 0xD5, 0x2F, 0x97, 0xDC, 0x57, 0xFB, 0x64,
-	0xC5, 0x95, 0x3F, 0x24, 0xDA, 0x15, 0xCE, 0x48, 0xC0, 0xB0, 0xD4, 0x90,
-	0x01, 0xDC, 0xF3, 0x13, 0xC0, 0x5C, 0xB0, 0x30, 0xD7, 0xD1, 0x34, 0x51,
-	0x95, 0xE0, 0x38, 0xB8, 0x2C, 0x5A, 0x13, 0x1A, 0x6D, 0x00, 0x67, 0xF9,
-	0xE9, 0xA2, 0x7B, 0x7F, 0xB5, 0x84, 0x7F, 0xDF, 0x07, 0x89, 0xF5, 0x60,
-	0x97, 0x68, 0x2D, 0x38, 0x2B, 0x71, 0xCE, 0x0E, 0x41, 0x06, 0x4C, 0x34,
-	0xCA, 0xCD, 0x84, 0x28, 0x8B, 0xC1, 0x73, 0x2B, 0x5C, 0x32, 0x12, 0x1A,
-	0xC0, 0xD5, 0x9F, 0x29, 0x3A, 0xDE, 0xAE, 0x95, 0xE8, 0x5F, 0x35, 0xE2,
-	0xD9, 0x61, 0x87, 0xE8, 0xD8, 0x7C, 0x5A, 0x7C, 0x59, 0x10, 0x2F, 0x38,
-	0xB6, 0xBB, 0x29, 0x60, 0xA9, 0x44, 0x7F, 0xF5, 0x63, 0x62, 0x16, 0x1C,
-	0x00, 0x17, 0x44, 0xDB, 0x63, 0xA0, 0x01, 0xAC, 0xFC, 0xF3, 0x45, 0xA7,
-	0xBE, 0x75, 0x12, 0xDE, 0x81, 0x27, 0x59, 0xB1, 0x03, 0x6C, 0x17, 0x9D,
-	0x0E, 0x8F, 0x8A, 0xA7, 0x23, 0xF8, 0x0D, 0x18, 0x00, 0x66, 0x81, 0x45,
-	0x12, 0xDD, 0xCA, 0x1F, 0x24, 0x76, 0x84, 0x0A, 0x70, 0x0A, 0x3C, 0x09,
-	0x32, 0x80, 0x85, 0x6F, 0x2A, 0x58, 0x25, 0x7A, 0xDA, 0x6B, 0x4E, 0xE2,
-	0x69, 0x71, 0x37, 0x38, 0x2F, 0x9E, 0x62, 0xE8, 0x35, 0x80, 0x07, 0x1E,
-	0xAE, 0x3A, 0x27, 0xBF, 0x0D, 0xD2, 0xF4, 0xCB, 0x58, 0x61, 0x15, 0x2F,
-	0xAF, 0x6D, 0x15, 0x9D, 0x0C, 0x99, 0x0D, 0x75, 0x7E, 0x03, 0x58, 0xFD,
-	0xE7, 0x89, 0xD6, 0x80, 0x15, 0xB9, 0xFE, 0xB4, 0x19, 0xD2, 0x5E, 0xD1,
-	0x1A, 0x70, 0x4C, 0xAC, 0x1B, 0x78, 0x0D, 0x60, 0xCA, 0xCF, 0x06, 0xCB,
-	0x44, 0xB7, 0x41, 0x73, 0x14, 0xD3, 0x7F, 0x3F, 0x38, 0x29, 0xBA, 0x25,
-	0xEA, 0x19, 0xC0, 0xD1, 0x97, 0xFD, 0x9F, 0xFB, 0xBF, 0x34, 0xD7, 0x9F,
-	0x34, 0x43, 0xE2, 0x05, 0x54, 0xD6, 0x01, 0xCE, 0x03, 0xD5, 0x7E, 0x03,
-	0x38, 0xF8, 0xF0, 0xF0, 0xB3, 0x46, 0xA2, 0x73, 0xEA, 0x4B, 0x56, 0x3C,
-	0x25, 0xEE, 0x14, 0x3D, 0x1C, 0x55, 0xF9, 0x0D, 0x60, 0xFA, 0x4F, 0x03,
-	0xEB, 0x25, 0xBA, 0xB3, 0x7F, 0x22, 0xF1, 0x6C, 0xB0, 0x0D, 0x9C, 0x13,
-	0xDD, 0x06, 0xF5, 0x0C, 0x60, 0x07, 0xE0, 0x04, 0xB8, 0x51, 0x9A, 0x5F,
-	0x07, 0x88, 0x89, 0x9D, 0x60, 0x8B, 0xE8, 0x44, 0x58, 0xE9, 0x37, 0x80,
-	0xC3, 0x0F, 0x8B, 0xDF, 0x26, 0x89, 0xFE, 0xFC, 0x1F, 0x24, 0x9E, 0x0B,
-	0x36, 0x8B, 0x16, 0xC3, 0x8A, 0xBC, 0x01, 0x92, 0xDF, 0x02, 0xF9, 0x22,
-	0x98, 0x6F, 0x83, 0x9E, 0x17, 0x9D, 0x1F, 0x84, 0x9C, 0x1F, 0x85, 0x9D,
-	0x3F, 0x0C, 0x39, 0x7F, 0x1C, 0xA6, 0x9C, 0xBE, 0x20, 0x42, 0x39, 0x7F,
-	0x49, 0xCC, 0xF9, 0x8B, 0xA2, 0x94, 0xD3, 0x97, 0xC5, 0x29, 0xE7, 0xBF,
-	0x18, 0xA1, 0x9C, 0xFE, 0x6A, 0x8C, 0x72, 0xFE, 0xCB, 0x51, 0xCA, 0xE9,
-	0xAF, 0xC7, 0x29, 0xE7, 0x6F, 0x90, 0xA0, 0x9C, 0xBE, 0x45, 0x26, 0x26,
-	0xA7, 0x6F, 0x92, 0x8A, 0xC9, 0xE9, 0xDB, 0xE4, 0x28, 0xE7, 0x6F, 0x94,
-	0xA4, 0x9C, 0xBE, 0x55, 0x36, 0x26, 0xA7, 0x6F, 0x96, 0xF6, 0xCA, 0xD9,
-	0xDB, 0xE5, 0xBD, 0x72, 0xFA, 0x81, 0x89, 0x98, 0x9C, 0x7E, 0x64, 0xC6,
-	0x2B, 0x67, 0x1F, 0x9A, 0x8A, 0x67, 0x84, 0x93, 0x8F, 0xCD, 0xF9, 0xE5,
-	0xEC, 0x83, 0x93, 0xF1, 0xE4, 0xE4, 0xA3, 0xB3, 0x91, 0x91, 0xF3, 0x06,
-	0xFC, 0x07, 0x2A, 0x0D, 0x50, 0x50, 0xCC, 0xB6, 0x51, 0x67, 0x00, 0x00,
-	0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82
-};
-
 
 // Regular functions
 static RpMaterial* AlphaTest(RpMaterial* pMaterial, void* pData)
@@ -362,11 +273,12 @@ RpAtomic* OnePassAlphaRender(RpAtomic* atomic)
 
 	RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &nAlphaBlending);
 
-	if ( nAlphaBlending != TRUE )
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(TRUE));
+	// RW caches those anyway, no need to duplicate caching
+	//if ( nAlphaBlending != TRUE )
+	//	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(TRUE));
 	atomic = AtomicDefaultRenderCallBack(atomic);
 
-	if ( nAlphaBlending != TRUE )
+	//if ( nAlphaBlending != TRUE )
 		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(nAlphaBlending));
 
 	return atomic;
@@ -654,7 +566,17 @@ bool GetCurrentZoneLockedOrUnlocked(float fPosX, float fPosY)
 void DrawMoonWithPhases(int moonColor, float* screenPos, float sizeX, float sizeY)
 {
 	if ( !gpMoonMask )
-		gpMoonMask = CPNGFile::ReadFromMemory(gMoonMaskPNG, sizeof(gMoonMaskPNG));
+	{
+		HMODULE thisModule;
+		GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCSTR)DrawMoonWithPhases, &thisModule);
+
+		HRSRC		resource = FindResource(thisModule, MAKEINTRESOURCE(IDR_LUNAR64), RT_RCDATA);
+		void*		pMoonMask = static_cast<void*>(LoadResource(thisModule, resource));
+
+		gpMoonMask = CPNGFile::ReadFromMemory(pMoonMask, SizeofResource(thisModule, resource));
+
+		FreeResource(pMoonMask);
+	}
 	//D3DPERF_BeginEvent(D3DCOLOR_ARGB(0,0,0,0), L"render moon");
 
 	float currentDayFraction = nGameClockDays / 31.0f;
diff --git a/SAFix/lunar64.png b/SAFix/lunar64.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dd9deed03f80d844f172aebf8c660750ae04516
GIT binary patch
literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000BQNkl<Zc-rlo
z*K1T!5XL8#XzZdv2^OqiP*JS0_liEm2EGVB=!1gjAEF5QpbvsCg7v`=dyid%qM~5M
zLQquf#uCf-F|%-U*_+K~+r2sa!H<w^Sa!ZMXJ*dbdke&I73BH@<XYJ<pcUu_I)jd&
z9cT**K@0nzzu*`60ltGT;1hTc>Y`{s5hwvYL3hvvbO7z`wL&wdrTzaO3zR0*f^Xm}
z_z2#C*PzB;3$+0~Kwr=c6pOBWSJ2zcDE639WG09OU+W3_tp)uOd=Sk9{_Pcb4&H>#
z00utLf-kY(hk!w#A86gg_x%l?fk)th1zuw&JWhuZsT#mlEVV%USg<3(aC<GCVusuS
zx6G6mX3Tv_VQZvf00SNd`Wt0nY>MyM82tm+!4>e-xNC-F%>b_OP|=ki115t`84ld9
z&!7t25Y2>pq8XA=16Z_1i>~}&FvrZur5N-H@K7`pZb}lZGZ_Qgh^9CL9sw4J7Q8Ts
zh4BcuZH91*{7k0-T=_B!oF*)m?5BJpaZ4Pw;AsSFM8ZsHtO4V}DEqlY(qG}zC3b^@
z;3}xLpD7!_lpiO$^2;TBEAJOGVV`IwT$2QaF_8gmb(2JU`$`GVo=+s!ggv4&!$oPJ
zMK)vr(|m?#)i0OaSNmkel|Llf70yV&u+)$N-18H_T(B_L(KJz&;5fJ}S`!*=0B8B>
zqI-X}gn!=$iS=NYXe~G^an24w223={&4eh6!E-BIG7=iV)t@Ok-maDCUp3;{VTb70
zd|G^25HC2kyD4C)M1S>TVip_#7ew1*paHD>^F^n=brRlzCt0xrY!{slkBX-w_zf5U
zW`RW#-O3*%c7zIW3OorifQ4@=SS5PeYfj>6aW^<Go?_@VfCnC~Iw!vk()7z%VHGd0
zZ55pinGJP*16cj%iPnG>x&E{n(q7RTa7?Tlcnx66&j!mxw?T6h(|<oWDY_-<8Nkt(
z{h#~4G}oUrL*fNg)&b4~)qVpw`0((vMxt}-OIAE3?i4*7Rrw8I`cDJvCAzbJBJpgn
z4V)9*2K5YJ2jB#_QJP-|h>4wGi|9mH={JDG4~yR>iT?Z_B%TX4ix$I*yaAHm0{J4C
zZ-br}ogajpABCMi3^{)srkuVYLOFj)%=wF=l+%~RDd)c!p`89|jB@_VQOfDB$0_G;
zkf5BtMJ6VvZ<311>D%Ne=WmpxoW4~yCZ}(f_R87Y<-KzHfr*%$eq_cgXCIo1XM~fF
o&H3f*gOl;(<fF5Zk@E)p2PzFvP|UVbX8-^I07*qoM6N<$f(6djga7~l

literal 0
HcmV?d00001

diff --git a/SAFix/resource.h b/SAFix/resource.h
index b26528c..5448397 100644
--- a/SAFix/resource.h
+++ b/SAFix/resource.h
@@ -1 +1,2 @@
 #define IDR_NVCSHADER			101
+#define IDR_LUNAR64				102