games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

* fixed 494

Browse Source 
* minor changes
This commit is contained in:
mateuszb 2010-08-05 11:47:57 +00:00
parent 78f44dc648
commit 6928f850b9
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/AdventureMapButton.h
View File

@ -89,6 +89,7 @@ public:
CHighlightableButton(const std::pair<std::string, std::string> help, const CFunctionList<void()> &onSelect, int x, int y, const std::string &defName, int myid, int key=0, std::vector<std::string> * add = NULL, bool playerColoredButton = false );//c-tor
CHighlightableButton(const std::string &Name, const std::string &HelpBox, const CFunctionList<void()> &onSelect, int x, int y, const std::string &defName, int myid, int key=0, std::vector<std::string> * add = NULL, bool playerColoredButton = false );//c-tor
bool onlyOn, selected;
int ID; //for identification
CFunctionList<void()> callback2; //when de-selecting
void select(bool on);
void clickLeft(tribool down, bool previousState);

2
client/GUIBase.h
View File

@ -309,8 +309,6 @@ public:
Rect pos, //position of object on the screen
posRelative; //position of object in the parent (not used if no parent)
int ID; //object ID, rarely used by some classes for identification / internal info
CIntObject();
virtual ~CIntObject(); //d-tor

2
client/GUIClasses.h
View File

@ -75,6 +75,7 @@ class CInfoWindow : public CSimpleWindow //text + comp. + ok button
bool delComps; //whether comps will be deleted
public:
int ID; //for identification
CTextBox *text;
std::vector<AdventureMapButton *> buttons;
std::vector<SComponent*> components;
@ -205,6 +206,7 @@ class CGarrisonInt;
class CGarrisonSlot : public CIntObject
{
public:
int ID; //for identification
CGarrisonInt *owner;
const CStackInstance *myStack; //NULL if slot is empty
const CCreature *creature;

6
client/mapHandler.cpp
View File

@ -501,7 +501,7 @@ void CMapHandler::terrainRect(int3 top_tile, unsigned char anim, const std::vect
SDL_SetClipRect(extSurf, extRect); //preventing blitting outside of that rect
const BlitterWithRotationVal blitterWithRotation = CSDL_Ext::getBlitterWithRotation(extSurf);
const BlitterWithRotationVal blitterWithRotationAndAlpja = CSDL_Ext::getBlitterWithRotationAndAlpha(extSurf);
const BlitterWithRotationVal blitterWithRotationAndAlpha = CSDL_Ext::getBlitterWithRotationAndAlpha(extSurf);
//const BlitterWithRotationAndAlphaVal blitterWithRotation = CSDL_Ext::getBlitterWithRotation(extSurf);
// printing terrain
@ -537,9 +537,9 @@ void CMapHandler::terrainRect(int3 top_tile, unsigned char anim, const std::vect
else //use default terrain graphic
blitterWithRotation(terrainGraphics[tinfo.tertype][tinfo.terview],rtile, extSurf, sr, tinfo.siodmyTajemniczyBajt%4);
if(tinfo.nuine) //print river if present
blitterWithRotationAndAlpja(staticRiverDefs[tinfo.nuine-1]->ourImages[tinfo.rivDir].bitmap,rtile, extSurf, sr, (tinfo.siodmyTajemniczyBajt>>2)%4);
blitterWithRotationAndAlpha(staticRiverDefs[tinfo.nuine-1]->ourImages[tinfo.rivDir].bitmap,rtile, extSurf, sr, (tinfo.siodmyTajemniczyBajt>>2)%4);
if(tinfo.malle) //print road if present
blitterWithRotationAndAlpja(roadDefs[tinfo.malle-1]->ourImages[tinfo.roadDir].bitmap,rtile, extSurf, sr, (tinfo.siodmyTajemniczyBajt>>4)%4);
blitterWithRotationAndAlpha(roadDefs[tinfo.malle-1]->ourImages[tinfo.roadDir].bitmap,rtile, extSurf, sr, (tinfo.siodmyTajemniczyBajt>>4)%4);
//blit objects
const std::vector < std::pair<const CGObjectInstance*,SDL_Rect> > &objects = tile.objects;

30
hch/CArtHandler.cpp
View File

@ -530,11 +530,11 @@ void CArtHandler::addBonuses()
ART_LUCK(47,+1); //Cards of Prophecy
ART_LUCK(48,+1); //Ladybird of Luck
ART_MORALE(49,+1); //Badge of Courage -> +1 morale and immunity to hostile mind spells:
giveArtBonus(49,Bonus::SPELL_IMMUNITY,50);//sorrow
giveArtBonus(49,Bonus::SPELL_IMMUNITY,59);//berserk
giveArtBonus(49,Bonus::SPELL_IMMUNITY,60);//hypnotize
giveArtBonus(49,Bonus::SPELL_IMMUNITY,61);//forgetfulness
giveArtBonus(49,Bonus::SPELL_IMMUNITY,62);//blind
giveArtBonus(49,Bonus::SPELL_IMMUNITY,0,50);//sorrow
giveArtBonus(49,Bonus::SPELL_IMMUNITY,0,59);//berserk
giveArtBonus(49,Bonus::SPELL_IMMUNITY,0,60);//hypnotize
giveArtBonus(49,Bonus::SPELL_IMMUNITY,0,61);//forgetfulness
giveArtBonus(49,Bonus::SPELL_IMMUNITY,0,62);//blind
ART_MORALE(50,+1); //Crest of Valor
ART_MORALE(51,+1); //Glyph of Gallantry
@ -595,7 +595,7 @@ void CArtHandler::addBonuses()
giveArtBonus(90,Bonus::WATER_WALKING, 0, 1);//Boots of Levitation
giveArtBonus(91,Bonus::NO_SHOTING_PENALTY,0);//Golden Bow
giveArtBonus(92,Bonus::SPELL_IMMUNITY,35);//Sphere of Permanence
giveArtBonus(92,Bonus::SPELL_IMMUNITY,0,35);//Sphere of Permanence
giveArtBonus(93,Bonus::NEGATE_ALL_NATURAL_IMMUNITIES,0);//Orb of Vulnerability
giveArtBonus(94,Bonus::STACK_HEALTH,+1);//Ring of Vitality
@ -606,14 +606,14 @@ void CArtHandler::addBonuses()
giveArtBonus(98,Bonus::LAND_MOVEMENT,+600);//Boots of Speed
giveArtBonus(99,Bonus::STACKS_SPEED,+2);//Cape of Velocity
giveArtBonus(100,Bonus::SPELL_IMMUNITY,59);//Pendant of Dispassion
giveArtBonus(101,Bonus::SPELL_IMMUNITY,62);//Pendant of Second Sight
giveArtBonus(102,Bonus::SPELL_IMMUNITY,42);//Pendant of Holiness
giveArtBonus(103,Bonus::SPELL_IMMUNITY,24);//Pendant of Life
giveArtBonus(104,Bonus::SPELL_IMMUNITY,25);//Pendant of Death
giveArtBonus(105,Bonus::SPELL_IMMUNITY,60);//Pendant of Free Will
giveArtBonus(106,Bonus::SPELL_IMMUNITY,17);//Pendant of Negativity
giveArtBonus(107,Bonus::SPELL_IMMUNITY,61);//Pendant of Total Recall
giveArtBonus(100,Bonus::SPELL_IMMUNITY,0,59);//Pendant of Dispassion
giveArtBonus(101,Bonus::SPELL_IMMUNITY,0,62);//Pendant of Second Sight
giveArtBonus(102,Bonus::SPELL_IMMUNITY,0,42);//Pendant of Holiness
giveArtBonus(103,Bonus::SPELL_IMMUNITY,0,24);//Pendant of Life
giveArtBonus(104,Bonus::SPELL_IMMUNITY,0,25);//Pendant of Death
giveArtBonus(105,Bonus::SPELL_IMMUNITY,0,60);//Pendant of Free Will
giveArtBonus(106,Bonus::SPELL_IMMUNITY,0,17);//Pendant of Negativity
giveArtBonus(107,Bonus::SPELL_IMMUNITY,0,61);//Pendant of Total Recall
giveArtBonus(108,Bonus::MORALE,+3);//Pendant of Courage
giveArtBonus(108,Bonus::LUCK,+3);//Pendant of Courage
@ -645,7 +645,7 @@ void CArtHandler::addBonuses()
//Armageddon's Blade
giveArtBonus(128, Bonus::SPELL, 3, 26, Bonus::INDEPENDENT_MAX);
giveArtBonus(128, Bonus::SPELL_IMMUNITY, 26);
giveArtBonus(128, Bonus::SPELL_IMMUNITY,0, 26);
ART_ATTACK_AND_DEFENSE(128, +3);
ART_PRIM_SKILL(128, 2, +3);
ART_PRIM_SKILL(128, 3, +6);