openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix Visual Studio build

Browse Source
This commit is contained in:
Celtic Minstrel
2016-09-13 22:54:53 -04:00
parent 67dc5b3511
commit d39da71778
10 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/boe.menus.win.cpp
View File

@@ -33,7 +33,6 @@ enum {
extern short on_spell_menu[2][62];
extern short on_monst_menu[256];
extern bool party_in_memory;
extern short current_pc;
extern cUniverse univ;
extern eGameMode overall_mode;
extern sf::RenderWindow mainPtr;
@@ -179,7 +178,7 @@ void adjust_spell_menus() {
short old_on_spell_menu[2][62];
bool need_menu_change = false;
if(overall_mode == MODE_STARTUP || current_pc == 6)
if(overall_mode == MODE_STARTUP || univ.cur_pc == 6)
return;
for(i = 0; i < 2; i++)
@@ -192,7 +191,7 @@ void adjust_spell_menus() {
on_spell_menu[0][i] = -1;
}
for(i = 0; i < 62; i++)
if(pc_can_cast_spell(current_pc, cSpell::fromNum(eSkill::MAGE_SPELLS, i))) {
if(pc_can_cast_spell(univ.current_pc(), cSpell::fromNum(eSkill::MAGE_SPELLS, i))) {
on_spell_menu[0][spell_pos] = i;
spell_pos++;
}
@@ -222,7 +221,7 @@ void adjust_spell_menus() {
on_spell_menu[1][i] = -1;
}
for(i = 0; i < 62; i++)
if(pc_can_cast_spell(current_pc, cSpell::fromNum(eSkill::PRIEST_SPELLS, i))) {
if(pc_can_cast_spell(univ.current_pc(), cSpell::fromNum(eSkill::PRIEST_SPELLS, i))) {
on_spell_menu[1][spell_pos] = i;
spell_pos++;
}