Added include guards to all class headers.
Removed unnecessary or potentially harmful compiler flags. Added alignment attribute to all old struct members. Removed some unused variables. Made some switch statements handle all or more cases. Removed using declarations in favor of fully qualified names. Fixed a couple of assignments in conditionals that should have been comparisons. Eliminated linker warnings by restoring default linking of standard libraries. Fixed some comparisons between signed and unsigned integers. Note: No testing has been done, in particular of old file I/O. This should be checked for regression caused by alteration of old struct definitions. git-svn-id: http://openexile.googlecode.com/svn/trunk@63 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
@@ -6,6 +6,12 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef MONSTER_H
|
||||
#define MONSTER_H
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
namespace legacy {
|
||||
struct monster_record_type;
|
||||
struct creature_data_type;
|
||||
@@ -109,7 +115,7 @@ class cMonster {
|
||||
public:
|
||||
unsigned short m_num;
|
||||
unsigned char level;
|
||||
string m_name;
|
||||
std::string m_name;
|
||||
short health,m_health,mp,max_mp;
|
||||
unsigned char armor,skill;
|
||||
short a[3];
|
||||
@@ -125,7 +131,7 @@ public:
|
||||
short picture_num;
|
||||
|
||||
cMonster& operator = (legacy::monster_record_type& old);
|
||||
void writeTo(ostream& file, string prefix);
|
||||
void writeTo(std::ostream& file, std::string prefix);
|
||||
};
|
||||
|
||||
class cCreature {
|
||||
@@ -152,3 +158,5 @@ public:
|
||||
cCreature& operator = (legacy::creature_data_type old);
|
||||
cCreature& operator = (legacy::creature_start_type old);
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user