summaryrefslogtreecommitdiff
path: root/libgame/game-object.c
diff options
context:
space:
mode:
Diffstat (limited to 'libgame/game-object.c')
-rw-r--r--libgame/game-object.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/libgame/game-object.c b/libgame/game-object.c
index 25a5134..c4004cd 100644
--- a/libgame/game-object.c
+++ b/libgame/game-object.c
@@ -24,7 +24,6 @@
enum {
PROP_0,
PROP_GAME,
- PROP_NAME,
PROP_PERMANENT,
};
@@ -71,9 +70,6 @@ game_object_get_property (GObject *object_, guint param_id, GValue *value,
case PROP_GAME:
g_value_set_object (value, object->game);
break;
- case PROP_NAME:
- g_value_set_string (value, object->name);
- break;
case PROP_PERMANENT:
g_value_set_boolean (value, object->permanent);
break;
@@ -101,18 +97,6 @@ game_object_set_property (GObject *obj, guint param_id, const GValue *value,
if (klass->game_set)
klass->game_set (object);
break;
- case PROP_NAME:
- /* may not be set before game is set */
- g_assert (object->game != NULL);
- if (object->name)
- g_hash_table_remove (object->game->named_objects, object->name);
- g_assert (object->name == NULL);
- object->name = g_strdup (g_value_get_string (value));
- if (object->name) {
- g_hash_table_insert (object->game->named_objects, object->name, object);
- g_object_ref (object);
- }
- break;
case PROP_PERMANENT:
if (object->permanent != g_value_get_boolean (value)) {
object->permanent = g_value_get_boolean (value);
@@ -189,9 +173,6 @@ game_object_class_init (gpointer g_class, gpointer class_data)
g_object_class_install_property (object_class, PROP_GAME,
g_param_spec_object ("game", _("game"), _("game this object belongs to"),
GAME_TYPE_GAME, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property (object_class, PROP_NAME,
- g_param_spec_string ("name", _("name"), _("unique name for easy identification"),
- NULL, G_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_PERMANENT,
g_param_spec_boolean ("permanent", _("permanent"),
_("whether this object stays alive on level change"),