[Exult-cvs-logs] ./exult/mapedit shapelst.cc,1.131,1.132

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

Update of /cvsroot/exult/./exult/mapedit
In directory sc8-pr-cvs17:/tmp/cvs-serv21210/mapedit

Modified Files:
	shapelst.cc 
Log Message:
* effects.*, shapes/miscinf.*, data/*: Added ability to specify explosion
  SFX based on shape. This seems to better match the originals' behavior.
* usecode/*: Added a few usecode script opcodes and modified the behavior
  of another, all based on the originals:
  - music opcode causes it to loop indefinitely if the high-byte is nonzero.
  - reset opcode (0xa) which causes a script to go back to the start.
  - delay_minutes (0x28) which works like its name suggests.
  - weather opcode (0x5A) which allows scripts to change weather.
  delay_hours has also been fixed so now it works.
* actors.*: Removed a few redundant cases from Actor::figure_weapon_pos.
  Changed maximum value of food stat and added new behavior for set/get_prop
  based on original games: prop 10 gets/sets sex flag, prop 11 gets if the
  NPC is using a weapon with uses >= 2.
* actorio.cc: Sex type flag seems to be reversed in initial SI savegame,
  absent for BG; this has been verified with get_prop intrinsic, as above.
* mapedit/*: Added hex display of shapes and shape ranges in shape browser.
* content/sifixes/*: General reformatting (particularly the comments were
  word-wrapped at about 80 chars width) and code update. Also, added tons of
  global flags compiled by Malignant Manor; dozens more still to come.


Index: shapelst.cc
===================================================================
RCS file: /cvsroot/exult/./exult/mapedit/shapelst.cc,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- shapelst.cc	8 Jul 2007 03:34:45 -0000	1.131
+++ shapelst.cc	24 Oct 2007 01:42:46 -0000	1.132
@@ -2577,8 +2577,8 @@
 		{
 		int shapenum = info[selected].shapenum;
 		int nframes = ifile->get_num_frames(shapenum);
-		g_snprintf(buf, sizeof(buf), "Shape %d (%d frames)",
-						shapenum, nframes);
+		g_snprintf(buf, sizeof(buf), "Shape %d (0x%03x, %d frames)",
+						shapenum, shapenum, nframes);
 		ExultStudio *studio = ExultStudio::get_instance();
 		if (shapes_file && studio->get_shape_name(shapenum))
 			{
@@ -2591,8 +2591,9 @@
 		}
 	else if (!info.empty() && !group)
 		{
-		g_snprintf(buf, sizeof(buf), "Shapes %d to %d",
-			info[rows[row0].index0].shapenum, last_shape);
+		int first_shape = info[rows[row0].index0].shapenum;
+		g_snprintf(buf, sizeof(buf), "Shapes %d to %d (0x%03x to 0x%03x)",
+			first_shape, last_shape, first_shape, last_shape);
 		status_id = gtk_statusbar_push(GTK_STATUSBAR(sbar), 
 								sbar_sel, buf);
 		}