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,7 +6,12 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef OUTDOORS_H
|
||||
#define OUTDOORS_H
|
||||
|
||||
#include "location.h"
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
namespace legacy {
|
||||
struct out_wandering_type;
|
||||
@@ -24,8 +29,8 @@ public:
|
||||
short end_spec1,end_spec2;
|
||||
|
||||
cWandering& operator = (legacy::out_wandering_type old);
|
||||
void writeTo(ostream& file, string prefix = "");
|
||||
void readAttrFrom(string cur, istream& sin);
|
||||
void writeTo(std::ostream& file, std::string prefix = "");
|
||||
void readAttrFrom(std::string cur, std::istream& sin);
|
||||
};
|
||||
class cCreature { // formerly outdoor_creature_type
|
||||
public:
|
||||
@@ -58,5 +63,7 @@ public:
|
||||
|
||||
cOutdoors();
|
||||
cOutdoors& operator = (legacy::outdoor_record_type& old);
|
||||
void writeTo(ostream& file);
|
||||
void writeTo(std::ostream& file);
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user