Reduced the footprint of the tiles

Also prepping for serializing the regions.

common/map/region.cpp

@@ -28,12 +28,12 @@ Region::Region(int argWidth, int argHeight, int argDepth, int argX, int argY):
 	x(argX),
 	y(argY)
 {
-	tiles = new int**[width];
+	tiles = new type_t**[width];
-	for (int i = 0; i < width; ++i) {
+	for (register int i = 0; i < width; ++i) {
-		tiles[i] = new int*[height];
+		tiles[i] = new type_t*[height];
-		for (int j = 0; j < height; ++j) {
+		for (register int j = 0; j < height; ++j) {
-			tiles[i][j] = new int[depth];
+			tiles[i][j] = new type_t[depth];
-			for (int k = 0; k < depth; ++k) {
+			for (register int k = 0; k < depth; ++k) {
 				tiles[i][j][k] = 0;
 			}
 		}
@@ -41,8 +41,8 @@ Region::Region(int argWidth, int argHeight, int argDepth, int argX, int argY):
 }
 
 Region::~Region() {
-	for (int i = 0; i < width; ++i) {
+	for (register int i = 0; i < width; ++i) {
-		for (int j = 0; j < height; j++) {
+		for (register int j = 0; j < height; j++) {
 			delete tiles[i][j];
 		}
 		delete tiles[i];
@@ -50,10 +50,10 @@ Region::~Region() {
 	delete tiles;
 }
 
-int Region::SetTile(int x, int y, int z, int v) {
+Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
 	return tiles[x][y][z] = v;
 }
 
-int Region::GetTile(int x, int y, int z) {
+Region::type_t Region::GetTile(int x, int y, int z) {
 	return tiles[x][y][z];
 }

common/map/region.hpp

@@ -22,21 +22,28 @@
 #ifndef REGION_HPP_
 #define REGION_HPP_
 
+//temporary?
+#define REGION_WIDTH 20
+#define REGION_HEIGHT 20
+#define REGION_DEPTH 3
+
 class Region {
 public:
+	typedef unsigned short type_t;
+
 	Region() = delete;
 	Region(int width, int height, int depth, int x, int y);
 	~Region();
 
-	int SetTile(int x, int y, int z, int v);
+	type_t SetTile(int x, int y, int z, type_t v);
-	int GetTile(int x, int y, int z);
+	type_t GetTile(int x, int y, int z);
 
 	//accessors
-	int GetWidth() { return width; }
+	int GetWidth() const { return width; }
-	int GetHeight() { return height; }
+	int GetHeight() const { return height; }
-	int GetDepth() { return depth; }
+	int GetDepth() const { return depth; }
-	int GetX() { return x; }
+	int GetX() const { return x; }
-	int GetY() { return y; }
+	int GetY() const { return y; }
 private:
 	const int width;
 	const int height;
@@ -44,7 +51,7 @@ private:
 	const int x;
 	const int y;
 
-	int*** tiles = nullptr;
+	type_t*** tiles = nullptr;
 };
 
 #endif

common/map/region_pager.cpp

@@ -35,12 +35,12 @@ RegionPagerBase::~RegionPagerBase() {
 	//EMPTY
 }
 
-int RegionPagerBase::SetTile(int x, int y, int z, int v) {
+Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
 }
 
-int RegionPagerBase::GetTile(int x, int y, int z) {
+Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
 }

common/map/region_pager.hpp

@@ -33,8 +33,8 @@ public:
 	RegionPagerBase(int regionWidth, int regionHeight, int regionDepth);
 	virtual ~RegionPagerBase();
 
-	int SetTile(int x, int y, int z, int v);
+	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	int GetTile(int x, int y, int z);
+	Region::type_t GetTile(int x, int y, int z);
 
 	Region* GetRegion(int x, int y);
 

common/network/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ..
+INCLUDES+=. .. ../map
 LIBS+=
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))

common/network/network_packet.hpp

@@ -22,9 +22,10 @@
 #ifndef NETWORKPACKET_HPP_
 #define NETWORKPACKET_HPP_
 
-#include "SDL/SDL_net.h"
-
 #include "vector2.hpp"
+#include "region.hpp"
+
+#include "SDL/SDL_net.h"
 
 #define PACKET_STRING_SIZE 100
 
@@ -61,6 +62,9 @@ union NetworkPacket {
 		PLAYER_NEW = 10,
 		PLAYER_DELETE = 11,
 		PLAYER_UPDATE = 12,
+
+		//map data
+		REGION_CONTENT = 13,
 	};
 
 	//metadata on the packet itself
@@ -75,6 +79,7 @@ union NetworkPacket {
 		//TODO: version info
 		char name[PACKET_STRING_SIZE];
 		//TODO: player count
+		//TODO: map format
 	}serverInfo;
 
 	//information about the client
@@ -95,7 +100,10 @@ union NetworkPacket {
 	}playerInfo;
 
 	//map data
-	//...
+	struct MapInformation {
+		Metadata meta;
+		Region* region;
+	}mapInfo;
 
 	//defaults
 	NetworkPacket() {

editor/editor_scene.cpp

@@ -56,12 +56,12 @@ EditorScene::EditorScene(ConfigUtility* const arg1):
 	});
 
 	//setup the map
-	pager.SetRegionWidth(config.Int("map.pager.width"));
+	pager.SetRegionWidth(REGION_WIDTH);
-	pager.SetRegionHeight(config.Int("map.pager.height"));
+	pager.SetRegionHeight(REGION_HEIGHT);
-	pager.SetRegionDepth(config.Int("map.pager.depth"));
+	pager.SetRegionDepth(REGION_DEPTH);
 
 	//debug
-	tsheet.Load("rsc\\graphics\\tilesets\\sand.bmp", 12, 3);
+	tsheet.Load(config["dir.tilesets"] + "sand.bmp", 12, 3);
 }
 
 EditorScene::~EditorScene() {

server/server_application.cpp

@@ -97,13 +97,14 @@ void ServerApplication::Init(int argc, char** argv) {
 	cout << "Initialized lua's setup script" << endl;
 
 	//setup the map object
-	mapPager.SetRegionWidth(config.Int("map.pager.width"));
+	mapPager.SetRegionWidth(REGION_WIDTH);
-	mapPager.SetRegionHeight(config.Int("map.pager.height"));
+	mapPager.SetRegionHeight(REGION_HEIGHT);
-	mapPager.SetRegionDepth(config.Int("map.pager.depth"));
+	mapPager.SetRegionDepth(REGION_DEPTH);
 	//TODO: pass args to the generator & format as needed
 	//NOTE: I might need to rearrange the init process so that lua & SQL can interact
 	//      with the map system as needed.
 	cout << "Initialized the map system" << endl;
+	cout << "\tsizeof(NetworkPacket): " << sizeof(NetworkPacket) << endl;
 
 	//finalize the startup
 	cout << "Startup completed successfully" << endl;