[Exult-cvs-logs] ./exult ChangeLog,1.1965,1.1966 Makefile.studio.mingw,1.48,1.49 actors.cc,1.613,1.614

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

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

Modified Files:
	ChangeLog Makefile.studio.mingw actors.cc 
Log Message:
* actors.cc: Fixed bug which prevented frame from being correctly set when
  creating new NPCs.
* objs/objs.cc: Fixed bug while editing objects contained by other objects.
* mapedit/objedit.cc, npcedit.cc: Added support for dragging shapes >1024.
* All other files: Added support for extended editing of container objects
  (i.e., editing resistance, 'invisible' and 'okay_to_take' flags).

Index: ChangeLog
===================================================================
RCS file: /cvsroot/exult/./exult/ChangeLog,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -d -r1.1965 -r1.1966
--- ChangeLog	18 Jul 2005 00:48:12 -0000	1.1965
+++ ChangeLog	18 Jul 2005 05:12:44 -0000	1.1966
@@ -1,3 +1,11 @@
+2005-07-18  Marzo Sette Torres Junior <ma...@ya...>
+	* actors.cc: Fixed bug which prevented frame from being correctly set when
+	  creating new NPCs.
+	* objs/objs.cc: Fixed bug while editing objects contained by other objects.
+	* mapedit/objedit.cc, npcedit.cc: Added support for dragging shapes >1024.
+	* All other files: Added support for extended editing of container objects
+	  (i.e., editing resistance, 'invisible' and 'okay_to_take' flags).
+
 2005-07-17    <je...@mi...>
 
 	* combat.cc: Improvements to weapon-readying so that monsters are

Index: Makefile.studio.mingw
===================================================================
RCS file: /cvsroot/exult/./exult/Makefile.studio.mingw,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile.studio.mingw	8 Jul 2005 07:09:20 -0000	1.48
+++ Makefile.studio.mingw	18 Jul 2005 05:12:44 -0000	1.49
@@ -50,7 +50,7 @@
 
 MAPEDIT_OBJS=bargeedit.o chunklst.o combo.o eggedit.o compile.o execbox.o \
 	exult_studio.o locator.o maps.o \
-	npcedit.o npclst.o objbrowse.o objedit.o paledit.o shapedraw.o \
+	npcedit.o npclst.o objbrowse.o objedit.o contedit.o paledit.o shapedraw.o \
 	shapefile.o shapegroup.o \
 	shapeedit.o shapelst.o studio.o
 

Index: actors.cc
===================================================================
RCS file: /cvsroot/exult/./exult/actors.cc,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -d -r1.613 -r1.614
--- actors.cc	18 Jul 2005 00:48:12 -0000	1.613
+++ actors.cc	18 Jul 2005 05:12:44 -0000	1.614
@@ -1956,7 +1956,7 @@
 			return;
 			}
 					// Create.  Gets initialized below.
-		npc = new Npc_actor(name, shape, frame, usecode);
+		npc = new Npc_actor(name, shape, npc_num, usecode);
 		npc->set_invalid();	// Set to invalid position.
 		int lift;		// Try to drop at increasing hts.
 		for (lift = 0; lift < 12; lift++)
@@ -1969,7 +1969,6 @@
 			delete npc;
 			return;
 			}
-		npc->npc_num = npc_num;
 		gwin->add_npc(npc, npc_num);
 		if (client_socket >= 0)
 			Exult_server::Send_data(client_socket, Exult_server::user_responded);
@@ -1977,12 +1976,13 @@
 	else				// Old.
 		{
 		npc->add_dirty();
-		npc->set_shape(shape, frame);
-		npc->add_dirty();
 		npc->usecode = usecode;
 		npc->usecode_assigned = true;
 		npc->set_npc_name(name.c_str());
 		}
+	// Ensure proper initialization of frame #:
+	npc->set_shape(shape, frame);
+	npc->add_dirty();
 	npc->face_num = face;
 	npc->set_ident(ident);
 	int i;