Commit 59657fcbfa88a8f7a15bf4350f8addf399e20bda

Tree SHA1: e5a9a85
Parent SHA1: 2f55dd1 (Speed code unification part 3: Made the client handle the speed in tiles per second in TMWserv.)
raw diff | raw patch

Make sure item icons in the invy are full opacity


67	67	{
68	68	if (mItem)
69	69	{
70		if (mAlpha != mItem->getImage()->getAlpha())
71		mItem->getImage()->setAlpha(mAlpha);
	70	Image *image = mItem->getDrawImage();
72	71
73		graphics->drawImage(mItem->getImage(),
74		mX * 32 + offsetX,
75		mY * 32 + offsetY);
	72	if (image && mAlpha != image->getAlpha())
	73	image->setAlpha(mAlpha);
	74
	75	graphics->drawImage(image, mX * 32 + offsetX, mY * 32 + offsetY);
76	76	}
77	77	}


27	27
28	28	Item::Item(int id, int quantity, bool equipment, bool equipped):
29	29	mImage(0),
	30	mDrawImage(0),
30	31	mQuantity(quantity),
31	32	mEquipment(equipment), mEquipped(equipped), mInEquipment(false)
32	33	{
…	…
51	51	if (mImage)
52	52	mImage->decRef();
53	53
	54	if (mDrawImage)
	55	mDrawImage->decRef();
	56
54	57	ResourceManager *resman = ResourceManager::getInstance();
55	58	std::string imagePath = "graphics/items/" + getInfo().getImageName();
56	59	mImage = resman->getImage(imagePath);
	60	mDrawImage = resman->getImage(imagePath);
57	61
58	62	if (!mImage)
59	63	mImage = resman->getImage("graphics/gui/unknown-item.png");
	64
	65	if (!mDrawImage)
	66	mDrawImage = resman->getImage("graphics/gui/unknown-item.png");
60	67	}


59	59	Image *getImage() { return mImage; }
60	60
61	61	/**
	62	* Returns the item image.
	63	*/
	64	Image *getDrawImage() { return mDrawImage; }
	65
	66	/**
62	67	* Sets the number of items.
63	68	*/
64	69	void setQuantity(int quantity) { mQuantity = quantity; }
…	…
126	126	protected:
127	127	int mId; /*< Item type id. /
128	128	Image mImage; /< Item image. /
	129	Image mDrawImage; /< Draw image. /
129	130	int mQuantity; /*< Number of items. /
130	131	bool mEquipment; /*< Item is equipment. /
131	132	bool mEquipped; /*< Item is equipped. /