diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-06-14 10:07:12 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-06-14 10:07:12 +0000 |
| commit | d9aff6e24a0b0cb650331c77ab724eb8b0109bd6 (patch) | |
| tree | 5555759e42258ae05f7363168f1bbf80ecbe5e37 /src/core | |
| parent | f1a97c89908be62cdc91c7a3d5b53149aa03de05 (diff) | |
fixed potential camera bug for cnontrolable entities without model
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/entity.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index e9985c3..db40f76 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -114,15 +114,16 @@ Entity::Entity(std::istream & is) is >> entity_flags; is >> entity_location; is >> entity_color; + is >> s; // shape + entity_shape = (Shape) s; + is >> entity_radius; is >> entity_axis[0]; is >> entity_axis[1]; entity_axis[2] = math::crossproduct(entity_axis.forward(), entity_axis.left()); - entity_shape = (Shape) s ; - char c; // read label while ( (is.get(c)) && (c != '"')); |