Added layer tiling.

src/jj2level/jj2layer.cpp

@@ -46,7 +46,7 @@ JJ2Layer::JJ2Layer () {
 }
 
 
-JJ2Layer::JJ2Layer (int newWidth, int newHeight) {
+JJ2Layer::JJ2Layer (int newWidth, int newHeight, int flags) {
 
 	int row;
 
@@ -58,6 +58,11 @@ JJ2Layer::JJ2Layer (int newWidth, int newHeight) {
 
 	for (row = 0; row < height; row++) grid[row] = *grid + (row * width);
 
+	tileX = flags & 1;
+	tileY = flags & 2;
+	limit = flags & 4;
+	warp = flags & 8;
+
 	return;
 
 }
@@ -93,9 +98,10 @@ int JJ2Layer::getHeight () {
 
 int JJ2Layer::getTile (int x, int y) {
 
-	if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) return 0;
+	if (((x < 0) || (x >= width)) && !tileX) return 0;
+	if (((y < 0) || (y >= height)) && !tileY) return 0;
 
-	return grid[y][x].tile;
+	return grid[tileY? y % height: y][tileX? x % width: x].tile;
 
 }
 

src/jj2level/jj2level.h

@@ -73,10 +73,11 @@ class JJ2Layer {
 	private:
 		JJ2Tile** grid;
 		int       width, height;
+		bool      tileX, tileY, limit, warp;
 
 	public:
 		JJ2Layer  ();
-		JJ2Layer  (int newWidth, int newHeight);
+		JJ2Layer  (int newWidth, int newHeight, int flags);
 		~JJ2Layer ();
 
 		bool getFlipped (int x, int y);

src/jj2level/jj2levelload.cpp

@@ -293,12 +293,12 @@ int JJ2Level::loadTiles (char* fileName) {
 
 	// Load tiles
 
-	tiles = aBuffer[1024] + (aBuffer[1025] << 8);
+	tiles = createShort(aBuffer + 1024);
 	tileBuffer = new unsigned char[tiles << 10];
 
 	for (count = 0; count < tiles; count++) {
 
-		memcpy(tileBuffer + (count << 10), bBuffer + ((int *)aBuffer)[257 + (maxTiles >> 1) + count], 1024);
+		memcpy(tileBuffer + (count << 10), bBuffer + createInt(aBuffer + 1028 + (maxTiles << 1) + (count << 2)), 1024);
 
 	}
 
@@ -334,7 +334,7 @@ int JJ2Level::loadTiles (char* fileName) {
 		for (y = 0; y < 32; y++) {
 
 			for (x = 0; x < 32; x++)
-				mask[(count << 10) + (y << 5) + x] = (dBuffer[((int *)aBuffer)[257 + ((maxTiles * 9) >> 1) + count] + (y << 2) + (x >> 3)] >> (x & 7)) & 1;
+				mask[(count << 10) + (y << 5) + x] = (dBuffer[createInt(aBuffer + 1028 + (maxTiles * 18) + (count << 2)) + (y << 2) + (x >> 3)] >> (x & 7)) & 1;
 
 		}
 
@@ -348,7 +348,7 @@ int JJ2Level::loadTiles (char* fileName) {
 		for (y = 0; y < 32; y++) {
 
 			for (x = 0; x < 32; x++)
-				flippedMask[(count << 10) + (y << 5) + x] = (dBuffer[((int *)aBuffer)[257 + ((maxTiles * 11) >> 1) + count] + (y << 2) + (x >> 3)] >> (x & 7)) & 1;
+				flippedMask[(count << 10) + (y << 5) + x] = (dBuffer[createInt(aBuffer + 1028 + (maxTiles * 22) + (count << 2)) + (y << 2) + (x >> 3)] >> (x & 7)) & 1;
 
 		}
 
@@ -407,7 +407,7 @@ int JJ2Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 	int count, x, y;
 	unsigned char tileQuad[8];
 	short int* quadRefs;
-	int width, pitch, height;
+	int flags, width, pitch, height;
 	int worldNum;
 	unsigned char startX, startY;
 
@@ -522,13 +522,14 @@ int JJ2Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 
 	for (count = 0; count < LAYERS; count++) {
 
-		width = ((int *)(aBuffer + 8443 + 8))[count];
-		pitch = ((int *)(aBuffer + 8443 + 40))[count];
-		height = ((int *)(aBuffer + 8443 + 72))[count];
+		flags = aBuffer[8403 + (count << 2)];
+		width = createInt(aBuffer + 8403 + 48 + (count << 2));
+		pitch = createInt(aBuffer + 8403 + 80 + (count << 2));
+		height = createInt(aBuffer + 8403 + 112 + (count << 2));
 
-		if (aBuffer[8443 + count]) {
+		if (aBuffer[8403 + 40 + count]) {
 
-			layers[count] = new JJ2Layer(width, height);
+			layers[count] = new JJ2Layer(width, height, flags);
 
 			for (y = 0; y < height; y++) {
 
@@ -536,7 +537,7 @@ int JJ2Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 
 					if ((x & 3) == 0) memcpy(tileQuad, cBuffer + (quadRefs[x >> 2] << 3), 8);
 
-					layers[count]->setTile(x, y, tileQuad[(x & 3) << 1] + (tileQuad[((x & 3) << 1) + 1] << 8), TSF? -tiles: tiles);
+					layers[count]->setTile(x, y, createShort(tileQuad + ((x & 3) << 1)), TSF? -tiles: tiles);
 
 				}
 
@@ -559,10 +560,9 @@ int JJ2Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 	height = layer->getHeight();
 
 
-
 	// Load events
-	startX = 0;
-	startY = 0;
+	startX = 1;
+	startY = 1;
 
 	mods = new JJ2Modifier *[height];
 	*mods = new JJ2Modifier[width * height];

src/util.cpp

@@ -59,7 +59,29 @@ bool fileExists (const char * fileName) {
 	return true;
 
 }
+
+
+unsigned short int createShort (unsigned char* data) {
+
+	unsigned short int val;
+
+	val = data[0] + (data[1] << 8);
+
+	return val;
+
+}
+
 
+int createInt (unsigned char* data) {
+
+	unsigned int val;
+
+	val = data[0] + (data[1] << 8) + (data[2] << 16) + (data[3] << 24);
+
+	return *((int *)&val);
+
+}
+
 
 char * createString (const char *string) {
 

src/util.h

@@ -35,19 +35,21 @@ EXTERN fixed sinLut[1024];
 
 // Functions
 
-EXTERN bool   fileExists           (const char *fileName);
-EXTERN char * createString         (const char *string);
-EXTERN char * createString         (const char *first, const char *second);
-EXTERN char * createFileName       (const char *type, int extension);
-EXTERN char * createFileName       (const char *type, const char *extension);
-EXTERN char * createFileName       (const char *type, int level, int extension);
-EXTERN char * createEditableString (const char *string);
-EXTERN void   log                  (const char *message);
-EXTERN void   log                  (const char *message, const char *detail);
-EXTERN void   log                  (const char *message, int number);
-EXTERN void   logError             (const char *message, const char *detail);
-EXTERN fixed  fSin                 (fixed angle);
-EXTERN fixed  fCos                 (fixed angle);
+EXTERN bool               fileExists           (const char *fileName);
+EXTERN unsigned short int createShort          (unsigned char* data);
+EXTERN int                createInt            (unsigned char* data);
+EXTERN char*              createString         (const char *string);
+EXTERN char*              createString         (const char *first, const char *second);
+EXTERN char*              createFileName       (const char *type, int extension);
+EXTERN char*              createFileName       (const char *type, const char *extension);
+EXTERN char*              createFileName       (const char *type, int level, int extension);
+EXTERN char*              createEditableString (const char *string);
+EXTERN void               log                  (const char *message);
+EXTERN void               log                  (const char *message, const char *detail);
+EXTERN void               log                  (const char *message, int number);
+EXTERN void               logError             (const char *message, const char *detail);
+EXTERN fixed              fSin                 (fixed angle);
+EXTERN fixed              fCos                 (fixed angle);
 
 #endif