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

Some refactor of special node system

Browse Source 
- Context type (town/out/scen) is now an enum
- Don't expose internals in the header
- Use a state struct to pass things around through the system
- Fix special AFFECT_DEADNESS case for default party selection
- Maybe other bits and pieces?
This commit is contained in:
Celtic Minstrel
2020-02-02 19:12:45 -05:00
parent 973b147a3d
commit 86d2574aed
14 changed files with 646 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/universe/party.cpp
View File

@@ -230,7 +230,7 @@ void cParty::import_legacy(legacy::party_record_type& old, cUniverse& univ){
horses[i].import_legacy(old.horses[i]);
cTimer t;
t.time = old.party_event_timers[i];
t.node_type = old.global_or_town[i];
t.node_type = old.global_or_town[i] ? eSpecCtxType::TOWN : eSpecCtxType::SCEN;
t.node = old.node_to_call[i];
party_event_timers.push_back(t);
}
@@ -659,7 +659,7 @@ bool cParty::check_class(unsigned int item_class,bool take) {
return false;
}
bool cParty::start_timer(short time, short node, short type){
bool cParty::start_timer(short time, spec_num_t node, eSpecCtxType type){
if(party_event_timers.size() == party_event_timers.max_size()) return false; // Shouldn't be reached
cTimer t;
t.time = time;
@@ -791,7 +791,7 @@ void cParty::writeTo(std::ostream& file) const {
file << '\f';
file << '\f';
for(unsigned int i = 0; i < party_event_timers.size(); i++)
file << "TIMER " << ' ' << party_event_timers[i].time << ' ' << party_event_timers[i].node_type
file << "TIMER " << ' ' << party_event_timers[i].time << ' ' << int(party_event_timers[i].node_type)
<< ' ' << party_event_timers[i].node << '\f';
file << '\f';
for(int i = 0; i < creature_save.size(); i++)
@@ -1027,10 +1027,11 @@ void cParty::readFrom(std::istream& file){
if(i < 25 && j < 25)
campaign_flags[cur].idx[i][j] = val;
} else if(cur == "TIMER") {
int i;
int i, j;
bin >> i;
cTimer timer;
bin >> timer.time >> timer.node_type >> timer.node;
bin >> timer.time >> j >> timer.node;
timer.node_type = eSpecCtxType(j);
party_event_timers.push_back(timer);
} else if(cur == "CREATURE") {
int i, j;

2
src/universe/party.hpp
View File

@@ -186,7 +186,7 @@ public:
bool save_talk(const std::string& who, const std::string& where, const std::string& str1, const std::string& str2);
bool add_to_journal(const std::string& event, short day);
bool record(eEncNoteType type, const std::string& what, const std::string& where);
bool start_timer(short time, short node, short type);
bool start_timer(short time, spec_num_t node, eSpecCtxType type);
cPlayer& operator[](unsigned short n);
const cPlayer& operator[](unsigned short n) const;
void writeTo(std::ostream& file) const;