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

OsX[AppleEvents]: try to avoid some crash by delaying the function which is called

Browse Source 
by such events...

Fixes #292
This commit is contained in:
ALONSO Laurent
2022-07-14 12:56:10 +02:00
committed by Celtic Minstrel
parent eea6166b11
commit e2a4fcc788
8 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/game/boe.menus.mac.mm
View File

@@ -16,6 +16,9 @@
#include "boe.consts.hpp"
#include "spell.hpp"
extern eMenuChoice menuChoice;
extern short menuChoiceId;
extern short on_spell_menu[2][62];
extern short on_monst_menu[256];
extern bool party_in_memory;
@@ -282,16 +285,22 @@ void menu_activate() {
-(void) monstMenu:(id) sender {
cMonster* monst = [[sender representedObject] monst];
(void) monst; // Mark variable as unused
handle_monster_info_menu([monster_info_menu indexOfItem: sender] - 1);
menuChoice=eMenuChoice::MENU_CHOICE_MONSTER_INFO;
menuChoiceId=short([monster_info_menu indexOfItem: sender] - 1);
//handle_monster_info_menu([monster_info_menu indexOfItem: sender] - 1);
}
-(void) spellMenu:(id) sender {
SpellWrapper* spell = [sender representedObject];
handle_menu_spell(cSpell::fromNum([spell type], [spell num]));
menuChoice=eMenuChoice::MENU_CHOICE_SPELL;
menuChoiceId=short(cSpell::fromNum([spell type], [spell num]));
//handle_menu_spell(cSpell::fromNum([spell type], [spell num]));
}
-(void) menuChoice:(id) sender {
handle_menu_choice(eMenu([[sender representedObject] intValue]));
menuChoice=eMenuChoice::MENU_CHOICE_GENERIC;
menuChoiceId=short([[sender representedObject] intValue]);
//handle_menu_choice(eMenu([[sender representedObject] intValue]));
}
@end