From: Andrew C. <ac...@us...> - 2003-11-29 04:55:37
|
Update of /cvsroot/planeshift/planeshift/src/common/net In directory sc8-pr-cvs1:/tmp/cvs-serv8956/src/common/net Modified Files: charmessages.cpp messages.cpp messages.h npcmessages.cpp Log Message: Some code clean ups that were still using some old character creation things. Index: charmessages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/charmessages.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** charmessages.cpp 28 Nov 2003 01:18:34 -0000 1.11 --- charmessages.cpp 29 Nov 2003 04:55:33 -0000 1.12 *************** *** 136,140 **** csArray<uint32_t> choices, csArray<uint32_t> lifeEvents ) { ! msg = new MsgEntry( strlen(name) * sizeof(char) + sizeof(int32_t) * 4 + sizeof(int32_t) * choices.Length() + --- 136,140 ---- csArray<uint32_t> choices, csArray<uint32_t> lifeEvents ) { ! msg = new MsgEntry( strlen(name) * sizeof(char) + 1 + sizeof(int32_t) * 4 + sizeof(int32_t) * choices.Length() + Index: messages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** messages.cpp 23 Nov 2003 02:16:37 -0000 1.114 --- messages.cpp 29 Nov 2003 04:55:33 -0000 1.115 *************** *** 46,50 **** psAuthenticationMessage::psAuthenticationMessage(uint32_t clientnum, ! const char *userid,const char *password, bool newUser,uint32_t version) { --- 46,50 ---- psAuthenticationMessage::psAuthenticationMessage(uint32_t clientnum, ! const char *userid,const char *password, uint32_t version) { *************** *** 61,65 **** msg->clientnum = clientnum; - msg->Add(newUser); msg->Add(version); msg->Add(userid); --- 61,64 ---- *************** *** 86,90 **** return; - newUser = message->GetBool(); netversion = message->GetUInt32(); sUser = message->GetStr(); --- 85,88 ---- *************** *** 95,99 **** if (valid) ! printf("%s/%s is using version %d and %s a new user.\n",(const char *)sUser,(const char *)sPassword,netversion,(newUser)?"is":"is not"); } --- 93,97 ---- if (valid) ! printf("%s/%s is using version %d.\n",(const char *)sUser,(const char *)sPassword,netversion ); } Index: messages.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** messages.h 23 Nov 2003 02:15:21 -0000 1.119 --- messages.h 29 Nov 2003 04:55:33 -0000 1.120 *************** *** 190,194 **** csString sAddr; csString sUser,sPassword; ! bool newUser; /** * This function creates a PS Message struct given a userid and --- 190,194 ---- csString sAddr; csString sUser,sPassword; ! /** * This function creates a PS Message struct given a userid and *************** *** 197,201 **** */ psAuthenticationMessage(uint32_t clientnum,const char *userid, ! const char *password, bool newUser=false,uint32_t version=PS_NETVERSION); /** --- 197,201 ---- */ psAuthenticationMessage(uint32_t clientnum,const char *userid, ! const char *password, uint32_t version=PS_NETVERSION); /** Index: npcmessages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/npcmessages.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** npcmessages.cpp 12 Oct 2003 04:03:18 -0000 1.8 --- npcmessages.cpp 29 Nov 2003 04:55:33 -0000 1.9 *************** *** 25,29 **** const char *userid, const char *password) ! : psAuthenticationMessage(clientnum,userid,password,false,PS_NPCNETVERSION) { /* --- 25,29 ---- const char *userid, const char *password) ! : psAuthenticationMessage(clientnum,userid,password,PS_NPCNETVERSION) { /* |