From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FlashAvatars/src/cflash.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/FlashAvatars') diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp index c06a6c40d7..7b280a6e45 100644 --- a/plugins/FlashAvatars/src/cflash.cpp +++ b/plugins/FlashAvatars/src/cflash.cpp @@ -31,13 +31,13 @@ int __fastcall strcmpnull(const char *str1, const char *str2) { struct flash_avatar_item : public MZeroedObject { - HCONTACT hContact; + MCONTACT hContact; FLASHAVATAR hFA; IShockwaveFlash* pFlash; char* getProto() { return (hFA.cProto) ? hFA.cProto : GetContactProto(hFA.hContact); } - flash_avatar_item(HCONTACT contact, FLASHAVATAR& fa, IShockwaveFlash *flash) { hContact = contact; hFA = fa; pFlash = flash; } + flash_avatar_item(MCONTACT contact, FLASHAVATAR& fa, IShockwaveFlash *flash) { hContact = contact; hFA = fa; pFlash = flash; } }; static int CompareFlashItems(const flash_avatar_item* p1, const flash_avatar_item* p2) { @@ -477,13 +477,13 @@ static int statusChanged(WPARAM wParam, LPARAM lParam) Lock l(cs); for(int i = 0; i < FlashList.getCount(); i++) { flash_avatar_item *item = FlashList[i]; - if (item->hContact == (HCONTACT)wParam) { + if (item->hContact == (MCONTACT)wParam) { IShockwaveFlash* flash = item->pFlash; if (flash) { getFace(); flash->SetVariable(L"face.emotion", _bstr_t(face).copy()); } - } else if (item->hContact > (HCONTACT)wParam) + } else if (item->hContact > (MCONTACT)wParam) break; // the list is sorted by hContact } return 0; @@ -542,7 +542,7 @@ static int eventAdded(WPARAM wParam, LPARAM lParam) face = AV_NORMAL; } - HCONTACT hContact = (dbei.flags & DBEF_SENT) ? 0 : (HCONTACT)wParam; + MCONTACT hContact = (dbei.flags & DBEF_SENT) ? 0 : (MCONTACT)wParam; for(int i=0; ihContact == hContact && !strcmpnull(dbei.szModule, item->getProto())) { -- cgit v1.2.3