summaryrefslogtreecommitdiffhomepage
path: root/Stars45/NetLobbyClient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/NetLobbyClient.cpp')
-rw-r--r--Stars45/NetLobbyClient.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/Stars45/NetLobbyClient.cpp b/Stars45/NetLobbyClient.cpp
index bec2d42..ca0ff81 100644
--- a/Stars45/NetLobbyClient.cpp
+++ b/Stars45/NetLobbyClient.cpp
@@ -12,7 +12,6 @@
*/
-#include "MemDebug.h"
#include "NetLobbyClient.h"
#include "NetClientConfig.h"
#include "NetAuth.h"
@@ -60,7 +59,7 @@ NetLobbyClient::NetLobbyClient()
if (server_name.length() && port > 0) {
Print(" '%s' is a client of '%s'\n", me.Name(), server_name.data());
- link = new(__FILE__,__LINE__) NetLink;
+ link = new NetLink;
server_id = link->AddPeer(NetAddr(server_name, port));
}
else if (port == 0) {
@@ -83,7 +82,7 @@ temporary(true)
mods_req_time = 0;
if (addr.IPAddr() != 0) {
- link = new(__FILE__,__LINE__) NetLink;
+ link = new NetLink;
server_id = link->AddPeer(addr);
}
}
@@ -513,7 +512,7 @@ NetLobbyClient::DoChat(NetPeer* peer, Text msg)
// receive chat from server:
if (id && chat_msg.length()) {
- NetChatEntry* entry = new(__FILE__,__LINE__) NetChatEntry(id, user_name, chat_msg);
+ NetChatEntry* entry = new NetChatEntry(id, user_name, chat_msg);
if (!chat_log.contains(entry))
chat_log.insertSort(entry);
@@ -549,7 +548,7 @@ NetLobbyClient::DoServerMods(NetPeer* peer, Text msg)
else if (p->name == "ver") {
version = p->value;
- ModInfo* info = new(__FILE__,__LINE__) ModInfo(name, version, url);
+ ModInfo* info = new ModInfo(name, version, url);
server_mods.append(info);
}
}
@@ -608,7 +607,7 @@ NetLobbyClient::DoUserList(NetPeer* peer, Text msg)
else if (p->name == "host") {
host_flag = p->value;
- NetUser* u = new(__FILE__,__LINE__) NetUser(user_name);
+ NetUser* u = new NetUser(user_name);
u->SetHost((host_flag == "true") ? true : false);
u->SetSignature(signature);
u->SetSquadron(squadron);
@@ -641,7 +640,7 @@ NetLobbyClient::DoMissionList(NetPeer* peer, Text msg)
NetLobbyParam* p = params[i];
if (p->name == "c_id") {
- c = new(__FILE__,__LINE__) NetCampaignInfo;
+ c = new NetCampaignInfo;
sscanf_s(p->value, "0x%x", &c->id);
campaigns.append(c);
@@ -662,7 +661,7 @@ NetLobbyClient::DoMissionList(NetPeer* peer, Text msg)
for (int i = 0; i < campaigns.size(); i++) {
NetCampaignInfo* c = campaigns[i];
if (c->id == c_id) {
- m = new(__FILE__,__LINE__) MissionInfo;
+ m = new MissionInfo;
m->id = m_id;
c->missions.append(m);
missions.append(m); // for later garbage collection
@@ -776,7 +775,7 @@ NetLobbyClient::DoUnitList(NetPeer* peer, Text msg)
else if (p->name == "lock") {
sscanf_s(p->value, "%d", &lock);
- NetUnitEntry* entry = new(__FILE__,__LINE__) NetUnitEntry(elem_name, design, iff, index);
+ NetUnitEntry* entry = new NetUnitEntry(elem_name, design, iff, index);
entry->SetUserName(user_name);
entry->SetLives(lives);
entry->SetIntegrity(hull);