~chuckw20/widelands/New_atlantean_carrier

~chuckw20/widelands/New_atlantean_carrier_animations

« back to all changes in this revision

Viewing changes to src/logic/bob.h

Committer: Nicolai Hähnle
Date: 2010-05-09 11:21:24 UTC
mfrom: (5141.1.7 bob-saving)
Revision ID: prefect_@gmx.net-20100509112124-14ap938z6yuqy38j

Merge branch bob-saving

All classes derived from Bob now use the new save system.

files modified:
src/descr_maintainer.h

src/logic/battle.cc

src/logic/bob.cc

src/logic/bob.h

src/logic/carrier.cc

src/logic/carrier.h

src/logic/critter_bob.cc

src/logic/critter_bob.h

src/logic/editor_game_base.h

src/logic/immovable.cc

src/logic/immovable.h

src/logic/instances.cc

src/logic/instances.h

src/logic/legacy.cc

src/logic/path.cc

src/logic/path.h

src/logic/soldier.cc

src/logic/soldier.h

src/logic/tribe.h

src/logic/widelands_streamread.h

src/logic/worker.cc

src/logic/worker.h

src/logic/world.h

src/map_io/widelands_map_bob_data_packet.cc

src/map_io/widelands_map_bobdata_data_packet.cc

src/map_io/widelands_map_bobdata_data_packet.h

src/map_io/widelands_map_loader.cc

src/map_io/widelands_map_map_object_saver.cc

src/map_io/widelands_map_map_object_saver.h

src/map_io/widelands_map_object_packet.cc

src/map_io/widelands_map_saver.cc

Show diffs side-by-side

added added

removed removed

src/logic/bob.h

#ifndef BOB_H

#define BOB_H

#include "economy/route.h"

#include "graphic/animation.h"

#include "graphic/encodedata.h"

#include "point.h"

170

171

coords (Coords::Null()),

171

172

diranims(0),

172

173

path (0),

173

transfer(0),

174

route (0),

175

program (0)

176

{}

185

Coords coords;

186

const DirAnimations * diranims;

187

Path * path;

188

Transfer * transfer;

189

188

Route * route;

190

189

const BobProgramBase * program; ///< pointer to current program

191

190

};

387

386

bool m_actscheduled;

388

387

bool m_in_act; ///< if do_act is currently running

389

388

std::string m_signal;

389

390

// saving and loading

391

protected:

392

class Loader : public Map_Object::Loader {

393

public:

394

Loader();

395

396

void load(FileRead &);

397

virtual void load_pointers();

398

virtual void load_finish();

399

400

protected:

401

virtual const Task * get_task(const std::string& name);

402

virtual const BobProgramBase * get_program(const std::string& name);

403

404

private:

405

struct LoadState {

406

uint32_t objvar1;

407

Route::LoadData route;

408

};

409

410

std::vector<LoadState> states;

411

};

412

413

public:

414

virtual bool has_new_save_support() {return true;}

415

416

virtual void save(Editor_Game_Base &, Map_Map_Object_Saver &, FileWrite &);

417

// Pure Bobs cannot be loaded

390

418

};

391

419

392

420

}

393

421

394

422

#endif

395

Older »