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

Little tweaks and stuff

Browse Source 
- New file extension .boes for scenarios - intent is to use this for the new scenario format
- Turn on auto-enable for Application menu in the game (otherwise the Show/Hide options don't grey out correctly)
- Fix PC graphics not appearing in PC editor
This commit is contained in:
Celtic Minstrel
2014-04-16 22:58:35 -04:00
parent 92bcdf20e0
commit dae9ddb50b
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osx/Blades of Exile-Info.plist
View File

@@ -152,6 +152,7 @@
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>.exs</string> <string>.exs</string>
<string>.boes</string>
</array> </array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>boescenario</string> <string>boescenario</string>

3
osx/boe.items.cpp
View File

@@ -762,12 +762,13 @@ short dist_from_party(location where)
return store; return store;
} }
// TODO: I have no idea what is going on here, other than that it seems to have something to do items being picked up in town
void set_item_flag(cItemRec *item) void set_item_flag(cItemRec *item)
{ {
if ((item->is_special > 0) && (item->is_special < 65)) { if ((item->is_special > 0) && (item->is_special < 65)) {
item->is_special--; item->is_special--;
univ.party.item_taken[univ.town.num][item->is_special / 8] = univ.party.item_taken[univ.town.num][item->is_special / 8] =
univ.party.item_taken[univ.town.num][item->is_special / 8] | s_pow(2,item->is_special % 8); univ.party.item_taken[univ.town.num][item->is_special / 8] | s_pow(2,item->is_special % 8);
item->is_special = 0; item->is_special = 0;
} }
} }

2
osx/boe.town.cpp
View File

@@ -459,7 +459,7 @@ void start_town_mode(short which_town, short entry_dir)
(univ.town->preset_items[i].always_there == true))) { (univ.town->preset_items[i].always_there == true))) {
for (j = 0; j < NUM_TOWN_ITEMS; j++) for (j = 0; j < NUM_TOWN_ITEMS; j++)
// place the preset item, if univ.party hasn't gotten it already // place the preset item, if party hasn't gotten it already
if (univ.town.items[j].variety == 0) { if (univ.town.items[j].variety == 0) {
univ.town.items[j] = get_stored_item(univ.town->preset_items[i].code); univ.town.items[j] = get_stored_item(univ.town->preset_items[i].code);
univ.town.items[j].item_loc = univ.town->preset_items[i].loc; univ.town.items[j].item_loc = univ.town->preset_items[i].loc;

1
osx/menu.xib
View File

@@ -163,7 +163,6 @@
</object> </object>
</array> </array>
<string key="NSName">_NSAppleMenu</string> <string key="NSName">_NSAppleMenu</string>
<bool key="NSNoAutoenable">YES</bool>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="379814623"> <object class="NSMenuItem" id="379814623">

1
osx/pcedit/pc.graphics.cpp
View File

@@ -242,6 +242,7 @@ void Set_up_win ()
status_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("staticons")); status_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("staticons"));
dlogpics_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("dlogpics")); dlogpics_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("dlogpics"));
buttons_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("pcedbuttons")); buttons_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("pcedbuttons"));
pc_gworld.loadFromImage(*ResMgr::get<ImageRsrc>("pcs"));
} }