Merge branch 'master' into dev

This commit is contained in:
Silent 2018-06-13 21:18:04 +02:00
commit 02f7063535
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
2 changed files with 2 additions and 2 deletions

View file

@ -700,7 +700,7 @@ CRGBA* CRGBA::BlendGangColour_Dynamic(uint8_t r, uint8_t g, uint8_t b, uint8_t a
{
return BlendGangColour(r, g, b, a);
}
*this = HudColour[3];
*this = CRGBA(HudColour[3], a);
return this;
}

View file

@ -6,7 +6,7 @@
<SILENTPATCH_EXT>.asi</SILENTPATCH_EXT>
<SILENTPATCH_FULL_NAME>SilentPatch for San Andreas</SILENTPATCH_FULL_NAME>
<SILENTPATCH_REVISION_ID>29</SILENTPATCH_REVISION_ID>
<SILENTPATCH_BUILD_ID>1</SILENTPATCH_BUILD_ID>
<SILENTPATCH_BUILD_ID>2</SILENTPATCH_BUILD_ID>
<SILENTPATCH_COPYRIGHT>2014-2018</SILENTPATCH_COPYRIGHT>
</PropertyGroup>
<PropertyGroup />