← Back to branch summary

~qcumber-some/widelands/spice-up-cmake

« back to all changes in this revision

Viewing changes to src/map_io/widelands_map_object_packet.cc

  • Committer: Jens Beyer (Qcumber-some)
  • Date: 2010-05-28 14:51:37 UTC
  • mfrom: (5149.1.226 trunk)
  • Revision ID: qcumber-some@buerotiger.de-20100528145137-0pyil9qw7szyztsw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/map_io/widelands_map_object_packet.cc
20
20
#include "widelands_map_object_packet.h"
21
21
 
22
22
#include "logic/battle.h"
 
23
#include "logic/critter_bob.h"
23
24
#include "logic/editor_game_base.h"
24
25
#include "logic/immovable.h"
25
26
#include "logic/legacy.h"
27
28
#include "wexception.h"
28
29
#include "logic/widelands_fileread.h"
29
30
#include "logic/widelands_filewrite.h"
 
31
#include "logic/worker.h"
30
32
#include "widelands_map_map_object_loader.h"
31
33
#include "widelands_map_map_object_saver.h"
32
34
 
76
78
                                loaders.insert(Battle::load(egbase, mol, fr));
77
79
                                break;
78
80
 
 
81
                        case Map_Object::header_Critter:
 
82
                                loaders.insert(Critter_Bob::load(egbase, mol, fr));
 
83
                                break;
 
84
 
 
85
                        case Map_Object::header_Worker:
 
86
                                loaders.insert(Worker::load(egbase, mol, fr));
 
87
                                break;
 
88
 
 
89
                        case Map_Object::header_WareInstance:
 
90
                                loaders.insert(WareInstance::load(egbase, mol, fr));
 
91
                                break;
 
92
 
79
93
                        default:
80
94
                                throw game_data_error(_("unknown object header %u"), header);
81
95
                        }