X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2F16.txt;h=0b7a3e91ec2e3b9cc0295ddac1bf3662ff98644d;hb=a3a7dd5dc5553ab9095fc6b423981baadf50ab3c;hp=17cae05342eb24fca37af98338a286a6a01494d0;hpb=a108806edfdadeb0b5ab66802078093e374c288f;p=16.git

diff --git a/16/16.txt b/16/16.txt
index 17cae053..0b7a3e91 100644
--- a/16/16.txt
+++ b/16/16.txt
@@ -20,190 +20,190 @@ Something like
 #define TILES_X = NTILES_X - 1
 #define TILES_Y = NTILES_Y - 1
 struct vp_node {
-    uint8_t tile;
-    struct vp_node *up;
-    struct vp_node *right;
-    struct vp_node *down;
-    struct vp_node *left;
+	uint8_t tile;
+	struct vp_node *up;
+	struct vp_node *right;
+	struct vp_node *down;
+	struct vp_node *left;
 };
 struct viewport {
-    uint8_t offset_x; //X offset in pixels
-    uint8_t offset_y; //Y offset in pixels
-    uint16_t world_offset_x;
-    uint16_t world_offset_y;
-    struct vp_node *upper_left; //pointer to the upper left tile
+	uint8_t offset_x; //X offset in pixels
+	uint8_t offset_y; //Y offset in pixels
+	uint16_t world_offset_x;
+	uint16_t world_offset_y;
+	struct vp_node *upper_left; //pointer to the upper left tile
 };
 void initvp(struct viewport *vp, uint8_t **world_matrix, uint16_t offset_x, uint16_t offset_y) {
-    int i, j;
-    struct vp_node *vp_tmp[NTILES_Y][NTILES_X]; //i'd like to copy it
-    for(i=0; i<NTILES_Y; i++) {
-        for(j=0; j<NTILES_X; j++) {
-            vp_tmp[i][j] = malloc(sizeof(struct vp_node));
-            vp_tmp[i][j]->tile = world_matrix[offset_x + i][offset_y + j];
-        }
-    }
-    // i for line, j for column
-    // linking neighbouring tiles
-    // wait, do we need links to left and up?
-    for(i=0; i<NTILES_Y; i++) {
-        for(j=0; j<NTILES_X; j++) {
-            if(i) vp_tmp[i][j]->up = vp_tmp[i-1][j];
-            else vp_tmp[i][j]->up = NULL;
-            if(j) vp_tmp[i][j]->left = vp_tmp[i][j-1];
-            else vp_tmp[i][j]->left = NULL;
-            if(i<20) vp_tmp[i][j]->down = vp_tmp[i+1][j];
-            else vp_tmp[i][j]->down = NULL;
-            if(j<15) vp_tmp[i][j]->right = vp_tmp[i][j+1];
-            else vp_tmp[i][j]->right = NULL;
-        }
-    }
-    vp = malloc(sizeof(struct viewport));
-    vp->offset_x = 0;
-    vp->offset_y = 0;
-    vp->world_offset_x = offset_x;
-    vp->world_offset_y = offset_y;
-    vp->upper_left = vp_tmp[0][0];
+	int i, j;
+	struct vp_node *vp_tmp[NTILES_Y][NTILES_X]; //i'd like to copy it
+	for(i=0; i<NTILES_Y; i++) {
+		for(j=0; j<NTILES_X; j++) {
+			vp_tmp[i][j] = malloc(sizeof(struct vp_node));
+			vp_tmp[i][j]->tile = world_matrix[offset_x + i][offset_y + j];
+		}
+	}
+	// i for line, j for column
+	// linking neighbouring tiles
+	// wait, do we need links to left and up?
+	for(i=0; i<NTILES_Y; i++) {
+		for(j=0; j<NTILES_X; j++) {
+			if(i) vp_tmp[i][j]->up = vp_tmp[i-1][j];
+			else vp_tmp[i][j]->up = NULL;
+			if(j) vp_tmp[i][j]->left = vp_tmp[i][j-1];
+			else vp_tmp[i][j]->left = NULL;
+			if(i<20) vp_tmp[i][j]->down = vp_tmp[i+1][j];
+			else vp_tmp[i][j]->down = NULL;
+			if(j<15) vp_tmp[i][j]->right = vp_tmp[i][j+1];
+			else vp_tmp[i][j]->right = NULL;
+		}
+	}
+	vp = malloc(sizeof(struct viewport));
+	vp->offset_x = 0;
+	vp->offset_y = 0;
+	vp->world_offset_x = offset_x;
+	vp->world_offset_y = offset_y;
+	vp->upper_left = vp_tmp[0][0];
 }
 void scroll(struct viewport *vp, uint8_t **world_matrix, int8_t offset_x, int8_t offset_y) {
-    int8_t offset_x_total = offset_x + vp->offset_x;
-    int8_t offset_y_total = offset_y + vp->offset_y;
-    if(offset_x_total > 15) shift_right(vp, world_matrix);
-    if(offset_x_total < 0) shift_left(vp, world_matrix);
-    if(offset_y_total > 15) shift_down(vp, world_matrix);
-    if(offset_y_total < 0) shift_up(vp, world_matrix);
-    vp->offset_x = offset_x_total % 16;
-    vp->offset_y = offset_y_total % 16;
+	int8_t offset_x_total = offset_x + vp->offset_x;
+	int8_t offset_y_total = offset_y + vp->offset_y;
+	if(offset_x_total > 15) shift_right(vp, world_matrix);
+	if(offset_x_total < 0) shift_left(vp, world_matrix);
+	if(offset_y_total > 15) shift_down(vp, world_matrix);
+	if(offset_y_total < 0) shift_up(vp, world_matrix);
+	vp->offset_x = offset_x_total % 16;
+	vp->offset_y = offset_y_total % 16;
 }
 void shift_right(struct viewport *vp, uint8_t **world_matrix) {
-    vp->world_offset_x += 1;
-    struct vp_node *tmp = vp->upper_left;
-    vp->upper_left = vp->upper_left->right;
-    while(tmp->down) {
-        tmp->right->left = NULL;
-        tmp = tmp->down;
-        free(tmp->up);
-    }
-    tmp->right->left = NULL;
-    free(tmp);
-    // Starting from the upper left corner
-    tmp = vp->upper_left;
-    // Looking up the rightmost tile
-    while(tmp->right) tmp = tmp->right;
-    // Here and below: allocating and linking new neighbouring tiles
-    int i=0;
-    tmp->right = malloc(sizeof(struct vp_node));
-    tmp->right->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x +20];
-    tmp->right->left = tmp;
-    tmp->right->up = NULL;
-    tmp->right->right = NULL;
-    while(tmp->down) {
-        tmp = tmp->down;
-        tmp->right = malloc(sizeof(struct vp_node));
-        tmp->right->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x + 20];
-        tmp->right->left = tmp;
-        tmp->right->up = tmp->up->right;
-        tmp->up->right->down = tmp->right;
-        tmp->right->right = NULL;
-    }
-    tmp->right->down = NULL;
-    // looks like we've just added a column
+	vp->world_offset_x += 1;
+	struct vp_node *tmp = vp->upper_left;
+	vp->upper_left = vp->upper_left->right;
+	while(tmp->down) {
+		tmp->right->left = NULL;
+		tmp = tmp->down;
+		free(tmp->up);
+	}
+	tmp->right->left = NULL;
+	free(tmp);
+	// Starting from the upper left corner
+	tmp = vp->upper_left;
+	// Looking up the rightmost tile
+	while(tmp->right) tmp = tmp->right;
+	// Here and below: allocating and linking new neighbouring tiles
+	int i=0;
+	tmp->right = malloc(sizeof(struct vp_node));
+	tmp->right->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x +20];
+	tmp->right->left = tmp;
+	tmp->right->up = NULL;
+	tmp->right->right = NULL;
+	while(tmp->down) {
+		tmp = tmp->down;
+		tmp->right = malloc(sizeof(struct vp_node));
+		tmp->right->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x + 20];
+		tmp->right->left = tmp;
+		tmp->right->up = tmp->up->right;
+		tmp->up->right->down = tmp->right;
+		tmp->right->right = NULL;
+	}
+	tmp->right->down = NULL;
+	// looks like we've just added a column
 }
 void shift_left(struct viewport *vp, uint8_t **world_matrix) {
-    vp->world_offset_x -= 1;
-    // Removing the rightmost column first
-    struct vp_node *tmp = vp->upper_left;
-    while(tmp->right) tmp = tmp->right;
-    while(tmp->down) {
-        tmp->left->right = NULL;
-        tmp = tmp->down;
-        free(tmp->up);
-    }
-    tmp->left->right = NULL;
-    free(tmp);
-    // Now we need to add a new column to the left
-    tmp = vp->upper_left;
-    // Here and below: allocating and linking new neighbouring tiles
-    int i=0;
-    tmp->left = malloc(sizeof(struct vp_node));
-    tmp->left->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-    tmp->left->right = tmp;
-    tmp->left->up = NULL;
-    tmp->left->left = NULL;
-    while(tmp->down) {
-        tmp = tmp->down;
-        tmp->left = malloc(sizeof(struct vp_node));
-        tmp->left->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-        tmp->left->right = tmp;
-        tmp->left->up = tmp->up->left;
-        tmp->up->left->down = tmp->left;
-        tmp->left->left = NULL;
-    }
-    tmp->left->down = NULL;
-    // looks like we've just added a column to the left
+	vp->world_offset_x -= 1;
+	// Removing the rightmost column first
+	struct vp_node *tmp = vp->upper_left;
+	while(tmp->right) tmp = tmp->right;
+	while(tmp->down) {
+		tmp->left->right = NULL;
+		tmp = tmp->down;
+		free(tmp->up);
+	}
+	tmp->left->right = NULL;
+	free(tmp);
+	// Now we need to add a new column to the left
+	tmp = vp->upper_left;
+	// Here and below: allocating and linking new neighbouring tiles
+	int i=0;
+	tmp->left = malloc(sizeof(struct vp_node));
+	tmp->left->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+	tmp->left->right = tmp;
+	tmp->left->up = NULL;
+	tmp->left->left = NULL;
+	while(tmp->down) {
+		tmp = tmp->down;
+		tmp->left = malloc(sizeof(struct vp_node));
+		tmp->left->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+		tmp->left->right = tmp;
+		tmp->left->up = tmp->up->left;
+		tmp->up->left->down = tmp->left;
+		tmp->left->left = NULL;
+	}
+	tmp->left->down = NULL;
+	// looks like we've just added a column to the left
 }
 void shift_down(struct viewport *vp, uint8_t **world_matrix) {
-    vp->world_offset_y += 1;
-    // Removing the upper row first
-    struct vp_node *tmp = vp->upper_left->down;
-    vp->upper_left = tmp;
-    do {
-        free(tmp->up);
-        tmp->up = NULL;
-    } while(tmp->right);
-    // Now we need to add a new column to the bottom
-    tmp = vp->upper_left;
-    while(tmp->down) tmp = tmp->down;
-    // Here and below: allocating and linking new neighbouring tiles
-    int i=0;
-    tmp->down = malloc(sizeof(struct vp_node));
-    tmp->dpwn->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-    tmp->down->left = NULL;
-    tmp->down->up = tmp;
-    tmp->down->down = NULL;
-    while(tmp->right) {
-        tmp = tmp->right;
-        tmp->down = malloc(sizeof(struct vp_node));
-        tmp->down->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-        tmp->down->up = tmp;
-        tmp->down->left = tmp->left->down;
-        tmp->left->down->right = tmp->down;
-        tmp->down->down = NULL;
-    }
-    tmp->down->right = NULL;
-    // looks like we've just added a row to the bottom
+	vp->world_offset_y += 1;
+	// Removing the upper row first
+	struct vp_node *tmp = vp->upper_left->down;
+	vp->upper_left = tmp;
+	do {
+		free(tmp->up);
+		tmp->up = NULL;
+	} while(tmp->right);
+	// Now we need to add a new column to the bottom
+	tmp = vp->upper_left;
+	while(tmp->down) tmp = tmp->down;
+	// Here and below: allocating and linking new neighbouring tiles
+	int i=0;
+	tmp->down = malloc(sizeof(struct vp_node));
+	tmp->dpwn->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+	tmp->down->left = NULL;
+	tmp->down->up = tmp;
+	tmp->down->down = NULL;
+	while(tmp->right) {
+		tmp = tmp->right;
+		tmp->down = malloc(sizeof(struct vp_node));
+		tmp->down->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+		tmp->down->up = tmp;
+		tmp->down->left = tmp->left->down;
+		tmp->left->down->right = tmp->down;
+		tmp->down->down = NULL;
+	}
+	tmp->down->right = NULL;
+	// looks like we've just added a row to the bottom
 }
 void shift_up(struct viewport *vp, uint8_t **world_matrix) {
-    vp->world_offset_y += 1;
-    // Removing the bottom row first
-    struct vp_node *tmp = vp->upper_left;
-    while(tmp->down) tmp = tmp->down;
-    while(tmp->right) {
-        tmp->up->down = NULL;
-        tmp = tmp->right;
-        free(tmp->left);
-    }
-    tmp->up->down = NULL;
-    free(tmp);
-    // Now we need to add a new row to the top
-    tmp = vp->upper_left;
-    // Here and below: allocating and linking new neighbouring tiles
-    int i=0;
-    tmp->up = malloc(sizeof(struct vp_node));
-    tmp->up->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-    tmp->up->left = NULL;
-    tmp->up->down = tmp;
-    tmp->up->up = NULL;
-    while(tmp->right) {
-        tmp = tmp->right;
-        tmp->up = malloc(sizeof(struct vp_node));
-        tmp->up->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
-        tmp->up->down = tmp;
-        tmp->up->left = tmp->left->up;
-        tmp->left->up->right = tmp->up;
-        tmp->up->up = NULL;
-    }
-    tmp->up->right = NULL;
-    // looks like we've just added a row to the top
+	vp->world_offset_y += 1;
+	// Removing the bottom row first
+	struct vp_node *tmp = vp->upper_left;
+	while(tmp->down) tmp = tmp->down;
+	while(tmp->right) {
+		tmp->up->down = NULL;
+		tmp = tmp->right;
+		free(tmp->left);
+	}
+	tmp->up->down = NULL;
+	free(tmp);
+	// Now we need to add a new row to the top
+	tmp = vp->upper_left;
+	// Here and below: allocating and linking new neighbouring tiles
+	int i=0;
+	tmp->up = malloc(sizeof(struct vp_node));
+	tmp->up->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+	tmp->up->left = NULL;
+	tmp->up->down = tmp;
+	tmp->up->up = NULL;
+	while(tmp->right) {
+		tmp = tmp->right;
+		tmp->up = malloc(sizeof(struct vp_node));
+		tmp->up->tile = world_matrix[vp->world_offset_y + i++][vp->world_offset_x];
+		tmp->up->down = tmp;
+		tmp->up->left = tmp->left->up;
+		tmp->left->up->right = tmp->up;
+		tmp->up->up = NULL;
+	}
+	tmp->up->right = NULL;
+	// looks like we've just added a row to the top
 }
 void render_vp(struct viewport *vp);