Skip to content

Commit

Permalink
Rename field
Browse files Browse the repository at this point in the history
  • Loading branch information
@Eli2
Eli2 committed Jul 10, 2014
1 parent 6ed1b91 commit 6b007ae
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions src/game/magic/SpellData.cpp
View file
Expand Up @@ -33,7 +33,7 @@ void spellDataInit() {
spellicons[i].spellid = SPELL_NONE;
spellicons[i].tc = NULL;
spellicons[i].bSecret = false;
spellicons[i].bDuration = true;
spellicons[i].m_hasDuration = true;
spellicons[i].bAudibleAtStart = false;
}

Expand All @@ -55,7 +55,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_magic_projectile");
current->level=1;
current->spellid=SPELL_MAGIC_MISSILE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_magic_missile");
current->symbols[0]=RUNE_AAM;
Expand All @@ -67,7 +67,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_ignit");
current->level=1;
current->spellid=SPELL_IGNIT;
current->bDuration = false;
current->m_hasDuration = false;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_ignite");
current->symbols[0]=RUNE_AAM;
current->symbols[1]=RUNE_YOK;
Expand All @@ -78,7 +78,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_douse");
current->level=1;
current->spellid=SPELL_DOUSE;
current->bDuration = false;
current->m_hasDuration = false;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_douse");
current->symbols[0]=RUNE_NHI;
current->symbols[1]=RUNE_YOK;
Expand Down Expand Up @@ -174,7 +174,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_fireball");
current->level=3;
current->spellid=SPELL_FIREBALL;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_fireball");
current->symbols[0]=RUNE_AAM;
Expand All @@ -198,7 +198,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_ice_projectile");
current->level=3;
current->spellid=SPELL_ICE_PROJECTILE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_iceball");
current->symbols[0]=RUNE_AAM;
Expand Down Expand Up @@ -319,7 +319,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_poison_projection");
current->level=5;
current->spellid=SPELL_POISON_PROJECTILE;
current->bDuration = false;
current->m_hasDuration = false;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_poison_projection");
current->symbols[0]=RUNE_AAM;
current->symbols[1]=RUNE_CETRIUS;
Expand Down Expand Up @@ -420,7 +420,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_lightning_strike");
current->level=7;
current->spellid=SPELL_LIGHTNING_STRIKE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_lightning_strike");
current->symbols[0]=RUNE_AAM;
Expand Down Expand Up @@ -464,7 +464,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_explosion");
current->level=8;
current->spellid=SPELL_EXPLOSION;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_explosion");
current->symbols[0]=RUNE_AAM;
Expand Down Expand Up @@ -536,7 +536,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_incinerate");
current->level=9;
current->spellid=SPELL_INCINERATE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_incinerate");
current->symbols[0]=RUNE_AAM;
Expand All @@ -560,7 +560,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_mass_lightning_strike");
current->level=10;
current->spellid=SPELL_MASS_LIGHTNING_STRIKE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_mass_lighting_strike");
current->symbols[0]=RUNE_AAM;
Expand Down Expand Up @@ -593,7 +593,7 @@ void spellDataInit() {
current->description = getLocalised("system_spell_description_mass_incinerate");
current->level=10;
current->spellid=SPELL_MASS_INCINERATE;
current->bDuration = false;
current->m_hasDuration = false;
current->bAudibleAtStart = true;
current->tc=TextureContainer::LoadUI("graph/interface/icons/spell_mass_incinerate");
current->symbols[0]=RUNE_MEGA;
Expand Down
2 changes: 1 addition & 1 deletion src/game/magic/SpellData.h
View file
Expand Up @@ -35,7 +35,7 @@ struct SPELL_ICON {
SpellType spellid;
Rune symbols[6];
bool bSecret;
bool bDuration;
bool m_hasDuration;
bool bAudibleAtStart;
};

Expand Down
4 changes: 2 additions & 2 deletions src/gui/Hud.cpp
View file
Expand Up @@ -1999,7 +1999,7 @@ class ActiveSpellsGui {

if( spell
&& spell->m_caster == PlayerEntityHandle
&& spellicons[spell->m_type].bDuration
&& spellicons[spell->m_type].m_hasDuration
) {
ManageSpellIcon(*spell, intensity, false);
}
Expand All @@ -2016,7 +2016,7 @@ class ActiveSpellsGui {
continue;
}

if(spell->m_caster != PlayerEntityHandle && spellicons[spell->m_type].bDuration) {
if(spell->m_caster != PlayerEntityHandle && spellicons[spell->m_type].m_hasDuration) {
ManageSpellIcon(*spell, intensity, true);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/Interface.cpp
View file
Expand Up @@ -1665,7 +1665,7 @@ void ArxGame::managePlayerControls()
SpellBase * spell = spells[SpellHandle(i)];

if(spell && spell->m_caster == PlayerEntityHandle)
if(spellicons[spell->m_type].bDuration) {
if(spellicons[spell->m_type].m_hasDuration) {
ARX_SOUND_PlaySFX(SND_MAGIC_FIZZLE);
spell->m_duration = 0;
break;
Expand Down

0 comments on commit 6b007ae

Please sign in to comment.