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

Rearrange Mac PC editor menus to match the Windows PC editor menus

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-30 18:21:58 -05:00
parent fc22cdcc7d
commit 16d31f4a3f
3 changed files with 195 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/pcedit/pc.main.cpp
View File

@@ -243,9 +243,8 @@ static void display_strings(short nstr, pic_num_t pic) {
display_strings.show(); display_strings.show();
} }
void handle_extra_menu(int item_hit) { void handle_edit_menus(int item_hit) {
short i; short i,j,k;
//cVehicle v_boat = {{12,17},{0,0},{0,0},80,true,false};
if(file_in_mem.empty()) { if(file_in_mem.empty()) {
display_strings(5, 7); display_strings(5, 7);
@@ -259,7 +258,7 @@ void handle_extra_menu(int item_hit) {
edit_gold_or_food(1); edit_gold_or_food(1);
break; break;
case 4: case 103:
if(univ.party.is_split() > 0) { if(univ.party.is_split() > 0) {
cChoiceDlog("reunite-first").show(); cChoiceDlog("reunite-first").show();
break; break;
@@ -268,7 +267,7 @@ void handle_extra_menu(int item_hit) {
leave_town(); leave_town();
break; break;
case 5: case 16:
if(univ.party.is_split() == 0) { if(univ.party.is_split() == 0) {
cChoiceDlog("not-split").show(); cChoiceDlog("not-split").show();
break; break;
@@ -281,29 +280,29 @@ void handle_extra_menu(int item_hit) {
break; break;
case 6: case 104:
display_strings(20,7); display_strings(20,7);
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)
univ.party.creature_save[i].which_town = 200; univ.party.creature_save[i].which_town = 200;
break; break;
case 8: // damage case 5: // damage
display_strings(1,15); display_strings(1,15);
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
univ.party[i].cur_health = univ.party[i].max_health; univ.party[i].cur_health = univ.party[i].max_health;
break; break;
case 9: // spell pts case 6: // spell pts
display_strings(2,15); display_strings(2,15);
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
univ.party[i].cur_sp = univ.party[i].max_sp; univ.party[i].cur_sp = univ.party[i].max_sp;
break; break;
case 10: // raise dead case 7: // raise dead
display_strings(3,15); display_strings(3,15);
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
if(univ.party[i].main_status == eMainStatus::DEAD || univ.party[i].main_status == eMainStatus::DUST || if(univ.party[i].main_status == eMainStatus::DEAD || univ.party[i].main_status == eMainStatus::DUST ||
univ.party[i].main_status == eMainStatus::STONE) univ.party[i].main_status == eMainStatus::STONE)
univ.party[i].main_status = eMainStatus::ALIVE; univ.party[i].main_status = eMainStatus::ALIVE;
break; break;
case 11: // conditions case 8: // conditions
display_strings(4,15); display_strings(4,15);
for(i = 0; i < 6; i++) { for(i = 0; i < 6; i++) {
univ.party[i].status[eStatus::POISON] = 0; univ.party[i].status[eStatus::POISON] = 0;
@@ -318,7 +317,7 @@ void handle_extra_menu(int item_hit) {
} }
break; break;
case 13: case 108:
if(!party_in_scen) { if(!party_in_scen) {
display_strings(25,15); display_strings(25,15);
break; break;
@@ -327,32 +326,20 @@ void handle_extra_menu(int item_hit) {
break; break;
remove_party_from_scen(); remove_party_from_scen();
break; break;
} case 3:
redraw_screen();
}
void handle_edit_menu(int item_hit) {
short i,j,k;
if(file_in_mem.empty()) {
display_strings(5,7);
return;
}
switch(item_hit) {
case 1:
display_alchemy(true); display_alchemy(true);
break; break;
case 2: // all property case 17: // all property
display_strings(6,7); display_strings(6,7);
for(i = 0; i < 30; i++) { for(i = 0; i < 30; i++) {
univ.party.boats[i].property = false; univ.party.boats[i].property = false;
univ.party.horses[i].property = false; univ.party.horses[i].property = false;
} }
break; break;
case 4: // edit day case 101: // edit day
edit_day(); edit_day();
break; break;
case 6: // ouit maps case 105: // out maps
if(!party_in_scen) { if(!party_in_scen) {
display_strings(25,15); display_strings(25,15);
break; break;
@@ -363,7 +350,7 @@ void handle_edit_menu(int item_hit) {
for(k = 0; k < 48; k++) for(k = 0; k < 48; k++)
univ.out_maps[i][j][k] = 255; univ.out_maps[i][j][k] = 255;
break; break;
case 7: // town maps case 106: // town maps
if(!party_in_scen) { if(!party_in_scen) {
display_strings(25,15); display_strings(25,15);
break; break;
@@ -374,21 +361,24 @@ void handle_edit_menu(int item_hit) {
for(k = 0; k < 64; k++) for(k = 0; k < 64; k++)
univ.town_maps[i][j][k] = 255; univ.town_maps[i][j][k] = 255;
break; break;
case 9: case 10:
display_pc(current_active_pc,0,0); display_pc(current_active_pc,0,0);
break; break;
case 10: case 11:
display_pc(current_active_pc,1,0); display_pc(current_active_pc,1,0);
break; break;
case 11: case 12:
pick_race_abil(&univ.party[current_active_pc],0); pick_race_abil(&univ.party[current_active_pc],0);
break; break;
case 12: case 13:
spend_xp(current_active_pc,1,0); spend_xp(current_active_pc,1,0);
break; break;
case 13: case 14:
edit_xp(&univ.party[current_active_pc]); edit_xp(&univ.party[current_active_pc]);
break; break;
case 109:
// TODO: Implement "Set SDF"
break;;
} }
} }

362
src/pcedit/pc.menu.xib
View File

@@ -236,14 +236,14 @@
</object> </object>
<object class="NSMenuItem" id="577561551"> <object class="NSMenuItem" id="577561551">
<reference key="NSMenu" ref="649796088"/> <reference key="NSMenu" ref="649796088"/>
<string key="NSTitle">Free Extras</string> <string key="NSTitle">Edit Party</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
<string key="NSAction">submenuAction:</string> <string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="551880289"> <object class="NSMenu" key="NSSubmenu" id="551880289">
<string key="NSTitle">Free Extras</string> <string key="NSTitle">Edit Party</string>
<array class="NSMutableArray" key="NSMenuItems"> <array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="224088146"> <object class="NSMenuItem" id="224088146">
<reference key="NSMenu" ref="551880289"/> <reference key="NSMenu" ref="551880289"/>
@@ -261,6 +261,14 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="35616607">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Add Alchemy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="781373821"> <object class="NSMenuItem" id="781373821">
<reference key="NSMenu" ref="551880289"/> <reference key="NSMenu" ref="551880289"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
@@ -271,40 +279,6 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="528940421">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Leave Town</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="607085164">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Reunite Party</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="556155026">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Make towns forget you</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="885300113">
<reference key="NSMenu" ref="551880289"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="638582871"> <object class="NSMenuItem" id="638582871">
<reference key="NSMenu" ref="551880289"/> <reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Heal Damage</string> <string key="NSTitle">Heal Damage</string>
@@ -337,6 +311,56 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="885300113">
<reference key="NSMenu" ref="551880289"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="426558583">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Add Mage Spells</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="119197894">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Add Priest Spells</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="20224361">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Edit Traits</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="331745279">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Edit Skills</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="56062367">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Edit XP</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="619546963"> <object class="NSMenuItem" id="619546963">
<reference key="NSMenu" ref="551880289"/> <reference key="NSMenu" ref="551880289"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
@@ -347,9 +371,17 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="892605041"> <object class="NSMenuItem" id="607085164">
<reference key="NSMenu" ref="551880289"/> <reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Remove Party From Scenario</string> <string key="NSTitle">Reunite Party</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="807827245">
<reference key="NSMenu" ref="551880289"/>
<string key="NSTitle">Own All Boats/Horses</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
@@ -361,41 +393,15 @@
</object> </object>
<object class="NSMenuItem" id="416266767"> <object class="NSMenuItem" id="416266767">
<reference key="NSMenu" ref="649796088"/> <reference key="NSMenu" ref="649796088"/>
<string key="NSTitle">Special Edit</string> <string key="NSTitle">Scenario Edit</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
<string key="NSAction">submenuAction:</string> <string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="779223651"> <object class="NSMenu" key="NSSubmenu" id="779223651">
<string key="NSTitle">Special Edit</string> <string key="NSTitle">Scenario Edit</string>
<array class="NSMutableArray" key="NSMenuItems"> <array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="35616607">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Add Alchemy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="807827245">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Own All Boats/Horses</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="440447679">
<reference key="NSMenu" ref="779223651"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="532156349"> <object class="NSMenuItem" id="532156349">
<reference key="NSMenu" ref="779223651"/> <reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Edit Day</string> <string key="NSTitle">Edit Day</string>
@@ -414,6 +420,22 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="528940421">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Leave Town</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="556155026">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Make towns forget you</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="95366957"> <object class="NSMenuItem" id="95366957">
<reference key="NSMenu" ref="779223651"/> <reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Add Outdoor Maps</string> <string key="NSTitle">Add Outdoor Maps</string>
@@ -430,56 +452,6 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="672927508">
<reference key="NSMenu" ref="779223651"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="426558583">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Add Mage Spells</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="119197894">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Add Priest Spells</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="20224361">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Edit Traits</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="331745279">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Edit Skills</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="56062367">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Edit XP</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="196058737"> <object class="NSMenuItem" id="196058737">
<reference key="NSMenu" ref="779223651"/> <reference key="NSMenu" ref="779223651"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
@@ -490,9 +462,17 @@
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/> <reference key="NSMixedImage" ref="909111550"/>
</object> </object>
<object class="NSMenuItem" id="892605041">
<reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Remove Party From Scenario</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="555832425"> <object class="NSMenuItem" id="555832425">
<reference key="NSMenu" ref="779223651"/> <reference key="NSMenu" ref="779223651"/>
<string key="NSTitle">Set SDF</string> <string key="NSTitle">Set Stuff Done Flag</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>
@@ -843,17 +823,21 @@
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="224088146"/> <reference ref="224088146"/>
<reference ref="730029084"/> <reference ref="730029084"/>
<reference ref="528940421"/>
<reference ref="781373821"/> <reference ref="781373821"/>
<reference ref="607085164"/>
<reference ref="885300113"/>
<reference ref="933026615"/> <reference ref="933026615"/>
<reference ref="638582871"/> <reference ref="638582871"/>
<reference ref="621711799"/> <reference ref="621711799"/>
<reference ref="864494964"/> <reference ref="864494964"/>
<reference ref="619546963"/> <reference ref="619546963"/>
<reference ref="556155026"/> <reference ref="607085164"/>
<reference ref="892605041"/> <reference ref="35616607"/>
<reference ref="807827245"/>
<reference ref="885300113"/>
<reference ref="426558583"/>
<reference ref="119197894"/>
<reference ref="20224361"/>
<reference ref="331745279"/>
<reference ref="56062367"/>
</array> </array>
<reference key="parent" ref="577561551"/> <reference key="parent" ref="577561551"/>
</object> </object>
@@ -867,11 +851,6 @@
<reference key="object" ref="730029084"/> <reference key="object" ref="730029084"/>
<reference key="parent" ref="551880289"/> <reference key="parent" ref="551880289"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">813</int>
<reference key="object" ref="528940421"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">814</int> <int key="objectID">814</int>
<reference key="object" ref="416266767"/> <reference key="object" ref="416266767"/>
@@ -916,21 +895,15 @@
<int key="objectID">815</int> <int key="objectID">815</int>
<reference key="object" ref="779223651"/> <reference key="object" ref="779223651"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="35616607"/>
<reference ref="807827245"/>
<reference ref="532156349"/> <reference ref="532156349"/>
<reference ref="440447679"/>
<reference ref="95366957"/> <reference ref="95366957"/>
<reference ref="10294814"/> <reference ref="10294814"/>
<reference ref="145927507"/> <reference ref="145927507"/>
<reference ref="672927508"/>
<reference ref="426558583"/>
<reference ref="119197894"/>
<reference ref="20224361"/>
<reference ref="331745279"/>
<reference ref="56062367"/>
<reference ref="196058737"/> <reference ref="196058737"/>
<reference ref="555832425"/> <reference ref="555832425"/>
<reference ref="528940421"/>
<reference ref="556155026"/>
<reference ref="892605041"/>
</array> </array>
<reference key="parent" ref="416266767"/> <reference key="parent" ref="416266767"/>
</object> </object>
@@ -939,16 +912,6 @@
<reference key="object" ref="532156349"/> <reference key="object" ref="532156349"/>
<reference key="parent" ref="779223651"/> <reference key="parent" ref="779223651"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">817</int>
<reference key="object" ref="807827245"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">816</int>
<reference key="object" ref="35616607"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">827</int> <int key="objectID">827</int>
<reference key="object" ref="80672301"/> <reference key="object" ref="80672301"/>
@@ -983,16 +946,6 @@
<reference key="object" ref="607085164"/> <reference key="object" ref="607085164"/>
<reference key="parent" ref="551880289"/> <reference key="parent" ref="551880289"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">849</int>
<reference key="object" ref="556155026"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">850</int>
<reference key="object" ref="885300113"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">851</int> <int key="objectID">851</int>
<reference key="object" ref="933026615"/> <reference key="object" ref="933026615"/>
@@ -1018,16 +971,6 @@
<reference key="object" ref="619546963"/> <reference key="object" ref="619546963"/>
<reference key="parent" ref="551880289"/> <reference key="parent" ref="551880289"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">856</int>
<reference key="object" ref="892605041"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">857</int>
<reference key="object" ref="440447679"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">858</int> <int key="objectID">858</int>
<reference key="object" ref="95366957"/> <reference key="object" ref="95366957"/>
@@ -1043,36 +986,6 @@
<reference key="object" ref="145927507"/> <reference key="object" ref="145927507"/>
<reference key="parent" ref="779223651"/> <reference key="parent" ref="779223651"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">861</int>
<reference key="object" ref="672927508"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">862</int>
<reference key="object" ref="426558583"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">863</int>
<reference key="object" ref="119197894"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">864</int>
<reference key="object" ref="20224361"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">865</int>
<reference key="object" ref="331745279"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">866</int>
<reference key="object" ref="56062367"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">867</int> <int key="objectID">867</int>
<reference key="object" ref="196058737"/> <reference key="object" ref="196058737"/>
@@ -1083,6 +996,61 @@
<reference key="object" ref="555832425"/> <reference key="object" ref="555832425"/>
<reference key="parent" ref="779223651"/> <reference key="parent" ref="779223651"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">816</int>
<reference key="object" ref="35616607"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">817</int>
<reference key="object" ref="807827245"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">813</int>
<reference key="object" ref="528940421"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">849</int>
<reference key="object" ref="556155026"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">856</int>
<reference key="object" ref="892605041"/>
<reference key="parent" ref="779223651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">850</int>
<reference key="object" ref="885300113"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">862</int>
<reference key="object" ref="426558583"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">863</int>
<reference key="object" ref="119197894"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">864</int>
<reference key="object" ref="20224361"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">865</int>
<reference key="object" ref="331745279"/>
<reference key="parent" ref="551880289"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">866</int>
<reference key="object" ref="56062367"/>
<reference key="parent" ref="551880289"/>
</object>
</array> </array>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1144,11 +1112,9 @@
<string key="854.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="854.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="855.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="855.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="856.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="856.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="857.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="858.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="858.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="859.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="859.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="860.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="860.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="861.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="863.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="863.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="864.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="864.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

22
src/pcedit/pc.menus.mac.mm
View File

@@ -19,8 +19,7 @@ using MenuHandle = NSMenu*;
extern void handle_apple_menu(int item_hit); extern void handle_apple_menu(int item_hit);
extern void handle_file_menu(int item_hit); extern void handle_file_menu(int item_hit);
extern void handle_extra_menu(int item_hit); extern void handle_edit_menus(int item_hit);
extern void handle_edit_menu(int item_hit);
extern void handle_item_menu(int item_hit); extern void handle_item_menu(int item_hit);
extern cUniverse univ; extern cUniverse univ;
@@ -31,8 +30,7 @@ MenuHandle apple_menu, file_menu, reg_menu, extra_menu, items_menu[4];
@interface MenuHandler : NSObject @interface MenuHandler : NSObject
-(void) fileMenu:(id) sender; -(void) fileMenu:(id) sender;
-(void) freeMenu:(id) sender; -(void) editMenu:(id) sender;
-(void) specMenu:(id) sender;
-(void) itemMenu:(id) sender; -(void) itemMenu:(id) sender;
-(void) helpMenu:(id) sender; -(void) helpMenu:(id) sender;
@end @end
@@ -56,8 +54,8 @@ void init_menubar() {
apple_menu = [[menu_bar_handle itemWithTitle: @"BoE Character Editor"] submenu]; apple_menu = [[menu_bar_handle itemWithTitle: @"BoE Character Editor"] submenu];
file_menu = [[menu_bar_handle itemWithTitle: @"File"] submenu]; file_menu = [[menu_bar_handle itemWithTitle: @"File"] submenu];
reg_menu = [[menu_bar_handle itemWithTitle: @"Free Extras"] submenu]; reg_menu = [[menu_bar_handle itemWithTitle: @"Edit Party"] submenu];
extra_menu = [[menu_bar_handle itemWithTitle: @"Special Edit"] submenu]; extra_menu = [[menu_bar_handle itemWithTitle: @"Scenario Edit"] submenu];
items_menu[0] = [[menu_bar_handle itemWithTitle: @"Items 1"] submenu]; items_menu[0] = [[menu_bar_handle itemWithTitle: @"Items 1"] submenu];
items_menu[1] = [[menu_bar_handle itemWithTitle: @"Items 2"] submenu]; items_menu[1] = [[menu_bar_handle itemWithTitle: @"Items 2"] submenu];
items_menu[2] = [[menu_bar_handle itemWithTitle: @"Items 3"] submenu]; items_menu[2] = [[menu_bar_handle itemWithTitle: @"Items 3"] submenu];
@@ -72,9 +70,9 @@ void init_menubar() {
setMenuCallback([file_menu itemWithTitle: @"Open…"], handler, @selector(fileMenu:), 3); setMenuCallback([file_menu itemWithTitle: @"Open…"], handler, @selector(fileMenu:), 3);
for(int i = 0; i < [reg_menu numberOfItems]; i++) for(int i = 0; i < [reg_menu numberOfItems]; i++)
setMenuCallback([reg_menu itemAtIndex: i], handler, @selector(freeMenu:), i + 1); setMenuCallback([reg_menu itemAtIndex: i], handler, @selector(editMenu:), i + 1);
for(int i = 0; i < [extra_menu numberOfItems]; i++) for(int i = 0; i < [extra_menu numberOfItems]; i++)
setMenuCallback([extra_menu itemAtIndex: i], handler, @selector(specMenu:), i + 1); setMenuCallback([extra_menu itemAtIndex: i], handler, @selector(editMenu:), i + 101);
update_item_menu(); update_item_menu();
menu_activate(); menu_activate();
@@ -112,12 +110,8 @@ void update_item_menu() {
handle_file_menu([[sender representedObject] shortValue]); handle_file_menu([[sender representedObject] shortValue]);
} }
-(void) freeMenu:(id) sender { -(void) editMenu:(id) sender {
handle_extra_menu([[sender representedObject] shortValue]); handle_edit_menus([[sender representedObject] shortValue]);
}
-(void) specMenu:(id) sender {
handle_edit_menu([[sender representedObject] shortValue]);
} }
-(void) itemMenu:(id) sender { -(void) itemMenu:(id) sender {