Fix switching PCs when editing spells. Fix #66

rsrc/dialogs/confirm-edit-spells.xml

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
+<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
+<dialog defbtn='keep' escbtn='cancel'>
+	<pict type='dlog' num='7' top='6' left='6'/>
+	<text name='keep-msg' top='6' left='49' width='256' height='32'>
+		Keep changes to {{PC}}'s spells before editing someone else?
+	</text>
+	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
+	<button name='revert' type='regular' top='43' left='175'>Discard</button>
+	<button name='keep' type='regular' top='43' left='240'>Keep</button>
+</dialog>

rsrc/dialogs/pc-spell-info.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done' escbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<!--
 	 TODO: Add width attributes to the LEDs
 	 -->
@@ -68,6 +68,7 @@
 	<led name='spell60' state='off' top='248' left='268'/>
 	<led name='spell61' state='off' top='260' left='268'/>
 	<led name='spell62' state='off' top='272' left='268'/>
+	<button name='cancel' type='regular' top='310' left='358'>Cancel</button>
 	<button name='done' type='done' top='310' left='422'/>
 	<button name='left' type='left' def-key='left' top='310' left='12'/>
 	<button name='right' type='right' def-key='right' top='310' left='79'/>

src/pcedit/pc.editors.cpp

@@ -66,24 +66,59 @@ static void put_pc_spells(cDialog& me, short store_trait_mode) {
 	me["who"].setText(univ.party[which_pc_displayed].name.c_str());
 }
 
+static void keep_pc_spells(cDialog& pcInfo, short pc_num, short mode) {
+	if(mode >= 10) {
+		mode %= 10;
+		for(short i = 0; i < 62; i++) {
+			std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
+			bool set = dynamic_cast<cLed&>(pcInfo[id]).getState() != led_off;
+			if(mode == 0) univ.party[pc_num].mage_spells[i] = set;
+			else if(mode == 1) univ.party[pc_num].priest_spells[i] = set;
+		}
+	}
+}
+
+static bool confirm_switch_pc_spells(cDialog& me, short pc_num, short mode) {
+	cChoiceDlog dlog("confirm-edit-spells", {"keep","revert","cancel"}, &me);
+	dlog->getControl("keep-msg").replaceText("{{PC}}", univ.party[pc_num].name);
+	std::string choice = dlog.show();
+	if(choice == "keep"){
+		keep_pc_spells(me, pc_num, mode);
+		return true;
+	}else if(choice == "revert"){
+		return true;
+	}else{
+		return false;
+	}
+}
+
 static bool display_pc_event_filter(cDialog& me, std::string item_hit, const short trait_mode) {
 	short pc_num;
 	
 	pc_num = which_pc_displayed;
-	if(item_hit == "done") {
+	if(item_hit == "cancel"){
+		me.toast(false);
+	}else if(item_hit == "done") {
 		me.toast(true);
-	} else if(item_hit == "left") {
+		keep_pc_spells(me, pc_num, trait_mode);
-		do {
+	}else if(item_hit == "left") {
-			pc_num = (pc_num == 0) ? 5 : pc_num - 1;
+		// TODO if spells haven't changed, confirmation shouldn't be necessary
-		} while(univ.party[pc_num].main_status == eMainStatus::ABSENT);
+		if(confirm_switch_pc_spells(me, pc_num, trait_mode)){
-		which_pc_displayed = pc_num;
+			do {
-		put_pc_spells(me, trait_mode);
+				pc_num = (pc_num == 0) ? 5 : pc_num - 1;
-	} else if(item_hit == "right") {
+			} while(univ.party[pc_num].main_status == eMainStatus::ABSENT);
-		do {
+			which_pc_displayed = pc_num;
-			pc_num = (pc_num == 5) ? 0 : pc_num + 1;
+			put_pc_spells(me, trait_mode);
-		} while(univ.party[pc_num].main_status == eMainStatus::ABSENT);
+		}
-		which_pc_displayed = pc_num;
+	}else if(item_hit == "right") {
-		put_pc_spells(me, trait_mode);
+		// TODO if spells haven't changed, confirmation shouldn't be necessary
+		if(confirm_switch_pc_spells(me, pc_num, trait_mode)){
+			do {
+				pc_num = (pc_num == 5) ? 0 : pc_num + 1;
+			} while(univ.party[pc_num].main_status == eMainStatus::ABSENT);
+			which_pc_displayed = pc_num;
+			put_pc_spells(me, trait_mode);
+		}
 	}
 	return true;
 }
@@ -102,12 +137,13 @@ void display_pc(short pc_num,short mode, cDialog* parent) {
 	set_cursor(sword_curs);
 	
 	cDialog pcInfo(*ResMgr::dialogs.get("pc-spell-info"), parent);
-	pcInfo.attachClickHandlers(std::bind(display_pc_event_filter, _1, _2, mode),{"done","left","right"});
+	pcInfo.attachClickHandlers(std::bind(display_pc_event_filter, _1, _2, mode),{"done","left","right","cancel"});
 	
 	for(short i = 0; i < 62; i++) {
 		std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
 		label_str = get_str("magic-names", i + (mode % 10 == 0 ? 1 : 101));
 		pcInfo[id].setText(label_str);
+		pcInfo[id].recalcRect();
 		if(mode < 10)
 			pcInfo[id].attachClickHandler(&cLed::noAction);
 	}
@@ -117,15 +153,6 @@ void display_pc(short pc_num,short mode, cDialog* parent) {
 	
 	pcInfo.run();
 	
-	if(mode >= 10) {
-		mode %= 10;
-		for(short i = 0; i < 62; i++) {
-			std::string id = "spell" + boost::lexical_cast<std::string>(i + 1);
-			bool set = dynamic_cast<cLed&>(pcInfo[id]).getState() != led_off;
-			if(mode == 0) univ.party[pc_num].mage_spells[i] = set;
-			else if(mode == 1) univ.party[pc_num].priest_spells[i] = set;
-		}
-	}
 }
 
 static void display_traits_graphics(cDialog& me) {
@@ -431,6 +458,7 @@ static bool spend_xp_navigate_filter(cDialog& me, std::string item_hit,xp_dlog_s
 		me.setResult(true);
 		me.toast(true);
 	} else if(item_hit == "left") {
+		// If the number of skill points hasn't changed, no confirmation is necessary
 		if(save.skp == save.start_skp || confirm_switch_pc(me, save)){
 			do {
 				save.who = (save.who == 0) ? 5 : save.who - 1;
@@ -439,6 +467,7 @@ static bool spend_xp_navigate_filter(cDialog& me, std::string item_hit,xp_dlog_s
 			save.start_skp = save.skp;
 		}
 	} else if(item_hit == "right") {
+		// If the number of skill points hasn't changed, no confirmation is necessary
 		if(save.skp == save.start_skp || confirm_switch_pc(me, save)){
 			do {
 				save.who = (save.who == 5) ? 0 : save.who + 1;