← Back to branch summary

~chuckw20/widelands/New_atlantean_carrier_animations

~chuckw20/widelands/New_atlantean_carrier_animations

« back to all changes in this revision

Viewing changes to src/logic/instances.cc

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/instances.cc

465

465

*

466

466

* Derived functions must call ancestor's function in the appropriate place.

467

467

*/

468

void Map_Object::Loader::load(FileRead & fr, uint8_t)

468

void Map_Object::Loader::load(FileRead & fr)

469

469

{

470

470

try {

471

471

uint8_t const header = fr.Unsigned8();

Older »