Planeshift: a 3D MMORPG

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2148

Modified Files:
	adminmanager.cpp 
Log Message:
Fix dumb bug found by Kemedes (Sasha).

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.397
retrieving revision 1.398
diff -C2 -d -r1.397 -r1.398
*** adminmanager.cpp	12 May 2007 23:05:10 -0000	1.397
--- adminmanager.cpp	27 May 2007 02:23:08 -0000	1.398
***************
*** 892,896 ****
               iResultRow& row = result[0];
               name = row["name"];
!              if (row["lastname"] != "")
               {
                    name.Append(" ");
--- 892,896 ----
               iResultRow& row = result[0];
               name = row["name"];
!              if (row["lastname"] && strcmp(row["lastname"],""))
               {
                    name.Append(" ");

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26075

Modified Files:
	history.txt 
Log Message:
Fixed resize and movable flags in sketch window.
Also fixed resizing and moving the sketch window around with the mouse.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4317
retrieving revision 1.4318
diff -C2 -d -r1.4317 -r1.4318
*** history.txt	24 May 2007 23:25:59 -0000	1.4317
--- history.txt	26 May 2007 21:31:46 -0000	1.4318
***************
*** 1,2 ****
--- 1,7 ----
+ *** 2007-05-23 by Keith Fulton
+ - Fixed resize and movable flags in sketch window.
+ - Also fixed resizing and moving the sketch window around with the mouse.
+ - Be sure to update /data/gui to get this working.
+ 
  *** 2007-05-23 by Tom Towey
  - Fixed remaining workmanager code to work with new containers.

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25677

Modified Files:
	pawsilluminationwindow.cpp 
Log Message:
Fixed resize and movable flags in sketch window.
Also fixed resizing and moving the sketch window around with the mouse.

Index: pawsilluminationwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsilluminationwindow.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pawsilluminationwindow.cpp	24 May 2007 04:47:23 -0000	1.14
--- pawsilluminationwindow.cpp	26 May 2007 21:30:20 -0000	1.15
***************
*** 373,377 ****
  {
      if (!editMode)
!         return false;
  
      mouseDown = true;
--- 373,377 ----
  {
      if (!editMode)
! 		return pawsWidget::OnMouseDown(button, modifiers,x,y);
  
      mouseDown = true;
***************
*** 404,408 ****
          selectedIndex = SIZET_NOT_FOUND;
      }
!     return false;
  }
  
--- 404,408 ----
          selectedIndex = SIZET_NOT_FOUND;
      }
! 	return pawsWidget::OnMouseDown(button, modifiers,x,y);
  }
  
***************
*** 410,414 ****
  {
      if (!editMode)
!         return false;
  
      mouseDown = false;
--- 410,414 ----
  {
      if (!editMode)
! 		return pawsWidget::OnMouseUp(button, modifiers,x,y);
  
      mouseDown = false;
***************
*** 421,425 ****
          return true;
      }
!     return false;
  }
  
--- 421,425 ----
          return true;
      }
! 	return pawsWidget::OnMouseUp(button, modifiers,x,y);
  }

Update of /cvsroot/planeshift/planeshift/data/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25276

Modified Files:
	illumination.xml 
Log Message:
Fixed resize and movable flags in sketch window.
Also fixed resizing and moving the sketch window around with the mouse.

Index: illumination.xml
===================================================================
RCS file: /cvsroot/planeshift/planeshift/data/gui/illumination.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** illumination.xml	7 Feb 2007 05:14:05 -0000	1.4
--- illumination.xml	26 May 2007 21:29:55 -0000	1.5
***************
*** 1,10 ****
  <widget_description>
  
!     <widget name="SketchWindow" factory="pawsSketchWindow" resizeable = "no" visible="no" movable="yes">
          <frame x="100" y="100" width="400" height="300" border="Leather Sketch Border"/>
          <!--title resource="Blue Title" text="Sketch Viewer" align="left" close_button="yes"/ -->
          <title text="Sketch Viewer" align="left" close_button="yes"/>
  	<bgimage resource="MiddleAreaMap" alpha="200" />  
! 	<font name="/planeshift/data/ttf/cupandtalon.ttf" r="0" g="0" b="0" size="14" />     
      </widget>
  
--- 1,62 ----
  <widget_description>
  
!     <widget name="SketchWindow" factory="pawsSketchWindow" resizable="yes" visible="no" movable="yes">
          <frame x="100" y="100" width="400" height="300" border="Leather Sketch Border"/>
          <!--title resource="Blue Title" text="Sketch Viewer" align="left" close_button="yes"/ -->
          <title text="Sketch Viewer" align="left" close_button="yes"/>
  	<bgimage resource="MiddleAreaMap" alpha="200" />  
! 	<font name="/planeshift/data/ttf/cupandtalon.ttf" r="0" g="0" b="0" size="14" />
!       
!       <widget name="FeatherTool" factory="pawsButton" id="102" tooltip="Edit Mode (F2)">
!           <frame x="0" y="0" width="16" height="16" /> 
!           <bgimage resource="FeatherTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickEditMode()</eventMouseDown>
!       </widget>
!       <widget name="TextTool" factory="pawsButton" id="100" tooltip="Create Text (t)">
!           <frame x="24" y="0" width="16" height="16" /> 
!           <bgimage resource="TextTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickTextTool()</eventMouseDown>
!       </widget>
!       <widget name="LineTool" factory="pawsButton" id="101" tooltip="Create Line (\)">
!           <frame x="42" y="0" width="16" height="16" /> 
!           <bgimage resource="LineTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickLineTool()</eventMouseDown>
!       </widget>
!       <widget name="PlusTool" factory="pawsButton" id="103" tooltip="Create Icon (+)">
!           <frame x="60" y="0" width="16" height="16" /> 
!           <bgimage resource="PlusTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickIconTool()</eventMouseDown>
!       </widget>
!       <!--widget name="MinusTool" factory="pawsButton" id="104" tooltip="Prev Icon (PgUp)">
!           <frame x="86" y="10" width="32" height="32" /> 
!           <bgimage resource="MinusTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickMinusTool()</eventMouseDown>
!       </widget-->
!       <widget name="LeftArrowTool" factory="pawsButton" id="105" tooltip="Next Icon (PgDn)">
!           <frame x="86" y="0" width="16" height="16" /> 
!           <bgimage resource="LeftArrowTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickPrevIcon()</eventMouseDown>
!       </widget>
!       <widget name="RightArrowTool" factory="pawsButton" id="106" tooltip="Previous Icon (PgUp)">
!           <frame x="104" y="0" width="16" height="16" /> 
!           <bgimage resource="RightArrowTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickNextIcon()</eventMouseDown>
!       </widget>
!       <!--widget name="UpArrowTool" factory="pawsButton" id="107" tooltip="Move Selected up">
!           <frame x="254" y="10" width="32" height="32" /> 
!           <bgimage resource="UpArrowTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickUpArrowTool()</eventMouseDown>
!       </widget-->
!       <!--widget name="DownArrowTool" factory="pawsButton" id="108" tooltip="Move Selected down">
!           <frame x="286" y="10" width="32" height="32" /> 
!           <bgimage resource="DownArrowTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickDownArrowTool()</eventMouseDown>
!       </widget-->
!       <widget name="DeleteTool" factory="pawsButton" id="109" tooltip="Delete Selected (del)">
!           <frame x="122" y="0" width="16" height="16" /> 
!           <bgimage resource="DeleteTool" /> 
! 	    <eventMouseDown>Ret = SketchWindow:ClickDeleteTool()</eventMouseDown>
!       </widget>
! 
      </widget>

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22495

Modified Files:
	history.txt 
Log Message:
Updated history,

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4316
retrieving revision 1.4317
diff -C2 -d -r1.4316 -r1.4317
*** history.txt	24 May 2007 04:48:58 -0000	1.4316
--- history.txt	24 May 2007 23:25:59 -0000	1.4317
***************
*** 1,2 ****
--- 1,7 ----
+ *** 2007-05-23 by Tom Towey
+ - Fixed remaining workmanager code to work with new containers.
+ - Added a server crash check on bad container iterator pointer
+ - Changed item stats for new dough item to allow right and left hand equiping.
+ 
  *** 2007-05-23 by Keith Fulton
  - Added a "toolbar" to the top of the Sketch Window.  Update data/gui and

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20603

Modified Files:
	item_stats.sql 
Log Message:
Changed dough item to allow equip in hand.

Index: item_stats.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/item_stats.sql,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** item_stats.sql	23 May 2007 01:46:55 -0000	1.107
--- item_stats.sql	24 May 2007 23:20:13 -0000	1.108
***************
*** 216,223 ****
  INSERT INTO `item_stats` VALUES (132,'B','Ring of agility',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_ring_agility','undo_equip',NULL);
  INSERT INTO `item_stats` VALUES (133,'B','Ring of faction',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_ring_faction','undo_equip',NULL);
! INSERT INTO `item_stats` VALUES (134,'B','Dough',2.00,25.00,10,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (135,'B','Nutty Dough',2.00,25.00,10,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (136,'B','Sweet Dough',2.00,25.00,10,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (137,'B','Superb Dough',2.00,25.00,10,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (138,'B','Table',1.00,500.00,65535,300,'','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (234,'B','Book Container',1.00,100.00,1,20,'BULK','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,131,151,0,0,0,'0',3,4.00,'GENERIC','',0.00,'',0.00,'',0.00,0,0,0.0000,0,0,0,1,'A Book Container','nosound',50,'','',NULL);
--- 216,223 ----
  INSERT INTO `item_stats` VALUES (132,'B','Ring of agility',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_ring_agility','undo_equip',NULL);
  INSERT INTO `item_stats` VALUES (133,'B','Ring of faction',1.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'GENERIC','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_ring_faction','undo_equip',NULL);
! INSERT INTO `item_stats` VALUES (134,'B','Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (135,'B','Nutty Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (136,'B','Sweet Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (137,'B','Superb Dough',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (138,'B','Table',1.00,500.00,65535,300,'','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,111,112,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (234,'B','Book Container',1.00,100.00,1,20,'BULK','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,1.00,0.00,2.10,1.00,0.20,0.20,0.20,0.00,131,151,0,0,0,'0',3,4.00,'GENERIC','',0.00,'',0.00,'',0.00,0,0,0.0000,0,0,0,1,'A Book Container','nosound',50,'','',NULL);

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19880

Modified Files:
	workmanager.cpp 
Log Message:
Fixed logic for transforming item in equiped slot.
Also rearranged send item clear and send item update message calls to cleint.

Index: workmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** workmanager.cpp	20 May 2007 20:01:55 -0000	1.247
--- workmanager.cpp	24 May 2007 23:19:03 -0000	1.248
***************
*** 1476,1480 ****
          psItem* item = it.Next();
          if (item->GetOwningCharacterID() == owner->GetCharacterID())
!         {
              itemArray.Push(item);
  
--- 1476,1480 ----
          psItem* item = it.Next();
          if (item->GetOwningCharacterID() == owner->GetCharacterID())
!         { 
              itemArray.Push(item);
  
***************
*** 2052,2098 ****
  
  
- /*
- ///////////////////////////////////////////////////////////////////////
- // Checks if equipment is already in container
- // TODO: not used
- bool psWorkManager::IsInContainer( uint32 equipId )
- {
-     if ( workItem == NULL )
-     {
-         Debug1(LOG_TRADE,0, "ERROR: no work item!\n");
-         return false;
-     }
- 
- #ifdef DEBUG_WORKMANAGER
-     CPrintf(CON_DEBUG, "Looking in container for item %u\n", equipId);
- #endif
- 
-     // cast a gem container to iterate thru
-     gemContainer *container = dynamic_cast<gemContainer*> (workItem->GetGemObject());
-     if (!container)
-     {
-         Error1("Could not instantiate gemContainer");
-         return false;
-     }
- 
-     // Create iterator
-     gemContainer::psContainerIterator it(container);
-     while (it.HasNext())
-     {
- 
- #ifdef DEBUG_WORKMANAGER
-         CPrintf(CON_DEBUG, "Container has item %u\n", item->GetCurrentStats()->GetUID());
- #endif
- 
-         // Check container for item
-         psItem* item = it.Next();
-         if (item->GetCurrentStats()->GetUID() == equipId) {
-             return true;
-         }
-     }
-     return false;
- }
- */
- 
  ///////////////////////////////////////////////////////////////////////
  // Validates player has enough training
--- 2052,2055 ----
***************
*** 2285,2292 ****
  
              // Remove items and delete
-             SendClearUpdate( item->GetLocInParent(), containerID );
              it.RemoveCurrent();
!             /////////           container->RemoveFromContainer(item, PSCHARACTER_SLOT_NONE);
!             ////////            item->TakeOutOfContainer();
              if (!item->Destroy())
              {
--- 2242,2247 ----
  
              // Remove items and delete
              it.RemoveCurrent();
!             SendClearUpdate( item->GetLocInParent(), containerID );
              if (!item->Destroy())
              {
***************
*** 2338,2344 ****
      // Remove items from container and destroy it
      unsigned int containerID = workItem->GetGemObject()->GetEntity()->GetID();
-     SendClearUpdate( oldItem->GetLocInParent(), containerID );
      container->RemoveFromContainer(oldItem, PSCHARACTER_SLOT_NONE);
!     ///oldItem->TakeOutOfContainer();
      if (!oldItem->Destroy())
      {
--- 2293,2298 ----
      // Remove items from container and destroy it
      unsigned int containerID = workItem->GetGemObject()->GetEntity()->GetID();
      container->RemoveFromContainer(oldItem, PSCHARACTER_SLOT_NONE);
!     SendClearUpdate( oldItem->GetLocInParent(), containerID );
      if (!oldItem->Destroy())
      {
***************
*** 2362,2366 ****
      // Add the new item to the container
      container->AddToContainer(newItem);
! ////TT//    SendItemUpdate( newItem->GetLocInParent(), newItem );  /// ToDo is this needed
      workItem->Save(true); 
  
--- 2316,2320 ----
      // Add the new item to the container
      container->AddToContainer(newItem);
!     SendItemUpdate( newItem->GetLocInParent(), newItem );  /// ToDo is this needed now
      workItem->Save(true); 
  
***************
*** 2413,2419 ****
  psItem* psWorkManager::TransformSlotItem(INVENTORY_SLOT_NUMBER slot, uint32 newId, int newQty, float itemQuality)
  {
-  /*****************************************
      // Remove items from slot and destroy it
!     psItem *oldItem = owner->Inventory().RemoveEquipment(slot);
      if (!oldItem)
      {
--- 2367,2372 ----
  psItem* psWorkManager::TransformSlotItem(INVENTORY_SLOT_NUMBER slot, uint32 newId, int newQty, float itemQuality)
  {
      // Remove items from slot and destroy it
!     psItem *oldItem = owner->Inventory().RemoveItem(NULL,slot);
      if (!oldItem)
      {
***************
*** 2422,2427 ****
      }
  
!     psserver->GetCharManager()->SendOutEquipmentMessages(clientNum, slot, oldItem, psEquipmentMessage::DEEQUIP);
!     if (!oldItem->Delete())
      {
          Error2("TransformSlotItem() could not remove old item ID #%u from database", oldItem->GetUID());
--- 2375,2383 ----
      }
  
!     // Send equip message to client
! //    psserver->GetCharManager()->SendOutEquipmentMessages(clientNum, slot, oldItem, psEquipmentMessage::DEEQUIP);
! 
!     // Delete the old item
!     if (!oldItem->Destroy())
      {
          Error2("TransformSlotItem() could not remove old item ID #%u from database", oldItem->GetUID());
***************
*** 2442,2445 ****
--- 2398,2404 ----
      }
  
+     // Send equip message to client
+     psserver->GetCharManager()->SendInventory(clientNum);
+ 
  #ifdef DEBUG_WORKMANAGER
      CPrintf(CON_DEBUG, "putting new item %s id=%u into slot number=%i\n",newItem->GetName(),newId,slot);
***************
*** 2447,2456 ****
  
      return newItem;
-     *********************/
-     return NULL;
  }
  
  ///////////////////////////////////////////////////////////////////////
  // Create the new item and return newly created item pointer
  psItem* psWorkManager::CreateTradeItem(uint32 newId, int newQty, float itemQuality, psItem* parent, INVENTORY_SLOT_NUMBER slot)
  {
--- 2406,2414 ----
  
      return newItem;
  }
  
  ///////////////////////////////////////////////////////////////////////
  // Create the new item and return newly created item pointer
+ //  if no psItem* parrent specified then item is created in players equipment slot and not in container
  psItem* psWorkManager::CreateTradeItem(uint32 newId, int newQty, float itemQuality, psItem* parent, INVENTORY_SLOT_NUMBER slot)
  {
***************
*** 2512,2530 ****
                  int instance;
  
                  owner->GetLocationInWorld(instance,sectorinfo,loc_x,loc_y,loc_z,loc_yrot);
- 
                  psserver->SendSystemError(owner->GetActor()->GetClientID(),
                                            "Item %s was dropped because your inventory is full.",
                                            newItem->GetName() );
! 
!                 EntityManager::GetSingleton().MoveItemToWorld(newItem,
!                                                               instance,
!                                                               sectorinfo,
!                                                               loc_x,
!                                                               loc_y,
!                                                               loc_z,
!                                                               loc_yrot,
!                                                               owner,
!                                                               true);
                  return NULL;
              }
--- 2470,2480 ----
                  int instance;
  
+                 // Drop item into world
                  owner->GetLocationInWorld(instance,sectorinfo,loc_x,loc_y,loc_z,loc_yrot);
                  psserver->SendSystemError(owner->GetActor()->GetClientID(),
                                            "Item %s was dropped because your inventory is full.",
                                            newItem->GetName() );
!                 EntityManager::GetSingleton().MoveItemToWorld(newItem, instance, sectorinfo, 
!                     loc_x, loc_y, loc_z, loc_yrot, owner, true);
                  return NULL;
              }
***************
*** 2779,2786 ****
      if (!trans)
      {
!             Error1("No valid transformation in HandleWorkEvent().\n");
!             owner->SetTradeWork(NULL);
!             worker->SetMode(PSCHARACTER_MODE_PEACE);
!             return;
      }
  
--- 2729,2736 ----
      if (!trans)
      {
!         Error1("No valid transformation in HandleWorkEvent().\n");
!         owner->SetTradeWork(NULL);
!         worker->SetMode(PSCHARACTER_MODE_PEACE);
!         return;
      }
  
***************
*** 2851,2854 ****
--- 2801,2811 ----
              }
              psItem* newItem = TransformSlotItem(slot, result, resultQty, currentQuality );
+             if (!newItem)
+             {
+                 Error1("TransformSlotItem did not create new item in HandleWorkEvent().\n");
+                 owner->SetTradeWork(NULL);
+                 worker->SetMode(PSCHARACTER_MODE_PEACE);
+                 return;
+             }
              workEvent->SetTransformationItem(newItem);
              break;

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19463

Modified Files:
	psserverchar.cpp 
Log Message:
Added a check for server crash check for container children.

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.524
retrieving revision 1.525
diff -C2 -d -r1.524 -r1.525
*** psserverchar.cpp	23 May 2007 01:41:29 -0000	1.524
--- psserverchar.cpp	24 May 2007 23:17:12 -0000	1.525
***************
*** 1512,1517 ****
      }
  
- 
- 
      int slot=0;
      gemContainer::psContainerIterator it(container);
--- 1512,1515 ----
***************
*** 1519,1522 ****
--- 1517,1525 ----
      {
          psItem* child = it.Next();
+         if (!child)
+         {
+             Debug2(LOG_NET,client->GetClientNum(),"Container iterator has next but returns null psItem pointer for %u.\n",client->GetClientNum());
+             return;
+         }
  
          // No owner... Add item visible to everybody.

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29310

Modified Files:
	history.txt 
Log Message:
- Added a "toolbar" to the top of the Sketch Window.  Update data/gui and svn to get everything for it.
- Minor formatting fixes.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4315
retrieving revision 1.4316
diff -C2 -d -r1.4315 -r1.4316
*** history.txt	23 May 2007 01:51:34 -0000	1.4315
--- history.txt	24 May 2007 04:48:58 -0000	1.4316
***************
*** 1,4 ****
  *** 2007-05-22 by Tom Towey
! - Changed stop auto work call for stoping crafting to correct stop work call.
  - Changed item instances and stats for testing containers.
  
--- 1,9 ----
+ *** 2007-05-23 by Keith Fulton
+ - Added a "toolbar" to the top of the Sketch Window.  Update data/gui and 
+   svn to get everything for it.
+ - Minor formatting fixes.
+ 
  *** 2007-05-22 by Tom Towey
! - Changed stop auto work call for stopping crafting to correct stop work call.
  - Changed item instances and stats for testing containers.

Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28921

Modified Files:
	dictionary.cpp psnpcdialog.cpp psnpcdialog.h 
Log Message:
- Added a "toolbar" to the top of the Sketch Window.  Update data/gui and svn to get everything for it.
- Minor formatting fixes.

Index: dictionary.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/dictionary.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** dictionary.cpp	19 May 2007 21:56:17 -0000	1.151
--- dictionary.cpp	24 May 2007 04:47:43 -0000	1.152
***************
*** 235,243 ****
          }
      }
-     
-     if (found) // If a dissallowd word was found. Print the new trigger text.
-     {
-         CPrintf(CON_DEBUG,"Trigger without dissallowed words: %s\n",trigger.GetDataSafe());
-     }
  }
  
--- 235,238 ----

Index: psnpcdialog.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** psnpcdialog.cpp	17 May 2007 10:32:40 -0000	1.91
--- psnpcdialog.cpp	24 May 2007 04:47:43 -0000	1.92
***************
*** 434,438 ****
  
  NpcResponse *psNPCDialog::FindOrGeneralizeTrigger(Client *client,NpcTriggerSentence& trigger,
!                                                   const csArray<int>& gen_terms)
  {
      NpcResponse *resp;
--- 434,438 ----
  
  NpcResponse *psNPCDialog::FindOrGeneralizeTrigger(Client *client,NpcTriggerSentence& trigger,
!                                                   csArray<int>& gen_terms, int word)
  {
      NpcResponse *resp;
***************
*** 470,474 ****
                  generalized_copy.Append(generalized[i]);
              }
!             
              dict->CheckForTriggerGroup(generalized_copy);  // substitute master trigger if this is child trigger in group
  
--- 470,476 ----
                  generalized_copy.Append(generalized[i]);
              }
!      
! 			printf("Searching for generalized trigger: %s'\n", generalized_copy.GetDataSafe());
! 
              dict->CheckForTriggerGroup(generalized_copy);  // substitute master trigger if this is child trigger in group
  
***************
*** 498,550 ****
  
      return NULL;
- 
- #ifdef USE_OLD_SERACH
- //     // This code was replaced with the code abou at 7th dec. 2005.
- //     NpcResponse *resp;
- 
- //     csString generalized_copy = generalized.GetString();
- 
- //     dict->CheckForTriggerGroup(generalized_copy);  // substitute master trigger if this is child trigger in group
- 
- //     resp = FindResponse( generalized_copy, trigger.GetString());
- //     if (resp != NULL)
- //     {
- //         Debug2(LOG_NPC, client->GetClientNum(), "Found response to: '%s'", generalized.GetString().GetData());
-         
- // //         // Removed till we find a better way to manage repeated responses
- // //         // At the moment are annoying since you cannot restart the conversation from
- // //         // a certain point
- // //         int times;
- // //         csTicks when;
- // //         if (dialogHistory.EverSaid(client->GetPlayerID(), resp->id, when, times))
- // //         {
- // //             return RepeatedResponse(trigger.GetString(), resp, when, times);
- // //         }
- // //         else
- // //             dialogHistory.AddToHistory(client->GetPlayerID(), resp->id, csGetTicks() );
- 
- 
- //         return resp;
- //     }
- //     else // Try a further generalizations at lower levels, then this level
- //     {
- //         if (level < trigger.TermLength()-1)
- //         {
- //             resp = FindOrGeneralizeTrigger(client,trigger,generalized,level+1);
- //             if (resp)
- //                 return resp;
- //         }
- //         // Reset later words back to original so re-search covers all again
- //         for (int i=(int)level+1; i<(int)trigger.TermLength(); i++)
- //             generalized.Term(i) = trigger.Term(i);
- 
- //         // Attempt to move up a level with this term
- //         bool found_more_general = generalized.GeneralizeTerm(dict,level);
- //         if (!found_more_general)  // no generalization possible, so give up at this level
- //             return NULL;
- //         else
- //             return FindOrGeneralizeTrigger(client,trigger,generalized,level);
- //     }
- #endif
  }
  
--- 500,503 ----
***************
*** 583,587 ****
      copy = trigger.GetString();
      dict->CheckForTriggerGroup(copy);  // substitute master trigger if this is child trigger in group
!     resp = FindResponse(copy, trigger.GetString());
  
      if (resp)
--- 536,547 ----
      copy = trigger.GetString();
      dict->CheckForTriggerGroup(copy);  // substitute master trigger if this is child trigger in group
! 
! 	// This is the generic version that does not use WordNet
! 	resp = FindResponse(copy, trigger.GetString());
! 	
! 	// This is the version that uses WordNet -- note Half done! Doesn't work
! 	//csArray<int> hyper_levels;
! 	//hyper_levels.SetSize(trigger.terms.GetSize(),0);
! 	//resp = FindOrGeneralizeTrigger(client, trigger, hyper_levels, trigger.terms.GetSize() );
  
      if (resp)

Index: psnpcdialog.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcdialog.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** psnpcdialog.h	12 May 2007 11:55:48 -0000	1.33
--- psnpcdialog.h	24 May 2007 04:47:43 -0000	1.34
***************
*** 154,158 ****
       */
      NpcResponse *FindOrGeneralizeTrigger(Client *client,NpcTriggerSentence& trigger,
!                                                   const csArray<int>& gen_terms);
  
  
--- 154,158 ----
       */
      NpcResponse *FindOrGeneralizeTrigger(Client *client,NpcTriggerSentence& trigger,
!                                          csArray<int>& gen_terms, int word);

Update of /cvsroot/planeshift/planeshift/src/common/paws
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28905

Modified Files:
	pawsscript.cpp 
Log Message:
- Added a "toolbar" to the top of the Sketch Window.  Update data/gui and svn to get everything for it.
- Minor formatting fixes.

Index: pawsscript.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsscript.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pawsscript.cpp	22 May 2007 05:25:00 -0000	1.5
--- pawsscript.cpp	24 May 2007 04:47:32 -0000	1.6
***************
*** 100,104 ****
  	{
  		ret = widget->FindWidget(name, false);
! 		widget = ret->GetParent();
  	}
  	return ret;
--- 100,104 ----
  	{
  		ret = widget->FindWidget(name, false);
! 		widget = widget->GetParent();
  	}
  	return ret;

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28882

Modified Files:
	psoptions.h 
Log Message:
- Added a "toolbar" to the top of the Sketch Window.  Update data/gui and svn to get everything for it.
- Minor formatting fixes.

Index: psoptions.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psoptions.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** psoptions.h	2 May 2007 12:11:28 -0000	1.3
--- psoptions.h	24 May 2007 04:47:23 -0000	1.4
***************
*** 64,72 ****
      ~psOptions();
  
!     // inheritted from iPAWSSubscriber
      void OnUpdateData(const char *name, PAWSData& data);
      void NewSubscription(const char *name);
  
!     // inheritted from iScriptableVar
      double GetProperty(const char *ptr);
      double CalcFunction(const char * functionName, const double * params);
--- 64,72 ----
      ~psOptions();
  
!     // inherited from iPAWSSubscriber
      void OnUpdateData(const char *name, PAWSData& data);
      void NewSubscription(const char *name);
  
!     // inherited from iScriptableVar
      double GetProperty(const char *ptr);
      double CalcFunction(const char * functionName, const double * params);

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28882/gui

Modified Files:
	pawsilluminationwindow.cpp pawsilluminationwindow.h 
Log Message:
- Added a "toolbar" to the top of the Sketch Window.  Update data/gui and svn to get everything for it.
- Minor formatting fixes.

Index: pawsilluminationwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsilluminationwindow.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pawsilluminationwindow.cpp	15 Feb 2007 14:43:08 -0000	1.13
--- pawsilluminationwindow.cpp	24 May 2007 04:47:23 -0000	1.14
***************
*** 138,141 ****
--- 138,198 ----
  }
  
+ double pawsSketchWindow::CalcFunction(const char * functionName, const double * params)
+ {
+ 	if (!strcasecmp(functionName,"ClickTextTool"))
+ 	{
+ 		OnKeyDown(0,'t',0);
+ 		return 0.0;
+ 	}
+ 	else if (!strcasecmp(functionName,"ClickEditMode"))
+ 	{
+ 		OnKeyDown(CSKEY_F2,0,0);
+ 		return 0.0;
+ 	}
+ 	else if (!strcasecmp(functionName,"ClickLineTool"))
+ 	{
+ 		OnKeyDown(0,'\\',0);
+ 		return 0.0;
+ 	}
+ 	else if (!strcasecmp(functionName,"ClickIconTool"))
+ 	{
+ 		OnKeyDown(0,'+',0);
+ 		return 0.0;
+ 	}
+ //	else if (!strcasecmp(functionName,"ClickMinusTool"))
+ //	{
+ //		OnKeyDown(CSKEY_PGDN,0,0);
+ //		return 0.0;
+ //	}
+ 	else if (!strcasecmp(functionName,"ClickPrevIcon"))
+ 	{
+ 		OnKeyDown(CSKEY_PGUP,0,0);
+ 		return 0.0;
+ 	}
+ 	else if (!strcasecmp(functionName,"ClickNextIcon"))
+ 	{
+ 		OnKeyDown(CSKEY_PGDN,0,0);
+ 		return 0.0;
+ 	}
+ //	else if (!strcasecmp(functionName,"ClickDownArrowTool"))
+ //	{
+ //		OnKeyDown(CSKEY_DOWN,0,0);
+ //		return 0.0;
+ //	}
+ //	else if (!strcasecmp(functionName,"ClickUpArrowTool"))
+ //	{
+ //		OnKeyDown(CSKEY_UP,0,0);
+ //		return 0.0;
+ //	}
+ 	else if (!strcasecmp(functionName,"ClickDeleteTool"))
+ 	{
+ 		OnKeyDown(CSKEY_DEL,0,0);
+ 		return 0.0;
+ 	}
+ 
+ 	// else call parent version to inherit other functions
+ 	return pawsWidget::CalcFunction(functionName,params);
+ }
+ 
  bool pawsSketchWindow::OnKeyDown( int keyCode, int key, int modifiers )
  {

Index: pawsilluminationwindow.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsilluminationwindow.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pawsilluminationwindow.h	29 Apr 2007 20:28:05 -0000	1.11
--- pawsilluminationwindow.h	24 May 2007 04:47:23 -0000	1.12
***************
*** 134,139 ****
--- 134,144 ----
      void HandleMessage( MsgEntry* message );
  
+ 	// inherited from iOnStringEnteredAction
      void OnStringEntered(const char *name,int param,const char *value);
  
+ 	// inherited from iScriptableVar from pawsWidget
+ 	double CalcFunction(const char * functionName, const double * params);
+ 
+ 
      virtual bool OnMouseDown( int button, int modifiers, int x, int y );
      virtual bool OnMouseUp( int button, int modifiers, int x, int y );

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8304

Modified Files:
	history.txt 
Log Message:
Updated history.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4314
retrieving revision 1.4315
diff -C2 -d -r1.4314 -r1.4315
*** history.txt	22 May 2007 09:18:48 -0000	1.4314
--- history.txt	23 May 2007 01:51:34 -0000	1.4315
***************
*** 1,2 ****
--- 1,6 ----
+ *** 2007-05-22 by Tom Towey
+ - Changed stop auto work call for stoping crafting to correct stop work call.
+ - Changed item instances and stats for testing containers.
+ 
  *** 2007-05-22 by Kenny Graunke
  - Fixes for bugs 2709 and 2710 by Sasha Levin and myself.  Thanks Sasha!

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6349

Modified Files:
	item_stats.sql 
Log Message:
Allow batter items to be help in right and left hand for testing crafts.

Index: item_stats.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/item_stats.sql,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** item_stats.sql	21 May 2007 21:03:10 -0000	1.106
--- item_stats.sql	23 May 2007 01:46:55 -0000	1.107
***************
*** 151,158 ****
  INSERT INTO `item_stats` VALUES (64,'B','Ground nuts',1.00,25.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,113,114,0,0,0,'0',3,0.00,'FOOD','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (65,'B','Wooden spoon',2.00,5.00,25,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,1.00,0.00,0.00,0.00,0.10,0.00,44,45,0,0,0,'Hammer',1,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (66,'B','Nutty batter',2.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (67,'B','Sweet batter',2.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (68,'B','Superb batter',2.00,25.00,1,0,'BULK LEFTFINGER RIGHTFINGER','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (69,'B','Batter',2.00,25.00,10,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (70,'B','Wooden bowl',1.00,25.00,40,35,'BULK LEFTHAND RIGHTHAND','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,42,43,0,0,0,'Hammer',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (71,'B','Gareths waybread recipe',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_mind','de_equip_mind',NULL);
--- 151,158 ----
  INSERT INTO `item_stats` VALUES (64,'B','Ground nuts',1.00,25.00,1,0,'BULK','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,113,114,0,0,0,'0',3,0.00,'FOOD','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (65,'B','Wooden spoon',2.00,5.00,25,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,1.00,0.00,0.00,0.00,0.10,0.00,44,45,0,0,0,'Hammer',1,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (66,'B','Nutty batter',2.00,25.00,1,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (67,'B','Sweet batter',2.00,25.00,1,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (68,'B','Superb batter',2.00,25.00,1,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
! INSERT INTO `item_stats` VALUES (69,'B','Batter',2.00,25.00,10,0,'BULK LEFTHAND RIGHTHAND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,115,116,0,0,0,'0',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (70,'B','Wooden bowl',1.00,25.00,40,35,'BULK LEFTHAND RIGHTHAND','CONTAINER',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,4.00,2.00,0.20,0.20,0.20,0.00,42,43,0,0,0,'Hammer',3,0.00,'TOOL','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'','',NULL);
  INSERT INTO `item_stats` VALUES (71,'B','Gareths waybread recipe',1.00,25.00,1,0,'BULK MIND','STACKABLE',0.10,-1,-1,-1,'0','0','0',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,42,43,0,0,0,'0',3,0.00,'RECIPE','',0.00,'',0.00,'0',0.00,0,0,0.0000,0,0,0,0,'0','nosound',50,'equip_mind','de_equip_mind',NULL);

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5939

Modified Files:
	item_instances.sql 
Log Message:
Changed wooden bowl to be no pickup.

Index: item_instances.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/item_instances.sql,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** item_instances.sql	21 May 2007 21:02:55 -0000	1.72
--- item_instances.sql	23 May 2007 01:45:58 -0000	1.73
***************
*** 119,134 ****
  INSERT INTO `item_instances` VALUES (67,2,0,27,1,0,0,0,0,0,0,0,0,0,50,50,71,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (68,2,0,24,1,0,0,0,0,0,0,0,0,0,50,50,235,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (69,2,0,31,1,0,0,0,0,0,0,0,0,0,50,50,65,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (122,2,0,21,1,0,0,0,0,0,0,0,0,0,50,50,5,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (124,2,0,29,3,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (125,2,0,30,8,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
- INSERT INTO `item_instances` VALUES (126,2,0,28,4,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (127,2,0,26,2,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  
  # Wooden bowl and contents
! INSERT INTO `item_instances` VALUES (70,0,0,0,1,0,0,0,3,-3.7,1.07,-180.58,0,0,50,50,70,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (71,0,70,1,1,0,0,0,3,0,0,0,0,0,50,-1,60,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (72,0,70,2,2,0,0,0,3,0,0,0,0,0,50,-1,61,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (73,0,70,3,7,0,0,0,3,0,0,0,0,0,50,-1,62,0,'',0,-1,'');
  
  # Book container and contents
--- 119,133 ----
  INSERT INTO `item_instances` VALUES (67,2,0,27,1,0,0,0,0,0,0,0,0,0,50,50,71,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (68,2,0,24,1,0,0,0,0,0,0,0,0,0,50,50,235,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (69,2,0,28,1,0,0,0,0,0,0,0,0,0,50,50,65,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (122,2,0,21,1,0,0,0,0,0,0,0,0,0,50,50,5,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (124,2,0,29,3,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (125,2,0,30,8,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  INSERT INTO `item_instances` VALUES (127,2,0,26,2,0,0,0,0,0,0,0,0,0,50,50,103,0,'',0,-1,'');
  
  # Wooden bowl and contents
! INSERT INTO `item_instances` VALUES (70,0,0,0,1,0,0,0,3,-3.7,1.07,-180.58,0,0,50,50,70,0,'NOPICKUP',0,-1,'');
! INSERT INTO `item_instances` VALUES (71,2,70,1,1,0,0,0,3,0,0,0,0,0,50,-1,60,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (72,2,70,2,2,0,0,0,3,0,0,0,0,0,50,-1,61,0,'',0,-1,'');
! INSERT INTO `item_instances` VALUES (73,2,70,3,7,0,0,0,3,0,0,0,0,0,50,-1,62,0,'',0,-1,'');
  
  # Book container and contents

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4745

Modified Files:
	workmanager.h 
Log Message:
Removed stop auto work from public.

Index: workmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** workmanager.h	12 May 2007 23:15:42 -0000	1.78
--- workmanager.h	23 May 2007 01:42:24 -0000	1.79
***************
*** 174,188 ****
      void StopWork(Client *client, psItem *item);
  
- //-----------------------------------------------------------------------------
- 
-     /** Stop auto work event.  
-      * This is called when a client removes an item from any container 
-      * before it has had a chance to transform the item. 
-      *  
-      *  @param client The client that removed the item.
-      *  @param autoItem The item that was being transformed.
-      */
-     void StopAutoWork(Client *client, psItem *autoItem);
- 
      /** @name Work Event Handlers
        *  These are the functions fired when a psWorkGameEvent is Triggered.
--- 174,177 ----
***************
*** 227,231 ****
      
      csWeakRef<gemObject> worker;    ///< Current worker that the work manager is dealing with.
- //    int workerCID;                  ///< Current worker ID
      
      uint32_t clientNum;             ///< Current client the work manager is dealing with.
--- 216,219 ----
***************
*** 265,268 ****
--- 253,265 ----
  protected:
  
+     /** Stop auto work event.  
+      * This is called when a client removes an item from any container 
+      * before it has had a chance to transform the item. 
+      *  
+      *  @param client The client that removed the item.
+      *  @param autoItem The item that was being transformed.
+      */
+     void StopAutoWork(Client *client, psItem *autoItem);
+ 
      /** Handles stopping the use of the item for working.  This is called when an item 
        * is tagetted and the /use command issued and it's already in use.
***************
*** 384,388 ****
      bool ValidateStamina(Client* client);
      bool IsOnHand(uint32 equipId);
- //bool IsInContainer(uint32 equipId);
      psItem* CreateTradeItem(uint32 newId, int newQty, float itemQuality, psItem* parent, INVENTORY_SLOT_NUMBER slot);
      bool ValidateTraining(psTradeTransformations* transCandidate, psTradeProcesses* processCandidate);
--- 381,384 ----

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4343

Modified Files:
	psserverchar.cpp 
Log Message:
Changed call from StopAutoWork to StopWork when items removed from containers.

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.523
retrieving revision 1.524
diff -C2 -d -r1.523 -r1.524
*** psserverchar.cpp	20 May 2007 21:44:00 -0000	1.523
--- psserverchar.cpp	23 May 2007 01:41:29 -0000	1.524
***************
*** 1794,1798 ****
      }
  
!     psserver->GetWorkManager()->StopAutoWork(fromClient, itemProposed);
  
      switch (msg.toContainer)
--- 1794,1798 ----
      }
  
!     psserver->GetWorkManager()->StopWork(fromClient, itemProposed);
  
      switch (msg.toContainer)

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23748/src/server

Modified Files:
	exchangemanager.cpp progressionmanager.cpp usermanager.cpp 
Log Message:
- Fixes for bugs 2709 and 2710 by Sasha Levin and myself.  Thanks Sasha!


Index: exchangemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/exchangemanager.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** exchangemanager.cpp	11 May 2007 05:38:16 -0000	1.167
--- exchangemanager.cpp	22 May 2007 09:18:49 -0000	1.168
***************
*** 87,90 ****
--- 87,102 ----
          }
  
+         // Ignore the answer if the invited client is busy with something else
+         if (invitedClient->GetActor()->GetMode() != PSCHARACTER_MODE_PEACE && invitedClient->GetActor()->GetMode() != PSCHARACTER_MODE_OVERWEIGHT)
+         {
+             csString err;
+             err.Format("You can't trade while %s.",invitedClient->GetCharacterData()->GetModeStr());
+             psserver->SendSystemError(invitedClient->GetClientNum(), err);
+ 
+             // Not telling the inviter what the invited client is doing...
+             psserver->SendSystemError(inviterClient->GetClientNum(), "%s is already busy with something else.", invitedCharFirstName);
+             return;
+         }
+ 
          // Ignore the answer if the invited client is already in trade
          if (invitedClient->GetExchangeID())

Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -C2 -d -r1.293 -r1.294
*** progressionmanager.cpp	19 May 2007 17:43:02 -0000	1.293
--- progressionmanager.cpp	22 May 2007 09:18:49 -0000	1.294
***************
*** 3695,3699 ****
              }
  
!             
              
              Debug2(LOG_SKILLXP, client->GetClientNum(),"    PP available: %d\n", character->GetProgressionPoints() );
--- 3695,3705 ----
              }
  
!             if (character->GetMode() != PSCHARACTER_MODE_PEACE)
!             {
!                 csString err;
!                 err.Format("You can't train while %s.", character->GetModeStr());
!                 psserver->SendSystemError(client->GetClientNum(), err);
!                 return;
!             }
              
              Debug2(LOG_SKILLXP, client->GetClientNum(),"    PP available: %d\n", character->GetProgressionPoints() );

Index: usermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.cpp,v
retrieving revision 1.310
retrieving revision 1.311
diff -C2 -d -r1.310 -r1.311
*** usermanager.cpp	19 May 2007 22:32:23 -0000	1.310
--- usermanager.cpp	22 May 2007 09:18:49 -0000	1.311
***************
*** 1682,1685 ****
--- 1682,1693 ----
      }
  
+     if (client->GetActor()->GetMode() != PSCHARACTER_MODE_PEACE)
+     {
+         csString err;
+         err.Format("You can't train while %s.", client->GetCharacterData()->GetModeStr());
+         psserver->SendSystemInfo(client->GetClientNum(), err);
+         return;
+     }
+ 
      psCharacter * trainer = target->GetCharacterData();
      if (!trainer->IsTrainer())

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23748/docs

Modified Files:
	history.txt 
Log Message:
- Fixes for bugs 2709 and 2710 by Sasha Levin and myself.  Thanks Sasha!


Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4313
retrieving revision 1.4314
diff -C2 -d -r1.4313 -r1.4314
*** history.txt	22 May 2007 05:24:47 -0000	1.4313
--- history.txt	22 May 2007 09:18:48 -0000	1.4314
***************
*** 1,2 ****
--- 1,5 ----
+ *** 2007-05-22 by Kenny Graunke
+ - Fixes for bugs 2709 and 2710 by Sasha Levin and myself.  Thanks Sasha!
+ 
  *** 2007-05-22 by Andrew Robberts
  - Added better widget resolving to pawsScript.  Now it will go through the

Update of /cvsroot/planeshift/planeshift/src/common/paws
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2066

Modified Files:
	pawsscript.cpp pawsscript.h 
Log Message:
*** 2007-05-22 by Andrew Robberts
- Added better widget resolving to pawsScript.  Now it will go through the
  parents of the current widget to try and find the referenced widget.
- Calling pawsScript::Execute() on an invalid script no longer crashes.

Index: pawsscript.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsscript.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawsscript.cpp	1 May 2007 12:47:28 -0000	1.4
--- pawsscript.cpp	22 May 2007 05:25:00 -0000	1.5
***************
*** 93,96 ****
--- 93,108 ----
  }
  
+ pawsWidget * pawsScript::FindWidget(pawsWidget * widget, const char * name)
+ {
+ 	// a better FindWidget that will go back up the parents to really try and find the thing
+ 	pawsWidget * ret = 0;
+ 	while (!ret && widget)
+ 	{
+ 		ret = widget->FindWidget(name, false);
+ 		widget = ret->GetParent();
+ 	}
+ 	return ret;
+ }
+ 
  bool pawsScript::Parse(const char * script)
  {
***************
*** 176,180 ****
              if (!isExtraVar)
              {
!                 pawsWidget * dep = widget->FindWidget(tokens[a-1]);
                  if (!dep)
                  {
--- 188,192 ----
              if (!isExtraVar)
              {
!                 pawsWidget * dep = FindWidget(widget, tokens[a-1]);
                  if (!dep)
                  {
***************
*** 197,201 ****
                  // keep track of result variable
                  pawsScriptResult result;
!                 result.widget = widget->FindWidget(tokens[startToken]);
                  if (result.widget)
                  {
--- 209,213 ----
                  // keep track of result variable
                  pawsScriptResult result;
!                 result.widget = FindWidget(widget, tokens[startToken]);
                  if (result.widget)
                  {
***************
*** 244,247 ****
--- 256,260 ----
            : widget(widget)
  {
+ 	statement = 0;
      Parse(script);
  }
***************
*** 254,257 ****
  void pawsScript::Execute()
  {
!     statement->Execute();
  }
--- 267,271 ----
  void pawsScript::Execute()
  {
! 	if (statement)
! 		statement->Execute();
  }

Index: pawsscript.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsscript.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawsscript.h	29 Apr 2007 09:14:17 -0000	1.1
--- pawsscript.h	22 May 2007 05:25:00 -0000	1.2
***************
*** 60,63 ****
--- 60,65 ----
      bool IsNumeric(char c);
      bool Parse(const char * script);
+ 
+ 	pawsWidget * FindWidget(pawsWidget * widget, const char * name);
  public:
      pawsScript(pawsWidget * widget, const char * script);

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2033

Modified Files:
	history.txt 
Log Message:
*** 2007-05-22 by Andrew Robberts
- Added better widget resolving to pawsScript.  Now it will go through the
  parents of the current widget to try and find the referenced widget.
- Calling pawsScript::Execute() on an invalid script no longer crashes.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4312
retrieving revision 1.4313
diff -C2 -d -r1.4312 -r1.4313
*** history.txt	21 May 2007 21:07:29 -0000	1.4312
--- history.txt	22 May 2007 05:24:47 -0000	1.4313
***************
*** 1,3 ****
! *** 2007-05-20 by Tom Towey
  - Added some item and trade data to test craft code.
  
--- 1,8 ----
! *** 2007-05-22 by Andrew Robberts
! - Added better widget resolving to pawsScript.  Now it will go through the
!   parents of the current widget to try and find the referenced widget.
! - Calling pawsScript::Execute() on an invalid script no longer crashes.
! 
! *** 2007-05-21 by Tom Towey
  - Added some item and trade data to test craft code.

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10422

Modified Files:
	history.txt 
Log Message:
Updated history.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.4311
retrieving revision 1.4312
diff -C2 -d -r1.4311 -r1.4312
*** history.txt	21 May 2007 05:31:59 -0000	1.4311
--- history.txt	21 May 2007 21:07:29 -0000	1.4312
***************
*** 1,2 ****
--- 1,5 ----
+ *** 2007-05-20 by Tom Towey
+ - Added some item and trade data to test craft code.
+ 
  *** 2007-05-21 by Kenny Graunke
  - Fix bug where the equipment array was not initialized on inventory load: