games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos.

Browse Source
This commit is contained in:
Frank Zago
2011-09-24 01:15:36 +00:00
parent c481177515
commit c4b8039c1e
24 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CBattleInterface.h
View File

@@ -75,7 +75,7 @@ public:
virtual void nextFrame()=0; //call every new frame
virtual void endAnim(); //to be called mostly internally; in this class it removes animation from pendingAnims list
bool isEarliest(bool perStackConcurrency); //determines if this animation is earlies of all
bool isEarliest(bool perStackConcurrency); //determines if this animation is earliest of all
unsigned int ID; //unique identifier
@@ -439,7 +439,7 @@ private:
const CStack * stackToActivate; //when animation is playing, we should wait till the end to make the next stack active; NULL of none
void activateStack(); //sets activeStack to stackToActivate etc.
int mouseHoveredStack; //stack hovered by mouse; if -1 -> none
time_t lastMouseHoveredStackAnimationTime; // time when last mouse hovered animation occured
time_t lastMouseHoveredStackAnimationTime; // time when last mouse hovered animation occurred
static const time_t HOVER_ANIM_DELTA;
std::vector<THex> occupyableHexes, //hexes available for active stack
attackableHexes; //hexes attackable by active stack

4
client/CCreatureAnimation.cpp
View File

@@ -75,7 +75,7 @@ CCreatureAnimation::CCreatureAnimation(std::string name) : internalFrame(0), onc
}
/*int unknown2 = readNormalNr<4>(i,FDef);*/ i+=4; //TODO use me
/*int unknown3 = readNormalNr<4>(i,FDef);*/ i+=4; //TODO use me
i+=13*totalInBlock; //ommiting names
i+=13*totalInBlock; //omitting names
for (j=0; j<totalInBlock; j++)
{
SEntries[totalEntries+j].offset = readNormalNr<4>(i,FDef); i+=4;
@@ -314,7 +314,7 @@ inline void CCreatureAnimation::putPixel(
else if (palc == 5) //selection highlight or transparent
{
if(blueBorder)
ColorPutter<bpp, 0>::PutColor(p, color.B, color.G - 0xf0 + animCount, color.R - 0xf0 + animCount); //shouldnt it be reversed? its bgr instead of rgb
ColorPutter<bpp, 0>::PutColor(p, color.B, color.G - 0xf0 + animCount, color.R - 0xf0 + animCount); //shouldn't it be reversed? its bgr instead of rgb
else if (yellowBorder)
ColorPutter<bpp, 0>::PutColor(p, color.R - 0xf0 + animCount, color.G - 0xf0 + animCount, color.B);
}

2
client/CMT.cpp
View File

@@ -433,7 +433,7 @@ void processCommand(const std::string &message)
conf.SetResolution(j->first.first, j->first.second);
conf.cc.screenx = j->first.first;
conf.cc.screeny = j->first.second;
tlog0 << "Screen resolution set to " << conf.cc.resx << " x " << conf.cc.resy <<". It will be aplied when the game starts.\n";
tlog0 << "Screen resolution set to " << conf.cc.resx << " x " << conf.cc.resy <<". It will be applied when the game starts.\n";
}
}
else if(message=="get txt")

2
client/CPlayerInterface.cpp
View File

@@ -690,7 +690,7 @@ void CPlayerInterface::battleStacksRemoved(const BattleStacksRemoved & bsr)
}
}
void CPlayerInterface::battleNewRound(int round) //called at the beggining of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn
void CPlayerInterface::battleNewRound(int round) //called at the beginning of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn
{
if(LOCPLINT != this)
{ //another local interface should do this

2
client/CPlayerInterface.h
View File

@@ -219,7 +219,7 @@ public:
void battleAttack(const BattleAttack *ba) OVERRIDE; //stack performs attack
void battleEnd(const BattleResult *br) OVERRIDE; //end of battle
void battleNewRoundFirst(int round) OVERRIDE; //called at the beginning of each turn before changes are applied; used for HP regen handling
void battleNewRound(int round) OVERRIDE; //called at the beggining of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn
void battleNewRound(int round) OVERRIDE; //called at the beginning of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn
void battleStackMoved(const CStack * stack, std::vector<THex> dest, int distance) OVERRIDE;
void battleSpellCast(const BattleSpellCast *sc) OVERRIDE;
void battleStacksEffectsSet(const SetStackEffect & sse) OVERRIDE; //called when a specific effect is set to stacks

2
client/GUIClasses.cpp
View File

@@ -4998,7 +4998,7 @@ void LRClickableAreaWTextComp::clickRight(tribool down, bool previousState)
}
}
LRClickableAreaWText::clickRight(down, previousState); //only if with-component variant not occured
LRClickableAreaWText::clickRight(down, previousState); //only if with-component variant not occurred
}
CHeroArea::CHeroArea(int x, int y, const CGHeroInstance * _hero):hero(_hero)

2
client/GUIClasses.h
View File

@@ -1034,7 +1034,7 @@ public:
AdventureMapButton * leftArtRoll, * rightArtRoll;
bool allowedAssembling;
std::multiset<const CArtifactInstance*> artifactsOnAltar; //artifacts id that are technically present in backpack but in GUI are moved to the altar - they'll be ommited in backpack slots
std::multiset<const CArtifactInstance*> artifactsOnAltar; //artifacts id that are technically present in backpack but in GUI are moved to the altar - they'll be omitted in backpack slots
boost::function<void(CArtPlace*)> highlightModeCallback; //if set, clicking on art place doesn't pick artifact but highlights the slot and calls this function
void realizeCurrentTransaction(); //calls callback with parameters stored in commonInfo

2
client/NetPacksClient.cpp
View File

@@ -711,7 +711,7 @@ void PackageApplied::applyCl( CClient *cl )
if(cl->waitingRequest.get() == packType)
cl->waitingRequest.setn(false);
else if(cl->waitingRequest.get())
tlog3 << "Suprising server message!\n";
tlog3 << "Surprising server message!\n";
}
void SystemMessage::applyCl( CClient *cl )

4
client/mapHandler.cpp
View File

@@ -247,7 +247,7 @@ void CMapHandler::initObjectRects()
const CGObjectInstance *obj = map->objects[f];
if( !obj
|| (obj->ID==HEROI_TYPE && static_cast<const CGHeroInstance*>(obj)->inTownGarrison) //garrisoned hero
|| (obj->ID==8 && static_cast<const CGBoat*>(obj)->hero) //boat wih hero (hero graphics is used)
|| (obj->ID==8 && static_cast<const CGBoat*>(obj)->hero) //boat with hero (hero graphics is used)
|| !obj->defInfo
|| !graphics->getDef(obj)) //no graphic...
{
@@ -349,7 +349,7 @@ void CMapHandler::init()
sizes.y = map->height;
sizes.z = map->twoLevel+1;
// Total number of visible tiles. Substract the center tile, then
// Total number of visible tiles. Subtract the center tile, then
// compute the number of tiles on each side, and reassemble.
int t1, t2;
t1 = (mapW-32)/2;