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

Get the edit monster abilities dialog all working and updated (except for editing individual abilities)

Browse Source 
Game changes:
- Remove support for playing a sound and displaying strings when a monster is first seen, since these behaviours can easily be obtained by using the special node called in the same context.
Dialog engine changes:
- Support for changing the font size of LEDs
- When setting the page, a stack now applies a default value if the map is missing the required data
- Add utility "addPage" method to stacks
- If reducing the page count means the current page is deleted, a stack now switches to the last page
This commit is contained in:
Celtic Minstrel
2015-01-18 17:25:08 -05:00
parent 1441f6bfe9
commit 7084991e55
14 changed files with 157 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/boe.graphutil.cpp
View File

@@ -229,24 +229,11 @@ void draw_monsters() {
}
void play_see_monster_str(unsigned short m, location monst_loc) {
short str1, str2, pic, snd, spec;
short pic, spec;
ePicType type;
str1 = univ.scenario.scen_monsters[m].see_str1;
str2 = univ.scenario.scen_monsters[m].see_str2;
pic = univ.scenario.scen_monsters[m].picture_num;
type = get_monst_pictype(m);
snd = univ.scenario.scen_monsters[m].see_sound;
spec = univ.scenario.scen_monsters[m].see_spec;
// First display strings, if any
if((str1 >= 0 && str1 < 100) || (str2 >= 0 && str2 < 100)) {
short where1 = is_out() ? univ.party.outdoor_corner.x + univ.party.i_w_c.x : univ.town.num;
short where2 = is_out() ? univ.party.outdoor_corner.y + univ.party.i_w_c.y : univ.town.num;
std::string placename = is_out() ? univ.out->out_name : univ.town->town_name;
cStrDlog display_strings(str1 < 100 ? univ.scenario.spec_strs[str1] : "", str2 < 100 ? univ.scenario.spec_strs[str2] : "", "", pic, type, NULL);
display_strings.setSound(snd);
display_strings.setRecordHandler(cStringRecorder(NOTE_SCEN).string1(str1).string2(str2).from(where1,where2).at(placename));
display_strings.show();
}
// Then run the special, if any
if(spec > -1){
queue_special(eSpecCtx::SEE_MONST, 0, spec, monst_loc);