games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

* Fixed bug 38. (Swapping with artifact from backpack)

Browse Source
This commit is contained in:
OnionKnight
2009-11-06 02:26:25 +00:00
parent f7a1b74092
commit e040033950
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/GUIClasses.cpp
View File

@@ -3540,7 +3540,11 @@ void CArtPlace::clickLeft(tribool down, bool previousState)
} }
break; break;
default: default:
LOCPLINT->cb->swapArtifacts(ourOwner->commonInfo->activeArtPlace->ourOwner->curHero, ourOwner->commonInfo->activeArtPlace->slotID, ourOwner->curHero, ourOwner->curHero->artifacts.size()+19); LOCPLINT->cb->swapArtifacts(
ourOwner->commonInfo->activeArtPlace->ourOwner->curHero,
ourOwner->commonInfo->activeArtPlace->slotID,
ourOwner->curHero,
ourOwner->curHero->artifacts.size() + 19);
break; break;
} }
} }
@@ -3550,7 +3554,11 @@ void CArtPlace::clickLeft(tribool down, bool previousState)
int destSlot = slotID, int destSlot = slotID,
srcSlot = ourOwner->commonInfo->activeArtPlace->slotID; srcSlot = ourOwner->commonInfo->activeArtPlace->slotID;
LOCPLINT->cb->swapArtifacts(ourOwner->curHero,destSlot,ourOwner->commonInfo->activeArtPlace->ourOwner->curHero,srcSlot); LOCPLINT->cb->swapArtifacts(
ourOwner->curHero,
destSlot,
ourOwner->commonInfo->activeArtPlace->ourOwner->curHero,
srcSlot);
ourOwner->commonInfo->activeArtPlace->clicked = false; ourOwner->commonInfo->activeArtPlace->clicked = false;
ourOwner->commonInfo->activeArtPlace = NULL; ourOwner->commonInfo->activeArtPlace = NULL;
@@ -3603,8 +3611,8 @@ void CArtPlace::show(SDL_Surface *to)
bool CArtPlace::fitsHere(const CArtifact * art) bool CArtPlace::fitsHere(const CArtifact * art)
{ {
if(!art) if(!art)
return true; //you can have no artifact somewhere return true; // You can place 'no artifact' anywhere.
if(slotID > 18 && art->id >= 3 && art->id <= 6 //everything can bee placed in backpack exept of War Machines if(slotID > 18 && !(art->id >= 3 && art->id <= 6) // Anything can be placed in the backpack, except War Machines.
|| vstd::contains(art->possibleSlots,slotID)) || vstd::contains(art->possibleSlots,slotID))
{ {
return true; return true;