summaryrefslogtreecommitdiffhomepage
path: root/Stars45/NetServerConfig.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-03-27 17:42:26 +0200
committerAki <please@ignore.pl>2022-03-27 17:42:26 +0200
commita12e588079700d55a0b788fea2df7727c2e41f52 (patch)
tree690072569624c73af5043b3619acaab4d298b1fa /Stars45/NetServerConfig.cpp
parent72bb517271dad40a440533ad0796a88247011199 (diff)
downloadstarshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/NetServerConfig.cpp')
-rw-r--r--Stars45/NetServerConfig.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/Stars45/NetServerConfig.cpp b/Stars45/NetServerConfig.cpp
index 84f39fa..bb4e235 100644
--- a/Stars45/NetServerConfig.cpp
+++ b/Stars45/NetServerConfig.cpp
@@ -7,7 +7,6 @@
*/
-#include "MemDebug.h"
#include "NetServerConfig.h"
#include "NetUser.h"
@@ -68,7 +67,7 @@ void
NetServerConfig::Initialize()
{
if (!instance)
- instance = new(__FILE__,__LINE__) NetServerConfig();
+ instance = new NetServerConfig();
}
void
@@ -99,7 +98,7 @@ NetServerConfig::Load()
blocklen = ftell(f);
::fseek(f, 0, SEEK_SET);
- block = new(__FILE__,__LINE__) BYTE[blocklen+1];
+ block = new BYTE[blocklen+1];
block[blocklen] = 0;
::fread(block, blocklen, 1, f);
@@ -111,7 +110,7 @@ NetServerConfig::Load()
return;
}
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen));
+ Parser parser(new BlockReader((const char*) block, blocklen));
Term* term = parser.ParseTerm();
if (!term) {
@@ -310,7 +309,7 @@ NetServerConfig::Clean(const char* s)
if (!s || !*s) return Text();
int len = strlen(s);
- char* buff = new(__FILE__,__LINE__) char[len+1];
+ char* buff = new char[len+1];
ZeroMemory(buff, len+1);
char* p = buff;
@@ -349,7 +348,7 @@ NetServerConfig::LoadBanList()
blocklen = ftell(f);
::fseek(f, 0, SEEK_SET);
- block = new(__FILE__,__LINE__) BYTE[blocklen+1];
+ block = new BYTE[blocklen+1];
block[blocklen] = 0;
::fread(block, blocklen, 1, f);
@@ -361,7 +360,7 @@ NetServerConfig::LoadBanList()
return;
}
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen));
+ Parser parser(new BlockReader((const char*) block, blocklen));
Term* term = parser.ParseTerm();
if (!term) {
@@ -392,13 +391,13 @@ NetServerConfig::LoadBanList()
if (def->name()->value() == "name") {
Text name;
GetDefText(name, def, filename);
- banned_names.append(new(__FILE__,__LINE__) Text(name));
+ banned_names.append(new Text(name));
}
else if (def->name()->value() == "addr") {
DWORD addr;
GetDefNumber(addr, def, filename);
- banned_addrs.append(new(__FILE__,__LINE__) NetAddr(addr));
+ banned_addrs.append(new NetAddr(addr));
}
}
@@ -419,8 +418,8 @@ NetServerConfig::BanUser(NetUser* user)
if (!user || IsUserBanned(user))
return;
- NetAddr* user_addr = new(__FILE__,__LINE__) NetAddr(user->GetAddress().IPAddr());
- Text* user_name = new(__FILE__,__LINE__) Text(user->Name());
+ NetAddr* user_addr = new NetAddr(user->GetAddress().IPAddr());
+ Text* user_name = new Text(user->Name());
banned_addrs.append(user_addr);
banned_names.append(user_name);