diff options
| author | Atle Hellvik Havsų <atle@havso.net> | 2010-11-08 11:45:48 +0100 |
|---|---|---|
| committer | Atle Hellvik Havsų <atle@havso.net> | 2010-11-08 11:45:48 +0100 |
| commit | 22845bb4752bb5b8d601b542df01b5594f2bea31 (patch) | |
| tree | b93deff6b978bf9a1e436f4b12e65b0a30f8690f /server/player.cpp | |
| parent | bbed785b301bd9380080489ad7b2f10f777b496d (diff) | |
| parent | dbe36b02350464b41510bf282531ed028ebae038 (diff) | |
Merge branch 'master' of ssh://git.jvnv.net/srv/git/aotenjou
Diffstat (limited to 'server/player.cpp')
| -rw-r--r-- | server/player.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/player.cpp b/server/player.cpp index 9530c10..e1796d8 100644 --- a/server/player.cpp +++ b/server/player.cpp @@ -3,8 +3,7 @@ Player::Player(){} Player::~Player(){} -Player::Player(std::string& ip, std::string& port, std::string& nick){ - this->ip = ip; - this->port = port; +Player::Player(const Connection::p& connection, const std::string& nick){ + this->connection_pointer = connection; this->nick = nick; } |