gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/edubart/otclient

This commit is contained in:
BenDol 2014-04-06 15:29:23 +12:00
parent 1baad726ae b19fb22146
commit 45b41b88bd
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gamelib/const.lua
View File

@ -105,6 +105,7 @@ GameNewOutfitProtocol = 49
GamePVPMode = 50 GamePVPMode = 50
GameWritableDate = 51 GameWritableDate = 51
GameAdditionalVipInfo = 52 GameAdditionalVipInfo = 52
GameSpritesAlphaChannel = 56
TextColors = { TextColors = {
red = '#f55e5e', --'#c83200' red = '#f55e5e', --'#c83200'

1
src/client/const.h
View File

@ -387,6 +387,7 @@ namespace Otc
GameBaseSkillU16 = 53, GameBaseSkillU16 = 53,
GameCreatureIcons = 54, GameCreatureIcons = 54,
GameHideNpcNames = 55, GameHideNpcNames = 55,
GameSpritesAlphaChannel = 56,
LastGameFeature = 101 LastGameFeature = 101
}; };

6
src/client/spritemanager.cpp
View File

@ -153,6 +153,8 @@ ImagePtr SpriteManager::getSpriteImage(int id)
uint8 *pixels = image->getPixelData(); uint8 *pixels = image->getPixelData();
int writePos = 0; int writePos = 0;
int read = 0; int read = 0;
bool useAlpha = g_game.getFeature(Otc::GameSpritesAlphaChannel);
uint8 channels = useAlpha ? 4 : 3;
// decompress pixels // decompress pixels
while(read < pixelDataSize && writePos < SPRITE_DATA_SIZE) { while(read < pixelDataSize && writePos < SPRITE_DATA_SIZE) {
@ -171,11 +173,11 @@ ImagePtr SpriteManager::getSpriteImage(int id)
pixels[writePos + 0] = m_spritesFile->getU8(); pixels[writePos + 0] = m_spritesFile->getU8();
pixels[writePos + 1] = m_spritesFile->getU8(); pixels[writePos + 1] = m_spritesFile->getU8();
pixels[writePos + 2] = m_spritesFile->getU8(); pixels[writePos + 2] = m_spritesFile->getU8();
pixels[writePos + 3] = 0xFF; pixels[writePos + 3] = useAlpha ? m_spritesFile->getU8() : 0xFF;
writePos += 4; writePos += 4;
} }
read += 4 + (3 * coloredPixels); read += 4 + (channels * coloredPixels);
} }
// fill remaining pixels with alpha // fill remaining pixels with alpha

2
src/framework/graphics/image.cpp
View File

@ -110,7 +110,7 @@ void Image::blit(const Point& dest, const ImagePtr& other)
int y = p / other->getWidth(); int y = p / other->getWidth();
int pos = ((dest.y + y) * m_size.width() + (dest.x + x)) * 4; int pos = ((dest.y + y) * m_size.width() + (dest.x + x)) * 4;
if(otherPixels[p*4+3] == 0xFF) { if (otherPixels[p*4+3] != 0) {
m_pixels[pos+0] = otherPixels[p*4+0]; m_pixels[pos+0] = otherPixels[p*4+0];
m_pixels[pos+1] = otherPixels[p*4+1]; m_pixels[pos+1] = otherPixels[p*4+1];
m_pixels[pos+2] = otherPixels[p*4+2]; m_pixels[pos+2] = otherPixels[p*4+2];