mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
2ccfaadef3
* Substantial re-work of object model. Moved many attributes out of BaseEntity class. Changed WoldRouter so it now handles objects in terms of Entity, rather than BaseEntity. * Code cleanups, including removing reduntant includes, and getting rid of C style comments. * Fixed the way attributes are handled in Set operations and when merging from an Atlas::Message::Object. This fixed problem with setting gender of characters. * rulesets/Pedestrian.*, rulesets/Movement.*: Re-named Movement variables to make them clearer. Added in separate handling for collisions from moving to target position. Modified collision handling so objects can slide next to each other. * rulesets/Thing.cpp, rulesets/Character.cpp: Cleaned up and rationalised movement code. Much shorter, faster and more compact than before. * Made better use of iterators throughout, eliminating unnecessary lookups, and copying of data. * Moved all virtual functions out of header files, making less work for the linker. * Made more use of const references to avoid the need to copy data before being able to inspect it. Al Riddoch <alriddoch@zepler.org>
95 lines
2.3 KiB
C++
95 lines
2.3 KiB
C++
// This file may be redistributed and modified only under the terms of
|
|
// the GNU General Public License (See COPYING for details).
|
|
// Copyright (C) 2001 Alistair Riddoch
|
|
|
|
#include <Atlas/Message/Object.h>
|
|
#include <Atlas/Message/Encoder.h>
|
|
#include <Atlas/Net/Stream.h>
|
|
#include <Atlas/Objects/Decoder.h>
|
|
#include <Atlas/Codecs/XML.h>
|
|
|
|
#include <common/config.h>
|
|
#include <common/database.h>
|
|
|
|
#include <string>
|
|
#include <fstream>
|
|
|
|
#ifdef HAVE_LIBDB_CXX
|
|
|
|
class WorldBase : public Database {
|
|
protected:
|
|
WorldBase() { }
|
|
|
|
public:
|
|
static WorldBase * instance() {
|
|
if (m_instance == NULL) {
|
|
m_instance = new WorldBase();
|
|
}
|
|
return (WorldBase *)m_instance;
|
|
}
|
|
|
|
void storeInWorld(const Atlas::Message::Object & o, const char * key) {
|
|
putObject(world_db, o, key);
|
|
}
|
|
};
|
|
|
|
class FileDecoder : public Atlas::Message::DecoderBase {
|
|
ifstream m_file;
|
|
WorldBase * m_db;
|
|
Atlas::Codecs::XML m_codec;
|
|
int m_count;
|
|
|
|
virtual void ObjectArrived(const Atlas::Message::Object& obj) {
|
|
if (!obj.IsMap()) {
|
|
cerr << "ERROR: Non map object in file" << endl << flush;
|
|
return;
|
|
}
|
|
const Atlas::Message::Object::MapType & omap = obj.AsMap();
|
|
if (omap.find("id") == omap.end()) {
|
|
cerr << "WARNING: Object in file has no id. Not stored."
|
|
<< endl << flush;
|
|
return;
|
|
}
|
|
m_count++;
|
|
const string & id = omap.find("id")->second.AsString();
|
|
m_db->storeInWorld(obj, id.c_str());
|
|
}
|
|
public:
|
|
FileDecoder(const string & filename, WorldBase * db) :
|
|
m_file(filename.c_str()), m_db(db),
|
|
m_codec((iostream&)m_file, this), m_count(0) {
|
|
}
|
|
|
|
void read() {
|
|
while (!m_file.eof()) {
|
|
m_codec.Poll();
|
|
}
|
|
}
|
|
|
|
void report() {
|
|
std::cout << m_count << " objects stored in world database."
|
|
<< endl << flush;
|
|
}
|
|
};
|
|
|
|
int main(int argc, char ** argv)
|
|
{
|
|
WorldBase * db = WorldBase::instance();
|
|
db->initWorld(true);
|
|
|
|
FileDecoder f("foo", db);
|
|
f.read();
|
|
f.report();
|
|
db->shutdownWorld();
|
|
delete db;
|
|
}
|
|
|
|
#else // HAVE_LIBDB_CXX
|
|
|
|
int main(int argc, char ** argv)
|
|
{
|
|
std::cerr << "This version of cyphesis was built without persistant world support" << endl << flush;
|
|
exit(0);
|
|
}
|
|
|
|
#endif // HAVE_LIBDB_CXX
|