[Exult-cvs-logs] exult/usecode intrinsics.cc,1.253,1.254 ucinternal.cc,1.108,1.109

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

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

Modified Files:
	intrinsics.cc ucinternal.cc 
Log Message:
Merged in multimap changes

Index: intrinsics.cc
===================================================================
RCS file: /cvsroot/exult/exult/usecode/intrinsics.cc,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- intrinsics.cc	21 May 2004 16:57:18 -0000	1.253
+++ intrinsics.cc	26 Jun 2004 23:01:00 -0000	1.254
@@ -716,7 +716,7 @@
 					(parms[0].get_int_value()>>8)&0x01);
 					// Show notes.
 		Game_object *obj = get_item(parms[1]);
-		if (obj)
+		if (obj && !obj->is_pos_invalid())
 			gwin->get_effects()->add_effect(
 				new Sprites_effect(24, obj, 0, 0, -2, -2));
 		}
@@ -1326,7 +1326,8 @@
 	if (npc)
 		{
 		int shape, points;
-		if (npc->get_weapon(points, shape))
+		Game_object *w;
+		if (npc->get_weapon(points, shape, w))
 			return Usecode_value(shape);
 		}
 	return Usecode_value(0);
@@ -2334,7 +2335,7 @@
 	Game_object *obj = get_item(parms[1]);
 	int volume = SDL_MIX_MAXVOLUME;	// Set volume based on distance.
 	int dir = 0;
-	if (obj)
+	if (obj && !obj->is_pos_invalid())
 		{
 		Tile_coord apos = gwin->get_main_actor()->get_tile();
 		Tile_coord opos = obj->get_tile();

Index: ucinternal.cc
===================================================================
RCS file: /cvsroot/exult/exult/usecode/ucinternal.cc,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- ucinternal.cc	21 May 2004 16:57:18 -0000	1.108
+++ ucinternal.cc	26 Jun 2004 23:01:00 -0000	1.109
@@ -707,6 +707,7 @@
 					// (Don't mess up rotated frames.)
 	if ((frame&0xf) < item->get_num_frames())
 		{
+#if 0	/* ++++ 1/31/04 (jsf) This shouldn't be needed anymore. */
 		if (item->get_owner())	// Inside a container?
 			{
 			item->set_frame(frame);
@@ -715,6 +716,7 @@
 				gwin->set_all_dirty();
 			}
 		else
+#endif
 			item->change_frame(frame);
 		}
 	gwin->set_painted();		// Make sure paint gets done.
@@ -729,6 +731,7 @@
 	Game_object *obj
 	)
 	{
+#if 0	/* ++++ 1/31/04 (jsf) This shouldn't be needed anymore. */
 	if (obj->get_owner())		// Inside a container?
 		{			// Paint gump if open.
 		Gump *gump = gumpman->find_gump(obj);
@@ -736,6 +739,7 @@
 			gwin->add_dirty(gump->get_shape_rect(obj));
 		}
 	else
+#endif
 		gwin->add_dirty(obj);
 	}