Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjusted a few comments

Browse Source
This commit is contained in:
Kayne Ruse
2014-04-20 02:39:29 +10:00
parent 6d32d44fa3
commit be4a8311d5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/map/region_pager.cpp
-2
View File
@@ -51,8 +51,6 @@ Region* RegionPagerBase::GetRegion(int x, int y) {
y = snapToBase(regionHeight, y); y = snapToBase(regionHeight, y);
//get the region by various means //get the region by various means
//TODO: revert this try/catch point
Region* ptr = nullptr; Region* ptr = nullptr;
ptr = FindRegion(x, y); ptr = FindRegion(x, y);
if (ptr) return ptr; if (ptr) return ptr;
server/server_application.cpp
+3 -1
View File
@@ -38,7 +38,7 @@ int runSQLScript(sqlite3* db, std::string fname) {
string script; string script;
getline(is, script, '\0'); getline(is, script, '\0');
is.close(); is.close();
//TODO: flesh out this error if needed //NOTE: flesh out this error if needed
if (sqlite3_exec(db, script.c_str(), nullptr, nullptr, nullptr) != SQLITE_OK) { if (sqlite3_exec(db, script.c_str(), nullptr, nullptr, nullptr) != SQLITE_OK) {
return -2; return -2;
} }
@@ -201,6 +201,7 @@ void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
//TODO: version info //TODO: version info
snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str()); snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
//TODO: player count //TODO: player count
//TODO: map format
char buffer[PACKET_BUFFER_SIZE]; char buffer[PACKET_BUFFER_SIZE];
serialize(&packet, buffer); serialize(&packet, buffer);
network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE); network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
@@ -331,6 +332,7 @@ void ServerApplication::HandlePlayerNew(NetworkPacket packet) {
void ServerApplication::HandlePlayerDelete(NetworkPacket packet) { void ServerApplication::HandlePlayerDelete(NetworkPacket packet) {
//TODO: remove this? //TODO: remove this?
//TODO: authenticate who is deleting this player
if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) { if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
throw(std::runtime_error("Cannot delete a non-existant player")); throw(std::runtime_error("Cannot delete a non-existant player"));
} }