[Exult-cvs-logs] exult actors.cc,1.620,1.621 schedule.cc,1.174,1.175 schedule.h,1.65,1.66

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

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

Modified Files:
	actors.cc schedule.cc schedule.h 
Log Message:
Working on support for z-coord. in schedules (not done)

Index: actors.cc
===================================================================
RCS file: /cvsroot/exult/exult/actors.cc,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -d -r1.620 -r1.621
--- actors.cc	19 Aug 2005 02:05:41 -0000	1.620
+++ actors.cc	14 Oct 2005 07:01:39 -0000	1.621
@@ -1949,6 +1949,7 @@
 			Tile_coord p = changes[i].get_pos();
 			schedules[i].tx = p.tx;
 			schedules[i].ty = p.ty;
+			schedules[i].tz = p.tz;
 			}
 		if (Npc_actor_out(client_socket, addr, t.tx, t.ty, t.tz,
 			get_shapenum(), get_framenum(), get_face_shapenum(),
@@ -2056,7 +2057,8 @@
 	Schedule_change *scheds = num_schedules ? 
 				new Schedule_change[num_schedules] : 0;
 	for (i = 0; i < num_schedules; i++)
-		scheds[i].set(schedules[i].tx, schedules[i].ty, 
+		scheds[i].set(schedules[i].tx, schedules[i].ty,
+				schedules[i].tz,
 				schedules[i].type, schedules[i].time);
 	npc->set_schedules(scheds, num_schedules);
 	cout << "Npc updated" << endl;
@@ -4212,18 +4214,21 @@
 		for (i = 0; i < num_schedules; i++)
 		{
 			tile = schedules[i].get_pos();
-			scheds[i].set(tile.tx, tile.ty, schedules[i].get_type(), schedules[i].get_time());
+			scheds[i].set(tile.tx, tile.ty, tile.tz,
+			    schedules[i].get_type(), schedules[i].get_time());
 		}
 
-		scheds[num_schedules].set(0, 0, static_cast<unsigned char>(type),
+		scheds[num_schedules].set(0, 0, 0,
+			static_cast<unsigned char>(type),
 			static_cast<unsigned char>(time));
 		set_schedules(scheds, num_schedules+1);
 	}
 	else	// Did find it
 	{
 		tile = schedules[i].get_pos();
-		schedules[i].set(tile.tx, tile.ty, static_cast<unsigned char>(type),
-			static_cast<unsigned char>(time));
+		schedules[i].set(tile.tx, tile.ty, tile.tz,
+					static_cast<unsigned char>(type),
+					static_cast<unsigned char>(time));
 	}
 }
 
@@ -4245,15 +4250,18 @@
 		for (i = 0; i < num_schedules; i++)
 		{
 			tile = schedules[i].get_pos();
-			scheds[i].set(tile.tx, tile.ty, schedules[i].get_type(), schedules[i].get_time());
+			scheds[i].set(tile.tx, tile.ty, tile.tz,
+			    schedules[i].get_type(), schedules[i].get_time());
 		}
 
-		scheds[num_schedules].set(x, y, 0, static_cast<unsigned char>(time));
+		scheds[num_schedules].set(x, y, 0, 0, 
+					static_cast<unsigned char>(time));
 		set_schedules(scheds, num_schedules+1);
 	}
 	else	// Did find it
 	{
-		schedules[i].set(x, y, schedules[i].get_type(), static_cast<unsigned char>(time));
+		schedules[i].set(x, y, 0,
+		  schedules[i].get_type(), static_cast<unsigned char>(time));
 	}
 }
 
@@ -4276,14 +4284,14 @@
 		for (i = 0; i < todel; i++)
 		{
 			tile = schedules[i].get_pos();
-			scheds[i].set(tile.tx, tile.ty, 
+			scheds[i].set(tile.tx, tile.ty, tile.tz,
 			    schedules[i].get_type(), schedules[i].get_time());
 		}
 
 		for (; i < num_schedules - 1; i++)
 		{
 			tile = schedules[i+1].get_pos();
-			scheds[i].set(tile.tx, tile.ty, 
+			scheds[i].set(tile.tx, tile.ty, tile.tz,
 					schedules[i+1].get_type(), 
 					schedules[i+1].get_time());
 		}

Index: schedule.cc
===================================================================
RCS file: /cvsroot/exult/exult/schedule.cc,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- schedule.cc	11 Oct 2005 05:52:01 -0000	1.174
+++ schedule.cc	14 Oct 2005 07:01:39 -0000	1.175
@@ -3370,13 +3370,14 @@
 	(
 	int ax,
 	int ay,
+	int az,
 	unsigned char stype,
 	unsigned char stime
 	)
 	{
 	time = stime;
 	type = stype;
-	pos = Tile_coord(ax, ay, 0);
+	pos = Tile_coord(ax, ay, az);
 	}
 
 

Index: schedule.h
===================================================================
RCS file: /cvsroot/exult/exult/schedule.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- schedule.h	11 Oct 2005 05:52:01 -0000	1.65
+++ schedule.h	14 Oct 2005 07:01:39 -0000	1.66
@@ -536,7 +536,8 @@
 		{  }
 	void set4(unsigned char *ent);	// Create from 4-byte entry.
 	void get4(unsigned char *ent);	// Get 4-byte entry.
-	void set(int ax, int ay, unsigned char stype, unsigned char stime);
+	void set(int ax, int ay, int az, 
+			unsigned char stype, unsigned char stime);
 	int get_type() const
 		{ return type; }
 	int get_time() const