diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-14 02:39:30 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-14 02:39:37 -0400 |
| commit | 6f2d785d0ff761961912d7e79a7d16c4adf86861 (patch) | |
| tree | 3b96b197cc58b3a4bd30663cb66cf2aca630e77d /src/client.cpp | |
| parent | 6f4d6cb5741d10e10dacc78e264e421bf6a297cf (diff) | |
| download | minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.gz minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.bz2 minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.zip | |
Rename macros with two leading underscores
These names are reserved for the compiler/library implementations.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/client.cpp b/src/client.cpp index b2e21743c..5c04632d1 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -98,7 +98,7 @@ MeshUpdateQueue::~MeshUpdateQueue() */ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); assert(data); // pre-condition @@ -323,7 +323,7 @@ void Client::connect(Address address, const std::string &address_name, bool is_local_server) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); initLocalMapSaving(address, address_name, is_local_server); @@ -333,7 +333,7 @@ void Client::connect(Address address, void Client::step(float dtime) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); // Limit a bit if(dtime > 2.0) @@ -824,7 +824,7 @@ void Client::initLocalMapSaving(const Address &address, void Client::ReceiveAll() { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); u32 start_ms = porting::getTimeMs(); for(;;) { @@ -850,7 +850,7 @@ void Client::ReceiveAll() void Client::Receive() { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); NetworkPacket pkt; m_con.Receive(&pkt); ProcessData(&pkt); @@ -867,7 +867,7 @@ inline void Client::handleCommand(NetworkPacket* pkt) */ void Client::ProcessData(NetworkPacket *pkt) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); ToClientCommand command = (ToClientCommand) pkt->getCommand(); u32 sender_peer_id = pkt->getPeerId(); @@ -1213,7 +1213,7 @@ void Client::sendChangePassword(const std::string &oldpassword, void Client::sendDamage(u8 damage) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8)); pkt << damage; @@ -1222,7 +1222,7 @@ void Client::sendDamage(u8 damage) void Client::sendBreath(u16 breath) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16)); pkt << breath; @@ -1231,7 +1231,7 @@ void Client::sendBreath(u16 breath) void Client::sendRespawn() { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); NetworkPacket pkt(TOSERVER_RESPAWN, 0); Send(&pkt); @@ -1239,7 +1239,7 @@ void Client::sendRespawn() void Client::sendReady() { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); NetworkPacket pkt(TOSERVER_CLIENT_READY, 1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash)); |