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

Well, at present the Windows code for the actual game almost compiles. The current goal is to undo all the things that Ormus did to make this job difficult.

Browse Source 
Basically, remove as many as possible of the dependencies of the source files in the tools and classes folders on source files not in those folders.
(With the exception that files in the classes folder may depend on files in the tools folder.)

In this commit, several changes were made.
- Project file modified, may need further modification.
- Many files renamed to match the Mac version.
- #include statements for system headers changed to use <> instead of "" (some already did, but many didn't).
- xxx.h headers replaced with cxxx headers where appropriate.
- Most sound-related variables moved from globvars.cpp to soundvars.cpp.
- The files originally named graphutil and gutils have been merged.
- Changed TRUE/FALSE to true/false.
- Changed exlsound to soundtool and mostly removed dependencies on the main game files; the exception is that it still uses mainPtr (which probably can't be helped)
  and print_nums (which should probably be incorporated into the MessageBox string).
- Possibly other things that were forgotten.

For some reason this commit also includes changes recently committed into the branch for osx.

git-svn-id: http://openexile.googlecode.com/svn/trunk@121 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-08-03 19:00:23 +00:00
parent c6a5f5bacd
commit b02902770c
84 changed files with 2585 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
osx/classes/item.h
View File

@@ -37,27 +37,35 @@ public:
std::string full_name;
std::string name;
unsigned char treas_class;
unsigned char item_properties;
//unsigned char item_properties;
bool ident : 1;
bool property : 1;
bool magic : 1;
bool contained : 1;
bool cursed : 1;
bool concealed : 1;
bool enchanted : 1;
bool unsellable : 1;
private:
unsigned char reserved1;
unsigned char reserved2;
public:
//string desc; // for future use
unsigned char rec_treas_class() const;
bool is_ident() const;
bool is_property() const;
bool is_magic() const;
bool is_contained() const;
bool is_cursed() const;
bool is_concealed() const;
bool is_enchanted() const;
void set_ident(bool b);
void set_property(bool b);
void set_magic(bool b);
void set_contained(bool b);
void set_cursed(bool b);
void set_concealed(bool b);
void set_enchanted(bool b);
// bool is_ident() const;
// bool is_property() const;
// bool is_magic() const;
// bool is_contained() const;
// bool is_cursed() const;
// bool is_concealed() const;
// bool is_enchanted() const;
// void set_ident(bool b);
// void set_property(bool b);
// void set_magic(bool b);
// void set_contained(bool b);
// void set_cursed(bool b);
// void set_concealed(bool b);
// void set_enchanted(bool b);
short item_weight() const;
cItemRec();