[agd-cvs] server/src object.c,1.7,1.8 object.h,1.5,1.6

[Peep P. <so...@us...>]

Update of /cvsroot/agd/server/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1231

Modified Files:
	object.c object.h 
Log Message:
Renamed int_load_object to load_object.

Index: object.c
===================================================================
RCS file: /cvsroot/agd/server/src/object.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- object.c	16 Mar 2004 14:13:24 -0000	1.7
+++ object.c	18 Mar 2004 20:45:20 -0000	1.8
@@ -40,7 +40,6 @@
 
 void destruct(object_t *ob)
 {
-/*	list_t *p;*/
 	int i;
 
 	if(!ob)
@@ -48,23 +47,20 @@
 	
 	ob->flags |= O_DESTRUCTED;
 	
-	if(ob->parent)
-		unref_ob(ob->parent, NULL);
+	unref_ob(ob->parent, NULL);
 	if(ob->iaob) {
 		net_disconnect(ob->iaob);
 		ob->iaob->ob = NULL;
 	}
 
-/*	for(p = &ob->refs; p; p=p->next) {
-		variable_t *v = p->data;
-		v->u.ob = NULL;
-	}*/
 	for(i=0;i<ob->refs.length;i++) {
 		variable_t *v = ob->refs.data[i];
 		v->u.ob = NULL;
 	}
-	
+
+#ifdef DEBUG
 	debug("dfun", "destructed \"%s\"\n", ob->name);
+#endif
 }
 
 void actual_destruct(object_t *ob)
@@ -149,18 +145,13 @@
 	return NULL;
 }
 
-object_t *load_object(char *name)
-{
-	return int_load_object(name);
-}
-
 object_t *clone_object(char *name)
 {
 	object_t *base_ob, *new_ob;
 
 	base_ob = find_object(name);
 	if(!base_ob) {
-		base_ob = int_load_object(name);
+		base_ob = load_object(name);
 		if(!base_ob)
 			return NULL;
 	}

Index: object.h
===================================================================
RCS file: /cvsroot/agd/server/src/object.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- object.h	15 Mar 2004 18:49:30 -0000	1.5
+++ object.h	18 Mar 2004 20:45:20 -0000	1.6
@@ -38,7 +38,6 @@
 void ref_prog(program_t *prog);
 int unref_prog(program_t *prog);
 object_t *find_object(char *name);
-object_t *load_object(char *name);
 object_t *clone_object(char *name);
 int interactivep(object_t *ob);
 /*