games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Fixed #964.

Browse Source 
Basic scrolling for commander artifacts. Needs tuning.
This commit is contained in:
DjWarmonger
2012-05-22 17:16:37 +00:00
parent 18e53a1717
commit 3e4d0e73e8
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/CCreatureWindow.cpp
View File

@@ -157,6 +157,9 @@ void CCreatureWindow::init(const CStackInstance *Stack, const CBonusSystemNode *
if (type < COMMANDER) if (type < COMMANDER)
commander = NULL; commander = NULL;
bool creArt = false;
displayedArtifact = ArtifactPosition::CREATURE_SLOT; // 0
//Basic graphics - need to calculate size //Basic graphics - need to calculate size
int commanderOffset = 0; int commanderOffset = 0;
@@ -291,19 +294,12 @@ void CCreatureWindow::init(const CStackInstance *Stack, const CBonusSystemNode *
if (GameConstants::STACK_ARTIFACT) if (GameConstants::STACK_ARTIFACT)
{ {
setArt(stack->getArt(ArtifactPosition::CREATURE_SLOT)); creArt = true;
if (type > BATTLE) //artifact buttons inactive in battle
{
//TODO: disable buttons if no artifact is equipped
leftArtRoll = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::scrollArt, this, -1), 437, 98, "hsbtns3.def", SDLK_LEFT);
rightArtRoll = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::scrollArt, this, +1), 516, 98, "hsbtns5.def", SDLK_RIGHT);
if (heroOwner)
passArtToHero = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::passArtifactToHero, this), 437, 148, "OVBUTN1.DEF", SDLK_HOME);
}
} }
} }
if (commander) //secondary skills if (commander) //secondary skills
{ {
creArt = true;
for (int i = ECommander::ATTACK; i <= ECommander::SPELL_POWER; ++i) for (int i = ECommander::ATTACK; i <= ECommander::SPELL_POWER; ++i)
{ {
if (commander->secondarySkills[i]) if (commander->secondarySkills[i])
@@ -347,6 +343,18 @@ void CCreatureWindow::init(const CStackInstance *Stack, const CBonusSystemNode *
printAtMiddle(boost::lexical_cast<std::string>((ui16)(commander->level)), 488, 62, FONT_MEDIUM, Colors::Jasmine,*bitmap); printAtMiddle(boost::lexical_cast<std::string>((ui16)(commander->level)), 488, 62, FONT_MEDIUM, Colors::Jasmine,*bitmap);
printAtMiddle(boost::lexical_cast<std::string>(stack->experience), 488, 82, FONT_SMALL, Colors::Cornsilk,*bitmap); printAtMiddle(boost::lexical_cast<std::string>(stack->experience), 488, 82, FONT_SMALL, Colors::Cornsilk,*bitmap);
} }
if (creArt) //stack or commander artifacts
{
setArt (stack->getArt(ArtifactPosition::CREATURE_SLOT));
if (type > BATTLE) //artifact buttons inactive in battle
{
//TODO: disable buttons if no artifact is equipped
leftArtRoll = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::scrollArt, this, -1), 437, 98, "hsbtns3.def", SDLK_LEFT);
rightArtRoll = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::scrollArt, this, +1), 516, 98, "hsbtns5.def", SDLK_RIGHT);
if (heroOwner)
passArtToHero = new CAdventureMapButton(std::string(), std::string(), boost::bind (&CCreatureWindow::passArtifactToHero, this), 437, 148, "OVBUTN1.DEF", SDLK_HOME);
}
}
if (battleStack) //only during battle if (battleStack) //only during battle
{ {
@@ -486,24 +494,28 @@ void CCreatureWindow::sliderMoved(int newpos)
redraw(); redraw();
} }
void CCreatureWindow::setArt(const CArtifactInstance *creatureArtifact) void CCreatureWindow::setArt(const CArtifactInstance *art)
{ {
creatureArtifact = stack->getArt(ArtifactPosition::CREATURE_SLOT); creatureArtifact = art;
if (creatureArtifact) if (creatureArtifact)
{ {
if (artifactImage == NULL) if (artifactImage == NULL)
addChild(artifactImage = new CAnimImage("ARTIFACT", creatureArtifact->artType->id, 0, 466, 100), true); artifactImage = new CAnimImage("ARTIFACT", creatureArtifact->artType->id, 0, 466, 100);
else else
artifactImage->setFrame(creatureArtifact->artType->id); artifactImage->setFrame(creatureArtifact->artType->id);
} }
else else
delChildNUll(artifactImage); artifactImage = NULL;
redraw();
} }
void CCreatureWindow::scrollArt(int dir) void CCreatureWindow::scrollArt(int dir)
{ {
//TODO: get next artifact //TODO: get next artifact
setArt(stack->getArt(ArtifactPosition::CREATURE_SLOT)); int size = stack->artifactsWorn.size();
displayedArtifact = size ? (displayedArtifact + dir) % size : ArtifactPosition::CREATURE_SLOT;
setArt (stack->getArt(displayedArtifact));
} }
void CCreatureWindow::passArtifactToHero() void CCreatureWindow::passArtifactToHero()
@@ -511,7 +523,7 @@ void CCreatureWindow::passArtifactToHero()
const CGHeroInstance * h = dynamic_cast<const CGHeroInstance *>(stack->armyObj); const CGHeroInstance * h = dynamic_cast<const CGHeroInstance *>(stack->armyObj);
if (h && creatureArtifact) if (h && creatureArtifact)
{ {
LOCPLINT->cb->swapArtifacts (ArtifactLocation (stack, ArtifactPosition::CREATURE_SLOT), ArtifactLocation(h, creatureArtifact->firstBackpackSlot(h))); LOCPLINT->cb->swapArtifacts (ArtifactLocation (stack, displayedArtifact), ArtifactLocation(h, creatureArtifact->firstBackpackSlot(h)));
} }
else else
tlog2 << "Pass artifact to hero should be disabled, no hero or no artifact!\n"; tlog2 << "Pass artifact to hero should be disabled, no hero or no artifact!\n";
@@ -521,11 +533,14 @@ void CCreatureWindow::passArtifactToHero()
void CCreatureWindow::artifactRemoved (const ArtifactLocation &artLoc) void CCreatureWindow::artifactRemoved (const ArtifactLocation &artLoc)
{ {
setArt(stack->getArt(ArtifactPosition::CREATURE_SLOT)); //TODO: select next from the list (for Commanders) //TODO: align artifacts to remove holes
int size = stack->artifactsWorn.size();
displayedArtifact = size ? (displayedArtifact % size) : ArtifactPosition::CREATURE_SLOT; //0
setArt (stack->getArt(displayedArtifact));
} }
void CCreatureWindow::artifactMoved (const ArtifactLocation &artLoc, const ArtifactLocation &destLoc) void CCreatureWindow::artifactMoved (const ArtifactLocation &artLoc, const ArtifactLocation &destLoc)
{ {
setArt(stack->getArt(ArtifactPosition::CREATURE_SLOT)); //TODO: select next from the list (for Commanders) artifactRemoved (artLoc); //same code
} }
void CCreatureWindow::clickRight(tribool down, bool previousState) void CCreatureWindow::clickRight(tribool down, bool previousState)

1
client/CCreatureWindow.h
View File

@@ -44,6 +44,7 @@ public:
//bool active; //TODO: comment me //bool active; //TODO: comment me
int type;//0 - rclick popup; 1 - normal window int type;//0 - rclick popup; 1 - normal window
int bonusRows; //height of skill window int bonusRows; //height of skill window
int displayedArtifact;
std::string count; //creature count in text format std::string count; //creature count in text format
const CCreature *c; //related creature const CCreature *c; //related creature