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

- Added code to the missile firing so that missiles that heal the target also work if they hit a PC.

Browse Source 
- Added fields to the terrain class in preparation for new scenario format.
- Same with the party class, plus refactored it to use vectors and strings.
- Fixed a potential divide-by-zero error in get_ran.

git-svn-id: http://openexile.googlecode.com/svn/trunk@41 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-04-28 13:00:21 +00:00
parent 9ed2738f6c
commit 049754ea27
16 changed files with 252 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
osx/party.h
View File

@@ -6,6 +6,10 @@
*
*/
#include <string>
#include <vector>
using namespace std;
namespace legacy {
struct party_record_type;
struct big_tr_type;
@@ -21,15 +25,33 @@ public:
public:
short personality;
short town_num;
short str1, str2;
short str_num1, str_num2;
string who_said, in_town, the_str1, the_str2, in_scen; // the actual strings; not always saved, like maps
cConvers& operator = (legacy::talk_save_type old);
};
class cJournal {
public:
unsigned short str_num;
unsigned short day;
string the_str, in_scen; // the actual strings; not always saved, like maps
};
class cEncNote {
public:
unsigned short str_num, where;
string the_str1, the_str2, in_scen; // the actual strings; not always saved, like maps
};
class cTimer {
public:
short time;
short global_or_town;
short node_to_call;
};
// formerly party_record_type
long age;
unsigned short gold;
unsigned short food;
unsigned char stuff_done[310][10];
unsigned char stuff_done[310][50];
unsigned char item_taken[200][8];
short light_level;
location outdoor_corner;
@@ -45,32 +67,46 @@ public:
cItemRec magic_store_items[5][10];
short imprisoned_monst[4]; // Soul Crystal?
char m_seen[256];
char journal_str[50];
short journal_day[50];
short special_notes_str[140][2];
cConvers talk_save[120];
vector<cJournal> journal;
vector<cEncNote> special_notes;
vector<cConvers> talk_save;
short direction;
short at_which_save_slot;
char alchemy[20];
bool can_find_town[200];
short key_times[100];
short party_event_timers[30];
short global_or_town[30];
short node_to_call[30];
vector<cTimer> party_event_timers;
//short global_or_town[30];
//short node_to_call[30];
char spec_items[50];
char help_received[120];
short m_killed[300]; // monsters killed per town, I think
short m_killed[200]; // monsters killed per town, I think
long long total_m_killed, total_dam_done, total_xp_gained, total_dam_taken;
char scen_name[256];
string scen_name;
cPlayer adven[6];
cItemRec stored_items[3][115]; // formerly stored_items_list_type
string graphicsFile; // the name of the png file holding this party's custom item, pc, and summonable monster graphics
cMonster summons; // an array of monsters which can be summoned by the parties items yet don't originate from this scenario
bool graphicUsed[250]; // whether each custom graphics slot on the party's sheet is actually used; needed to place new custom graphics on the sheet.
unsigned short scen_won, scen_played; // numbers of scenarios won and played respectively by this party
cParty& operator = (legacy::party_record_type& old);
void append(legacy::big_tr_type& old);
void append(legacy::stored_items_list_type& old,short which_list);
void add_pc(legacy::pc_record_type old);
void add_pc(cPlayer new_pc);
bool has_talk_save(short who, short str1, short str2);
bool save_talk(short who, unsigned char where, short str1, short str2);
bool add_to_journal(short event, short day);
bool record(short what, short where);
bool start_timer(short time, short node, short type);
typedef vector<cEncNote>::iterator encIter;
typedef vector<cJournal>::iterator journalIter;
typedef vector<cConvers>::iterator talkIter;
typedef vector<cTimer>::iterator timerIter;
};