From 812410338de2d8d2a15621290474c365138f3901 Mon Sep 17 00:00:00 2001
From: ALONSO Laurent <laurent.alonso@inria.fr>
Date: Thu, 12 Jan 2023 11:24:25 +0100
Subject: [PATCH] journal: try to delete correctly the talking notes

---
 src/game/boe.infodlg.cpp | 14 +++++++-------
 src/universe/party.cpp   |  2 --
 src/universe/party.hpp   |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/game/boe.infodlg.cpp b/src/game/boe.infodlg.cpp
index a74766c2..0db6e9fa 100644
--- a/src/game/boe.infodlg.cpp
+++ b/src/game/boe.infodlg.cpp
@@ -523,7 +523,7 @@ void adventure_notes() {
 }
 
 static void put_talk(cDialog& me) {
-	if(univ.party.talk_save[store_page_on].filled) {
+	if(store_page_on<store_num_i) {
 		me["loc"].setText(univ.party.talk_save[store_page_on].in_town);
 		me["who"].setText(univ.party.talk_save[store_page_on].who_said);
 		me["str1"].setText(univ.party.talk_save[store_page_on].the_str1);
@@ -542,18 +542,18 @@ static bool talk_notes_event_filter(cDialog& me, std::string item_hit, eKeyMod)
 			store_page_on = 0;
 		else store_page_on++;
 	} else if(item_hit == "del") {
-		// TODO: Actually remove it rather than filled to false
-		univ.party.talk_save[store_page_on].filled = false;
+		univ.party.talk_save.erase(univ.party.talk_save.begin()+store_page_on);
+		if(store_page_on == store_num_i - 1)
+			store_page_on = 0;
+		if(--store_num_i==0) me.toast(true);
+		// TODO: if store_num_i==1, we must also hide the right/left buttons
 	}
 	put_talk(me);
 	return true;
 }
 
 void talk_notes() {
-	store_num_i = 0;
-	for(size_t i = 0; i < univ.party.talk_save.size(); i++)
-		if(univ.party.talk_save[i].filled)
-			store_num_i = i + 1;
+	store_num_i = univ.party.talk_save.size();
 	store_page_on = 0;
 	if(store_num_i == 0) {
 		ASB("Nothing in your talk journal.");
diff --git a/src/universe/party.cpp b/src/universe/party.cpp
index 4214447b..bbf38d51 100644
--- a/src/universe/party.cpp
+++ b/src/universe/party.cpp
@@ -385,7 +385,6 @@ void cParty::swap_pcs(size_t a, size_t b) {
 bool cParty::save_talk(const std::string& who, const std::string& where, const std::string& str1, const std::string& str2){
 	if(talk_save.size() == talk_save.max_size()) return false; // This is extremely unlikely
 	cConvers talk;
-	talk.filled = true; // TODO: Remove this member
 	talk.who_said = who;
 	talk.in_town = where;
 	talk.the_str1 = str1;
@@ -1051,7 +1050,6 @@ void cParty::readFrom(const cTagFile& file) {
 			page["WHERE"] >> note.in_town >> note.in_scen;
 			page["STRING"] >> note.the_str1;
 			page["STRING"] >> note.the_str2;
-			note.filled = true;
 			talk_save.push_back(note);
 		} else if(page.getFirstKey() == "JOBBANK") {
 			size_t i;
diff --git a/src/universe/party.hpp b/src/universe/party.hpp
index 063aa53a..a9904a9f 100644
--- a/src/universe/party.hpp
+++ b/src/universe/party.hpp
@@ -65,7 +65,6 @@ class cParty : public iLiving {
 public:
 	class cConvers { // conversation; formerly talk_save_type
 	public:
-		bool filled = false;
 		std::string who_said, in_town, the_str1, the_str2, in_scen;
 		
 		void import_legacy(legacy::talk_save_type old, const cScenario& scenario);