Fix crash when initiating conversation via special node

This commit is contained in:
2015-06-24 01:43:27 -04:00
parent 452b6ee342
commit 2934585e21

View File

@@ -844,10 +844,10 @@ static void place_talk_face() {
cPict::drawAt(mainPtr, face_rect, store_talk_face_pic, PIC_CUSTOM_TALK, false); cPict::drawAt(mainPtr, face_rect, store_talk_face_pic, PIC_CUSTOM_TALK, false);
} }
else { else {
short i = get_monst_picnum(store_monst_type); if(face_to_draw == NO_PIC) {
if(face_to_draw == NO_PIC) short i = get_monst_picnum(store_monst_type);
cPict::drawAt(mainPtr, face_rect, i, get_monst_pictype(store_monst_type), false); cPict::drawAt(mainPtr, face_rect, i, get_monst_pictype(store_monst_type), false);
else cPict::drawAt(mainPtr, face_rect, face_to_draw, PIC_TALK, false); } else cPict::drawAt(mainPtr, face_rect, face_to_draw, PIC_TALK, false);
} }
} }