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

* fixed previous fix

Browse Source 
* fixed bug #20 from mantis
This commit is contained in:
mateuszb
2009-10-03 10:51:05 +00:00
parent e0b65d7893
commit 78517a4397
4 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CMessage.cpp
View File

@ -29,7 +29,8 @@
SDL_Color tytulowy = {229, 215, 123, 0}, SDL_Color tytulowy = {229, 215, 123, 0},
tlo = {66, 44, 24, 0}, tlo = {66, 44, 24, 0},
zwykly = {255, 255, 255, 0}; zwykly = {255, 255, 255, 0},
darkTitle = {215, 175, 78, 0};
extern SDL_Surface * screen; extern SDL_Surface * screen;
extern TTF_Font * TNRB16, *TNR, *GEOR13; extern TTF_Font * TNRB16, *TNR, *GEOR13;

23
client/CSpellWindow.cpp
View File

@ -26,7 +26,7 @@
*/ */
extern SDL_Surface * screen; extern SDL_Surface * screen;
extern SDL_Color tytulowy, zwykly ; extern SDL_Color tytulowy, zwykly, darkTitle;
extern TTF_Font *GEOR16; extern TTF_Font *GEOR16;
SpellbookInteractiveArea::SpellbookInteractiveArea(const SDL_Rect & myRect, boost::function<void()> funcL, const std::string & textR, boost::function<void()> funcHon, boost::function<void()> funcHoff) SpellbookInteractiveArea::SpellbookInteractiveArea(const SDL_Rect & myRect, boost::function<void()> funcL, const std::string & textR, boost::function<void()> funcHon, boost::function<void()> funcHoff)
@ -462,15 +462,26 @@ void CSpellWindow::show(SDL_Surface *to)
//printing border (indicates level of magic school) //printing border (indicates level of magic school)
blitAt(schoolBorders[bestSchool]->ourImages[bestslvl].bitmap, spellAreas[b]->pos.x, spellAreas[b]->pos.y, to); blitAt(schoolBorders[bestSchool]->ourImages[bestslvl].bitmap, spellAreas[b]->pos.x, spellAreas[b]->pos.y, to);
SDL_Color firstLineColor, secondLineColor;
if(LOCPLINT->cb->getSpellCost(spell, myHero) > myHero->mana) //hero cannot cast this spell
{
firstLineColor = zwykly;
secondLineColor = darkTitle;
}
else
{
firstLineColor = tytulowy;
secondLineColor = zwykly;
}
//printing spell's name //printing spell's name
CSDL_Ext::printAtMiddle(spell->name, spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 70, GEORM, tytulowy, to); CSDL_Ext::printAtMiddle(spell->name, spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 70, FONT_TIMES, firstLineColor, to);
//printing lvl //printing lvl
CSDL_Ext::printAtMiddle(CGI->generaltexth->allTexts[171 + spell->level], spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 82, GEORM, zwykly, to); CSDL_Ext::printAtMiddle(CGI->generaltexth->allTexts[171 + spell->level], spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 82, FONT_TIMES, secondLineColor, to);
//printing cost //printing cost
std::ostringstream ss; std::ostringstream ss;
ss<<CGI->generaltexth->allTexts[387]<<": "<<LOCPLINT->cb->getSpellCost(spell, myHero); ss<<CGI->generaltexth->allTexts[387]<<": "<<LOCPLINT->cb->getSpellCost(spell, myHero);
CSDL_Ext::printAtMiddle(ss.str(), spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 94, GEORM, zwykly, to); CSDL_Ext::printAtMiddle(ss.str(), spellAreas[b]->pos.x + 39, spellAreas[b]->pos.y + 94, FONT_TIMES, secondLineColor, to);
} }
} }
@ -654,11 +665,11 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
if(!down && mySpell!=-1) if(!down && mySpell!=-1)
{ {
//we will cast a spell //we will cast a spell
if(LOCPLINT->battleInt) //if battle window is open if(LOCPLINT->battleInt && LOCPLINT->cb->battleCanCastSpell() && LOCPLINT->cb->getSpellCost(&CGI->spellh->spells[mySpell], owner->myHero) <= owner->myHero->mana) //if battle window is open
{ {
LOCPLINT->battleInt->castThisSpell(mySpell); LOCPLINT->battleInt->castThisSpell(mySpell);
owner->fexitb();
} }
owner->fexitb();
} }
} }

2
client/VCMI_client.rc
View File

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include "winresrc.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS

23
client/afxres.h
View File

@ -1,23 +0,0 @@
#ifndef _AFXRES_H
#define _AFXRES_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _WINDOWS_H
#include <windows.h>
#endif
/* IDC_STATIC is documented in winuser.h, but not defined. */
#ifndef IDC_STATIC
#define IDC_STATIC (-1)
#endif
#ifdef __cplusplus
}
#endif
#endif