[Planeshift-cvs] CVS: planeshift/src/server/database/mysql psdatabase.h,1.8,1.9 psdatabase.cpp,1.7,1.8

[Keith F. <ven...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory usw-pr-cvs1:/tmp/cvs-serv18731

Modified Files:
	psdatabase.h psdatabase.cpp 
Log Message:
Implemented GuildInvite.

Index: psdatabase.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/psdatabase.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** psdatabase.h	28 Feb 2002 02:47:11 -0000	1.8
--- psdatabase.h	28 Feb 2002 07:56:37 -0000	1.9
***************
*** 34,37 ****
--- 34,39 ----
  #define  PS_PASS    "planeshift"
  
+ #define ID_NOT_FOUND    0xffffffff
+ 
  class psDatabase : public iComponent, public ipsDatabase
  {
***************
*** 64,67 ****
--- 66,71 ----
  
      /// Guild handling procedures
+     int GetPlayerGuild(int playerid);
+     int GetLeadersGuild(const char *name );
      int CreateGuild(const char *guildname,const char *leadername);
      int RemoveGuild(const char *guildname,const char *leadername);

Index: psdatabase.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/psdatabase.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** psdatabase.cpp	27 Feb 2002 19:42:49 -0000	1.7
--- psdatabase.cpp	28 Feb 2002 07:56:37 -0000	1.8
***************
*** 193,196 ****
--- 193,214 ----
  }
  
+ int psDatabase::GetPlayerGuild(int playerid)
+ {
+     return mysql->SelectSingleNumber("select guild_member_of from players where id=%d",playerid);
+ }
+ 
+ int psDatabase::GetLeadersGuild(const char *name )
+ {
+     char nameEsc[513];
+     Escape(nameEsc,name);
+ 
+     return mysql->SelectSingleNumber("select a.id "
+                                      "  from players a,"
+                                      "       guilds b "
+                                      " where a.id = b.player_founder "
+                                      "   and a.name = '%s'",
+                                      nameEsc);
+ }
+ 
  int psDatabase::CreateGuild(const char *guildname,const char *leadername)
  {
***************
*** 201,205 ****
      uint32_t leaderID = GetPlayerID(leadername);
  
!     if (leaderID == 0xffffffff)
      {
          return 2; // id not found
--- 219,223 ----
      uint32_t leaderID = GetPlayerID(leadername);
  
!     if (leaderID == ID_NOT_FOUND)
      {
          return 2; // id not found
***************
*** 224,228 ****
      int leaderID = GetPlayerID(leadername);
  
!     if (leaderID == 0xffffffff)
      {
          return 2; // id not found
--- 242,246 ----
      int leaderID = GetPlayerID(leadername);
  
!     if (leaderID == ID_NOT_FOUND)
      {
          return 2; // id not found