summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Player.cpp')
-rw-r--r--Stars45/Player.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Stars45/Player.cpp b/Stars45/Player.cpp
index 8639187..bb4a6d3 100644
--- a/Stars45/Player.cpp
+++ b/Stars45/Player.cpp
@@ -12,7 +12,6 @@
*/
-#include "MemDebug.h"
#include "Player.h"
#include "NetLobbyServer.h"
#include "NetLayer.h"
@@ -858,7 +857,7 @@ Player::Create(const char* name)
if (Find(name))
return 0;
- Player* newbie = new(__FILE__,__LINE__) Player(name);
+ Player* newbie = new Player(name);
newbie->SetCreateDate(NetLayer::GetUTC());
player_roster.append(newbie);
@@ -953,7 +952,7 @@ Player::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);
@@ -963,7 +962,7 @@ Player::Load()
if (blocklen == 0)
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) {
@@ -997,7 +996,7 @@ Player::Load()
Print("WARNING: player structure missing in '%s'\n", filename);
}
else {
- Player* player = new(__FILE__,__LINE__) Player;
+ Player* player = new Player;
bool current = false;
TermStruct* val = def->term()->isStruct();
@@ -1341,7 +1340,7 @@ Player::LoadAwardTables()
loader->SetDataPath("Awards/");
loader->LoadBuffer(filename, block, true);
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -1373,7 +1372,7 @@ Player::LoadAwardTables()
Print("WARNING: award structure missing in '%s'\n", filename);
}
else {
- AwardInfo* award = new(__FILE__,__LINE__) AwardInfo;
+ AwardInfo* award = new AwardInfo;
TermStruct* val = def->term()->isStruct();
for (int i = 0; i < val->elements()->size(); i++) {