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

Fix spellcasting and dynamic menus

Browse Source 
- Spell targeting line and array draws nicely, though not the same as the original
- Fix targeting falsely complaining about being off the edge of town
- Monster info dialog works properly; attacks now display correctly
- Fix dialogs always showing the wrong terrain or monster graphic
- Spell menus, monster menus, and PC editor item menus all work
- Spellcasting dialog now chooses the correct spell
- Fix out-of-place LED in spellcasting dialog
This commit is contained in:
Celtic Minstrel
2014-04-22 02:06:31 -04:00
parent d90a006e43
commit a4430cdf5a
15 changed files with 71 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
osx/boe.main.cpp
View File

@@ -305,13 +305,13 @@ void Handle_One_Event()
clear_sound_memory();
if(map_visible && mini_map.pollEvent(event)){
if(event.type == sf::Event::Closed) {
mini_map.setVisible(false);
map_visible = false;
} else if(event.type == sf::Event::GainedFocus)
makeFrontWindow(mainPtr);
}
if(map_visible && mini_map.pollEvent(event)){
if(event.type == sf::Event::Closed) {
mini_map.setVisible(false);
map_visible = false;
} else if(event.type == sf::Event::GainedFocus)
makeFrontWindow(mainPtr);
}
if(!mainPtr.pollEvent(event)) {
if(changed_display_mode) {
changed_display_mode = false;
@@ -344,9 +344,6 @@ void Handle_One_Event()
if(!gInBackground) {
location where(event.mouseMove.x, event.mouseMove.y);
change_cursor(where);
// TODO: Probably don't actually need the conditional here?
if(animTimer.getElapsedTime().asMilliseconds() % fiveTicks <= 60)
draw_targeting_line(where);
}
break;
@@ -689,38 +686,6 @@ void handle_actions_menu(int item_hit)
}
}
// TODO: Maybe just use handle_menu_spell instead
void handle_mage_spells_menu(int item_hit)
{
switch (item_hit) {
case 1:
give_help(209,0);
break;
default:
if (prime_time() == false) {
ASB("Finish what you're doing first.");
print_buf();
}
else handle_menu_spell(on_spell_menu[0][item_hit - 3],0);
break;
}
}
void handle_priest_spells_menu(int item_hit)
{
switch (item_hit) {
case 1:
give_help(209,0);
break;
default:
if (prime_time() == false) {
ASB("Finish what you're doing first.");
print_buf();
}
else handle_menu_spell(on_spell_menu[1][item_hit - 3],1);
break;
}
}
// TODO: Let this function take a cMonster* instead of the item_hit
void handle_monster_info_menu(int item_hit)
{