[Exult-cvs-logs] exult/usecode intrinsics.cc,1.271,1.272

[<js...@us...>]

Update of /cvsroot/exult/exult/usecode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2577/usecode

Modified Files:
	intrinsics.cc 
Log Message:
Reset alignment to friendly/neutral when party members join/leave

Index: intrinsics.cc
===================================================================
RCS file: /cvsroot/exult/exult/usecode/intrinsics.cc,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- intrinsics.cc	14 Oct 2005 07:01:39 -0000	1.271
+++ intrinsics.cc	24 Oct 2005 04:24:10 -0000	1.272
@@ -417,6 +417,7 @@
 	if (!partyman->add_to_party(npc))
 		return no_ret;		// Can't add.
 	npc->set_schedule_type(Schedule::follow_avatar);
+	npc->set_alignment(Actor::friendly);
 // cout << "NPC " << npc->get_npc_num() << " added to party." << endl;
 	return no_ret;
 }
@@ -424,8 +425,9 @@
 USECODE_INTRINSIC(remove_from_party)
 {
 	// NPC leaves party.
-	Game_object *npc = get_item(parms[0]);
-	partyman->remove_from_party(as_actor(npc));
+	Actor *npc = as_actor(get_item(parms[0]));
+	if (partyman->remove_from_party(npc))
+		npc->set_alignment(Actor::neutral);
 	return no_ret;
 }