[Exult-cvs-logs] exult/mapedit eggedit.cc, 1.19, 1.20 exult_studio.glade, 1.148, 1.149

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

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

Modified Files:
	eggedit.cc exult_studio.glade 
Log Message:
Support z-coord in intermap eggs in EStudio

Index: eggedit.cc
===================================================================
RCS file: /cvsroot/exult/exult/mapedit/eggedit.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- eggedit.cc	3 Sep 2007 02:02:02 -0000	1.19
+++ eggedit.cc	6 Dec 2007 07:08:14 -0000	1.20
@@ -346,7 +346,7 @@
 			set_entry("teleport_y",
 				(schunk/12)*c_tiles_per_schunk +(data2>>8),
 								true);
-			set_entry("teleport_z", data3&0xff, true);
+			set_entry("teleport_z", data3&0xff);
 			set_spin("teleport_eggnum", 0, false);
 			}
 		else			// Egg #.
@@ -374,9 +374,10 @@
 		int mapnum = data1&0xff, schunk = data1>>8;
 		set_spin("intermap_mapnum", mapnum);
 		set_entry("intermap_x",
-				(schunk%12)*c_tiles_per_schunk + (data2&0xff));
+			(schunk%12)*c_tiles_per_schunk + (data2&0xff), true);
 		set_entry("intermap_y",
-				(schunk/12)*c_tiles_per_schunk + (data2>>8));
+			(schunk/12)*c_tiles_per_schunk + (data2>>8), true);
+		set_entry("intermap_z", data3&0xff);
 		break;
 		}
 	default:
@@ -506,7 +507,9 @@
 		{
 		int tx = get_num_entry("intermap_x"),
 		    ty = get_num_entry("intermap_y"),
+		    tz = get_num_entry("intermap_z"),
 		    mapnum = get_spin("intermap_mapnum");
+		data3 = tz;
 		data2 = (tx&0xff) + ((ty&0xff)<<8);
 		int sx = tx/c_tiles_per_schunk,
 		    sy = ty/c_tiles_per_schunk;

Index: exult_studio.glade
===================================================================
RCS file: /cvsroot/exult/exult/mapedit/exult_studio.glade,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- exult_studio.glade	6 Oct 2007 04:52:19 -0000	1.148
+++ exult_studio.glade	6 Dec 2007 07:08:14 -0000	1.149
@@ -16,8 +16,6 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
   <property name="show_fileops">True</property>
 
   <child internal-child="ok_button">
@@ -54,8 +52,6 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
[...2420 lines suppressed...]
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="type">label_item</property>
@@ -19375,9 +18595,6 @@
 			  <property name="rules_hint">False</property>
 			  <property name="reorderable">False</property>
 			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">False</property>
-			  <property name="hover_selection">False</property>
-			  <property name="hover_expand">False</property>
 			  <signal name="row_activated" handler="on_usecodes_treeview_row_activated" last_modification_time="Sun, 24 Dec 2006 02:59:07 GMT"/>
 			</widget>
 		      </child>