[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp,1.172,1.173 questmanager.cpp,1.31,1.32

[Luca P. <lpa...@us...>]

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

Modified Files:
	adminmanager.cpp questmanager.cpp 
Log Message:
no message

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** adminmanager.cpp	6 Jul 2005 21:19:16 -0000	1.172
--- adminmanager.cpp	19 Jul 2005 21:13:07 -0000	1.173
***************
*** 655,670 ****
      }
  
-     /*Result result(db->Select("SELECT id,name,lastname from characters where account_id=%u order by id",accountid));
- 
-     if (!result.IsValid())
-         return false;
- 
-     charlist->SetValidCount( result.Count() );        
-     for (unsigned int i=0;i<result.Count();i++)
-     {
-         charlist->SetEntryValid(i,true);
-         charlist->SetCharacterID(i,result[i].GetInt("id"));
-         charlist->SetCharacterFullName(i,result[i]["name"],result[i]["lastname"]);
-     }*/
      // ---------- determine who we are teleporting and where
      
--- 655,658 ----
***************
*** 674,679 ****
      else
      {
          subject = FindPlayerClient(msg.player, me->clientnum);
!         if (subject == NULL) 
              return;
      }
--- 662,669 ----
      else
      {
+         // search a player first
          subject = FindPlayerClient(msg.player, me->clientnum);
!         // if not found search an NPC
!         if (subject == NULL)
              return;
      }
***************
*** 753,764 ****
          client->GetActor()->GetPosition(targetPoint, yRot, targetSector);
      }
!     // when teleporting to a player
      else
      {
          Client * player = FindPlayerClient(msg.target, client->GetClientNum());
!         if (!player) 
              return false;
!         float yRot;
!         player->GetActor()->GetPosition(targetPoint, yRot, targetSector);
      }
      return true;
--- 743,762 ----
          client->GetActor()->GetPosition(targetPoint, yRot, targetSector);
      }
!     // when teleporting to a player/npc
      else
      {
          Client * player = FindPlayerClient(msg.target, client->GetClientNum());
!         if (player) {
! 
!           float yRot;
!           player->GetActor()->GetPosition(targetPoint, yRot, targetSector);
!         } else {
!           // search an NPC
!           gemObject* npc = psserver->GetEntityManager()->GetGEM()->FindObject(msg.target);
!           if (!npc)
              return false;
! 
!           npc->GetPosition(targetPoint, targetSector);
!         }
      }
      return true;

Index: questmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/questmanager.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** questmanager.cpp	17 Jul 2005 21:10:02 -0000	1.31
--- questmanager.cpp	19 Jul 2005 21:13:08 -0000	1.32
***************
*** 188,192 ****
                      else
                      {
!                         Error2("Parsed %s successfully.",op.GetData() );
                      }
                  }
--- 188,192 ----
                      else
                      {
!                         printf("Parsed %s successfully.",op.GetData() );
                      }
                  }
***************
*** 226,230 ****
                  else
                  {
!                     Error2("Parsed %s successfully.",op.GetData() );
                  }
                  quest_assigned_already = true;
--- 226,230 ----
                  else
                  {
!                     printf("Parsed %s successfully.",op.GetData() );
                  }
                  quest_assigned_already = true;
***************
*** 282,286 ****
                  else
                  {
!                     Error2("Parsed %s successfully.",op.GetData() );
                  }
              }
--- 282,286 ----
                  else
                  {
!                     printf("Parsed %s successfully.",op.GetData() );
                  }
              }
***************
*** 299,303 ****
          else
          {
!             Error2("Parsed %s successfully.",op.GetData() );
          }
      }
--- 299,303 ----
          else
          {
!             printf("Parsed %s successfully.",op.GetData() );
          }
      }