|
[Once-cvs] oncecode/src/server/net ocmsghdlplayeractions.cpp,1.2,1.3 ocsrvnetmgr.cpp,1.40,1.41 ocsrvnetmgr.h,1.15,1.16
From: Manuel A. Fernandez Montecelo <mafm@us...> - 2005-11-30 16:16
|
Update of /cvsroot/once/oncecode/src/server/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26087/src/server/net
Modified Files:
ocmsghdlplayeractions.cpp ocsrvnetmgr.cpp ocsrvnetmgr.h
Log Message:
Changes in the server structure, using the CS Object Oriented fashion
Index: ocsrvnetmgr.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/net/ocsrvnetmgr.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ocsrvnetmgr.cpp 28 Nov 2005 17:43:20 -0000 1.40
--- ocsrvnetmgr.cpp 30 Nov 2005 16:16:33 -0000 1.41
***************
*** 43,47 ****
#include "server/content/ocsrvcontentmgr.h"
- #include "ocsrvnetmgr.h"
#include "server/net/ocmsghdlconnections.h"
#include "server/net/ocmsghdlconsole.h"
--- 43,46 ----
***************
*** 51,54 ****
--- 50,56 ----
#include "server/net/ocmsghdlplayerupdates.h"
+ #include "ocsrvnetmgr.h"
+
+
#ifdef WIN32
#include <winsock.h>
***************
*** 79,83 ****
// Message length = content length + ONCE type size +
// length size + RaknetType (u_char) + timestamp size
! packetlen = msglen + sizeof(msgtype) + sizeof(msglen) + sizeof(unsigned char) + sizeof(unsigned int);
buf.Init(packetlen);
buf.WriteChar((char)ID_USER_MSG);
--- 81,86 ----
// Message length = content length + ONCE type size +
// length size + RaknetType (u_char) + timestamp size
! packetlen = msglen + sizeof(msgtype) + sizeof(msglen)
! + sizeof(unsigned char) + sizeof(unsigned int);
buf.Init(packetlen);
buf.WriteChar((char)ID_USER_MSG);
***************
*** 264,268 ****
vector<ocLoginData*> allPlayers;
! Server->GetWorld()->GetAllPlayerConnections(allPlayers);
SendToPlayerList(msg, allPlayers, reliable, timestamp);
--- 267,271 ----
vector<ocLoginData*> allPlayers;
! Server->GetWorldMgr()->GetAllPlayerConnections(allPlayers);
SendToPlayerList(msg, allPlayers, reliable, timestamp);
***************
*** 281,285 ****
vector<ocLoginData*> allPlayers;
! Server->GetWorld()->GetAllPlayerConnections(allPlayers);
bool found = false;
--- 284,288 ----
vector<ocLoginData*> allPlayers;
! Server->GetWorldMgr()->GetAllPlayerConnections(allPlayers);
bool found = false;
***************
*** 333,353 ****
bool reliable, bool bcast)
{
! PlayerID* conn = loginData->GetNetLink();
- OC_PERM_ASSERT(conn != 0 || *conn != UNASSIGNED_PLAYER_ID);
- OC_PERM_ASSERT(netmgr->IsActive());
-
bool reply;
! // Note: There are 32 ordering channels for ORDERED and 32 ordering channels for SEQUENCED,
! // so don't be confised by the apperent attempt to use the same orderign channel for
// RELIABLE_ORDERER and UNRELIABLE_SEQUENCED.
if (bcast)
{
if (reliable)
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(), HIGH_PRIORITY, RELIABLE_ORDERED, 0,
UNASSIGNED_PLAYER_ID, true);
else
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(), MEDIUM_PRIORITY, UNRELIABLE_SEQUENCED, 0,
UNASSIGNED_PLAYER_ID, true);
}
--- 336,367 ----
bool reliable, bool bcast)
{
! PlayerID* conn = 0;
!
! if (!netmgr->IsActive())
! LogERR("Raknet not active when trying to send a packet");
!
! if (!bcast)
! {
! // with broadcast packets the connection has to be
! // null anyway
! conn = loginData->GetNetLink();
! OC_PERM_ASSERT(conn != 0 || *conn != UNASSIGNED_PLAYER_ID);
! }
bool reply;
! // Note: There are 32 ordering channels for ORDERED and 32
! // ordering channels for SEQUENCED, so don't be confised by
! // the apperent attempt to use the same orderign channel for
// RELIABLE_ORDERER and UNRELIABLE_SEQUENCED.
if (bcast)
{
if (reliable)
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(),
! HIGH_PRIORITY, RELIABLE_ORDERED, 0,
UNASSIGNED_PLAYER_ID, true);
else
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(),
! MEDIUM_PRIORITY, UNRELIABLE_SEQUENCED, 0,
UNASSIGNED_PLAYER_ID, true);
}
***************
*** 355,367 ****
{
if (reliable)
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(), HIGH_PRIORITY,
! RELIABLE_ORDERED, 0, *conn, false);
else
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(), MEDIUM_PRIORITY,
! UNRELIABLE_SEQUENCED, 0, *conn, false);
}
if (!reply)
! LogERR("SendRaw: Failed to send data to player.");
}
--- 369,385 ----
{
if (reliable)
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(),
! HIGH_PRIORITY, RELIABLE_ORDERED, 0,
! *conn, false);
else
! reply = netmgr->Send(buf->GetBuffer(), buf->GetSize(),
! MEDIUM_PRIORITY, UNRELIABLE_SEQUENCED, 0,
! *conn, false);
}
if (!reply)
! LogERR("SendRaw: Failed to send data to player "
! "(user '%s', IP '%s')",
! loginData->GetUserName(), loginData->GetIP());
}
***************
*** 495,501 ****
// to that system has been closed.
{
! PlayerID* conn;
! *conn = pkt->playerId;
! ocLoginData* loginData = Server->GetLoginMgr()->FindPlayer(conn);
if (!loginData)
{
--- 513,517 ----
// to that system has been closed.
{
! ocLoginData* loginData = Server->GetLoginMgr()->FindPlayer(&(pkt->playerId));
if (!loginData)
{
Index: ocsrvnetmgr.h
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/net/ocsrvnetmgr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ocsrvnetmgr.h 28 Nov 2005 17:43:20 -0000 1.15
--- ocsrvnetmgr.h 30 Nov 2005 16:16:33 -0000 1.16
***************
*** 27,31 ****
#include <csutil/hash.h>
- #include "common/ocidentifier.h"
#include "common/ocnetwork.h"
--- 27,30 ----
***************
*** 34,37 ****
--- 33,37 ----
class iSerial;
class ocSerialFactory;
+ class ocSerialBuffer;
class PlayerID;
class Packet;
Index: ocmsghdlplayeractions.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/net/ocmsghdlplayeractions.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ocmsghdlplayeractions.cpp 28 Nov 2005 17:00:53 -0000 1.2
--- ocmsghdlplayeractions.cpp 30 Nov 2005 16:16:33 -0000 1.3
***************
*** 45,50 ****
ocGetItemMsg* msg = (ocGetItemMsg*) ser_msg;
! Server->GetWorld()->PlayerGetItem(player->GetPlayerBehaviour(),
! msg->target_entity);
return true;
--- 45,50 ----
ocGetItemMsg* msg = (ocGetItemMsg*) ser_msg;
! Server->GetWorldMgr()->PlayerGetItem(player->GetPlayerBehaviour(),
! msg->target_entity);
return true;
***************
*** 68,73 ****
ocDropItemMsg* msg = (ocDropItemMsg*) ser_msg;
! Server->GetWorld()->PlayerDropItem(player->GetPlayerBehaviour(),
! msg->target_entity);
return true;
--- 68,73 ----
ocDropItemMsg* msg = (ocDropItemMsg*) ser_msg;
! Server->GetWorldMgr()->PlayerDropItem(player->GetPlayerBehaviour(),
! msg->target_entity);
return true;
|
| Thread | Author | Date |
|---|---|---|
| [Once-cvs] oncecode/src/server/net ocmsghdlplayeractions.cpp,1.2,1.3 ocsrvnetmgr.cpp,1.40,1.41 ocsrvnetmgr.h,1.15,1.16 | Manuel A. Fernandez Montecelo <mafm@us...> |