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

journal: try to delete correctly the talking notes

Browse Source
This commit is contained in:
ALONSO Laurent
2023-01-12 11:24:25 +01:00
committed by Celtic Minstrel
parent 64f206b5be
commit 812410338d
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/universe/party.cpp
View File

@@ -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;

1
src/universe/party.hpp
View File

@@ -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);