From e756289c2b25553ebf07d5c2684c47f82d5f2755 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Mon, 21 Apr 2014 23:45:50 +1000
Subject: [PATCH] Adjusted a few comments

---
 client/scenes/in_world.cpp       |  5 +----
 common/network/serial_packet.hpp |  2 ++
 editor/editor_scene.cpp          | 16 +---------------
 server/server_application.cpp    |  9 ++-------
 server/server_application.hpp    |  1 +
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/client/scenes/in_world.cpp b/client/scenes/in_world.cpp
index 936be7d..37c533f 100644
--- a/client/scenes/in_world.cpp
+++ b/client/scenes/in_world.cpp
@@ -131,11 +131,11 @@ void InWorld::RenderFrame() {
 //	SDL_FillRect(GetScreen(), 0, 0);
 	Render(GetScreen());
 	SDL_Flip(GetScreen());
+	fps.Calculate();
 }
 
 void InWorld::Render(SDL_Surface* const screen) {
 	//draw the map
-	//TODO: figure out something to fix the region container access
 	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
 		tileSheet.DrawRegionTo(screen, *it, camera.x, camera.y);
 	}
@@ -148,10 +148,7 @@ void InWorld::Render(SDL_Surface* const screen) {
 	//draw UI
 	disconnectButton.DrawTo(screen);
 	shutDownButton.DrawTo(screen);
-
 	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-
-	fps.Calculate();
 }
 
 //-------------------------
diff --git a/common/network/serial_packet.hpp b/common/network/serial_packet.hpp
index 35f117e..86c9b2a 100644
--- a/common/network/serial_packet.hpp
+++ b/common/network/serial_packet.hpp
@@ -66,6 +66,8 @@ union SerialPacket {
 		//map data
 		REGION_REQUEST = 13,
 		REGION_CONTENT = 14,
+
+		//TODO: combat packets
 	};
 
 	//metadata on the packet itself
diff --git a/editor/editor_scene.cpp b/editor/editor_scene.cpp
index c0d0d73..1c069b3 100644
--- a/editor/editor_scene.cpp
+++ b/editor/editor_scene.cpp
@@ -87,21 +87,7 @@ void EditorScene::FrameEnd() {
 
 void EditorScene::Render(SDL_Surface* const screen) {
 	tsheet.DrawRegionTo(screen, pager.GetRegion(0, 0), camera.x, camera.y);
-/*	//debug
-	for (int i = 0; i < pager.GetRegionWidth()*2; i++) {
-		for (int j = 0; j < pager.GetRegionHeight()*2; j++) {
-			for (int k = 0; k < pager.GetRegionDepth(); k++) {
-				//TODO: skip the out-of-bounds regions
-				tsheet.DrawTo(
-					screen,
-					i*tsheet.GetTileW()-camera.x,
-					j*tsheet.GetTileH()-camera.y,
-					pager.GetTile(i,j,k)
-				);
-			}
-		}
-	}
-*/
+
 	//draw a big bar across the top (hackish)
 	buttonImage.SetClipY(0);
 	for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) {
diff --git a/server/server_application.cpp b/server/server_application.cpp
index 7317058..1a96d5b 100644
--- a/server/server_application.cpp
+++ b/server/server_application.cpp
@@ -110,7 +110,6 @@ void ServerApplication::Proc() {
 			HandlePacket(packet);
 		}
 		//give the computer a break
-		//TODO: remove this delay?
 		SDL_Delay(10);
 	}
 }
@@ -178,7 +177,6 @@ void ServerApplication::HandleBroadcastRequest(SerialPacket packet) {
 	packet.meta.type = SerialPacket::Type::BROADCAST_RESPONSE;
 
 	//pack the data
-	//TODO: version info
 	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
 	packet.serverInfo.playerCount = playerMap.size();
 	packet.serverInfo.regionWidth = REGION_WIDTH;
@@ -252,8 +250,6 @@ void ServerApplication::HandleSynchronize(SerialPacket packet) {
 	SerialPacket newPacket;
 	char buffer[PACKET_BUFFER_SIZE];
 
-	//TODO: syncronize the map?
-
 	//players
 	newPacket.meta.type = SerialPacket::Type::PLAYER_UPDATE;
 	for (auto& it : playerMap) {
@@ -296,8 +292,7 @@ void ServerApplication::HandlePlayerNew(SerialPacket packet) {
 	newPlayer.motion = {0,0};
 	newPlayer.bbox = {0, 0, 0, 0};
 
-	//stats
-	//TODO
+	//TODO: Add the statistic creation code here
 
 	//push this player
 	playerMap[PlayerEntry::uidCounter] = newPlayer;
@@ -364,7 +359,7 @@ void ServerApplication::HandleRegionRequest(SerialPacket packet) {
 }
 
 void ServerApplication::PumpPacket(SerialPacket packet) {
-	//I don't really like this, but it'll do for now
+	//NOTE: I don't really like this, but it'll do for now
 	char buffer[PACKET_BUFFER_SIZE];
 	serialize(&packet, buffer);
 	for (auto& it : clientMap) {
diff --git a/server/server_application.hpp b/server/server_application.hpp
index c34172e..2da5de1 100644
--- a/server/server_application.hpp
+++ b/server/server_application.hpp
@@ -88,6 +88,7 @@ private:
 
 	//maps
 	//TODO: I need to handle multiple map objects
+	//TODO: Unload regions that are distant from any players
 	RegionPager<LuaAllocator, LuaFormat> regionPager;
 
 	//misc