[Exult-cvs-logs] ./exult ChangeLog, 1.2047, 1.2048 actors.cc, 1.634, 1.635 ready.h, 1.8, 1.9

[<ma...@us...>]

Update of /cvsroot/exult/./exult
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19936

Modified Files:
	ChangeLog actors.cc ready.h 
Log Message:
* intrinsics.cc: Fixed multimap issue when casting 'mark' on a virtue stone
  when the stone is not directly on the map.
* actors.cc, ready.h, objs/contain.cc, mapedit/shapeedit.cc and
  mapedit/exult_studio.glade: Added an 'usecode container' item type to BG.
  Also, in 'objs/contain.cc', changed the usecode container detection code
  to use the item type instead of shape number.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/exult/./exult/ChangeLog,v
retrieving revision 1.2047
retrieving revision 1.2048
diff -u -d -r1.2047 -r1.2048
--- ChangeLog	11 Jun 2006 15:32:52 -0000	1.2047
+++ ChangeLog	14 Jun 2006 15:22:01 -0000	1.2048
@@ -1,3 +1,11 @@
+2006-06-14  Marzo Sette Torres Junior <ma...@ya...>
+	* intrinsics.cc: Fixed multimap issue when casting 'mark' on a virtue stone
+	  when the stone is not directly on the map.
+	* actors.cc, ready.h, objs/contain.cc, mapedit/shapeedit.cc and
+	  mapedit/exult_studio.glade: Added an 'usecode container' item type to BG.
+	  Also, in 'objs/contain.cc', changed the usecode container detection code
+	  to use the item type instead of shape number.
+
 2006-06-11 Willem Jan Palenstijn <wjp...@us...>
 	* midi/audio_drivers/mt32emu/i386.cpp: sync with scummvm to make it
 	  compile with gcc 4

Index: actors.cc
===================================================================
RCS file: /cvsroot/exult/./exult/actors.cc,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -d -r1.634 -r1.635
--- actors.cc	6 Mar 2006 02:45:22 -0000	1.634
+++ actors.cc	14 Jun 2006 15:22:01 -0000	1.635
@@ -1340,6 +1340,10 @@
 			case foot_armor:
 			prefered = feet;
 			break;
+			
+			case usecode_container_bg:
+			prefered = ucont_spot;
+			break;
 		}
 	}
 	else if (Game::get_game_type() == SERPENT_ISLE)	// Serpent Isle Types

Index: ready.h
===================================================================
RCS file: /cvsroot/exult/./exult/ready.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ready.h	13 Feb 2006 10:11:10 -0000	1.8
+++ ready.h	14 Jun 2006 15:22:01 -0000	1.9
@@ -31,6 +31,7 @@
 	neck_armor = 0x20,
 	torso_armor = 0x28,
 	ring = 0x30,
+	usecode_container_bg = 0x38,	// Porting from SI
 	ammunition = 0x40,
 	head_armor = 0x48,		// I.e., helm.
 	leg_armor = 0x50,		// I.e., leggings.