From ce0e8d8019f8922dfa6cdf3dc2567e326edce055 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@4ch.maidlab.jp>
Date: Sun, 4 May 2014 23:23:36 -0500
Subject: [PATCH] 	modified:   16/16.txt 	modified:   16/DOS_GFX.EXE 
 modified:   16/Project 16.bfproject 	deleted:    16/W 	modified:  
 16/dos_gfx.cpp 	modified:   16/dos_gfx.h

---
 16/16.txt               | 340 ++++++++--------
 16/DOS_GFX.EXE          | Bin 27972 -> 27959 bytes
 16/Project 16.bfproject |  49 +--
 16/W                    |   5 -
 16/dos_gfx.cpp          | 861 ++++++++++++++++++++--------------------
 16/dos_gfx.h            |  12 +-
 6 files changed, 632 insertions(+), 635 deletions(-)
 delete mode 100644 16/W

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);
 
diff --git a/16/DOS_GFX.EXE b/16/DOS_GFX.EXE
index 1cdab2127cd3011d68964db88afab1ceecbaf207..d3df3f89e3dbf4dfcca1123e0ce6f53b21ad9b54 100644
GIT binary patch
delta 7833
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
G-2Vr`x=Mxs

delta 8109
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

diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject
index 75219118..25b9d51e 100644
--- a/16/Project 16.bfproject	
+++ b/16/Project 16.bfproject	
@@ -1,21 +1,13 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/16/dos_gfx.cpp:6903:6589:1:
-openfiles: /dos/z/16/16/dos_gfx.h:1122:268:0:
-openfiles: /dos/z/16/16/dos_kb.c:1870:1395:0:
-openfiles: /dos/z/16/16/dos_kb.h:0:0:0:
-openfiles: /dos/z/16/16/lib_com.cpp:0:0:0:
+openfiles: /dos/z/16/16/dos_gfx.cpp:8340:8091:1:
+openfiles: /dos/z/16/16/dos_gfx.h:941:268:0:
+openfiles: /dos/z/16/16/dos_kb.c:759:642:0:
+openfiles: /dos/z/16/16/dos_kb.h:179:0:0:
+openfiles: /dos/z/16/16/lib_com.cpp:164:0:0:
 openfiles: /dos/z/16/16/lib_com.h:0:0:0:
 openfiles: /dos/z/16/16/16.txt:0:0:0:
-openfiles: /dos/z/16/16/project16.txt:1737:476:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/FONT1.H:0:0:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/FONT2.H:0:0:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/TAURON.H:0:0:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/MODES_C.INC:0:7495:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/PALETTE.INC:1213:2412:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/CLEAR.CPP:1394:2142:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/MODES.CPP:0:0:0:
-openfiles: /dos/z/4x4_16/tauron/C_SRC/TESTS.CPP:3437:3167:0:
+openfiles: /dos/z/16/16/project16.txt:1755:1676:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -30,11 +22,12 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/4x4_16/tauron/C_SRC
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: fill_plane(
+ssearch_text: fmem
 snr_casesens: 0
 view_blocks: 1
 name: project 16
 replacelist: てすと
+replacelist: \t
 fb_show_hidden_f: 0
 editor_tab_width: 4
 show_visible_spacing: 1
@@ -48,25 +41,25 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
+recent_files: file:///dos/z/grdemo.c
+recent_files: file:///dos/z/4x4_16/tauron/C_SRC/DUAL.CPP
+recent_files: file:///dos/z/4x4_16/tauron/C_SRC/MAINC.CPP
+recent_files: file:///dos/z/16/16/dos_gfx.cpp
 recent_files: file:///dos/z/16/16/dos_gfx.h
-recent_files: file:///dos/z/16/16/lib_com.cpp
-recent_files: file:///dos/z/16/16/lib_com.h
 recent_files: file:///dos/z/16/16/dos_kb.h
 recent_files: file:///dos/z/16/16/dos_kb.c
-recent_files: file:///dos/z/16/16/dos_gfx.cpp
+recent_files: file:///dos/z/16/16/lib_com.h
+recent_files: file:///dos/z/16/16/lib_com.cpp
 recent_files: file:///dos/z/16/16/project16.txt
 recent_files: file:///dos/z/16/16/16.txt
-recent_files: file:///dos/z/grdemo.c
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/PALETTE.INC
-recent_files: file:///dos/z/4x4_16/tauron/C_SRC/DUAL.CPP
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/TAURON.H
-recent_files: file:///dos/z/4x4_16/tauron/C_SRC/MAINC.CPP
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/CLEAR.CPP
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/MODES_C.INC
-recent_files: file:///dos/z/4x4_16/tauron/C_SRC/FONT2.H
-recent_files: file:///dos/z/4x4_16/tauron/C_SRC/FONT1.H
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/TESTS.CPP
 recent_files: file:///dos/z/4x4_16/tauron/C_SRC/MODES.CPP
+recent_files: file:///dos/z/4x4_16/tauron/C_SRC/FONT1.H
+recent_files: file:///dos/z/4x4_16/tauron/C_SRC/FONT2.H
 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1
@@ -78,11 +71,6 @@ snr_escape_chars: 0
 htmlbar_view: 1
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: ‚Ä‚·‚Æ
-searchlist: LGQ
-searchlist: plot
-searchlist: out
-searchlist: put
 searchlist: put
 searchlist: print
 searchlist: d put
@@ -93,6 +81,11 @@ searchlist: red
 searchlist: rext
 searchlist: rect`-
 searchlist: fill_plane(
+searchlist: fmemset
+searchlist: se
+searchlist:     
+searchlist: rect
+searchlist: fmem
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/16/W b/16/W
deleted file mode 100644
index f5334d49..00000000
--- a/16/W
+++ /dev/null
@@ -1,5 +0,0 @@
-3
-Where to next?  It's your move! wwww
-bakapi ver. 1.04.09a
-is made by sparky4i†ƒÖ…j feel free to use it ^^
-Licence: GPL v2
diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index 5f31ad4e..c1d9f135 100644
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -6,20 +6,20 @@
  *
  * Simple graphics library to accompany the article
  * 
- *			INTRODUCTION TO MODE X.
+ *					  INTRODUCTION TO MODE X.
  * 
  * This library provides the basic functions for initializing and using
  * unchained (planar) 256-color VGA modes.  Currently supported are:
  *
- *	- 320x200
- *	- 320x240
+ *	  - 320x200
+ *	  - 320x240
  *
  * Functions are provided for:
  *
- *	- initializing one of the available modes
- *	- setting the start address of the VGA refresh data
- *	- setting active and visible display pages
- *	- writing and reading a single pixel to/from video memory
+ *	  - initializing one of the available modes
+ *	  - setting the start address of the VGA refresh data
+ *	  - setting active and visible display pages
+ *	  - writing and reading a single pixel to/from video memory
  *
  * The library is provided as a demonstration only, and is not claimed
  * to be particularly efficient or suited for any purpose.  It has only
@@ -76,10 +76,10 @@ byte coor;
 /*
  * Define the port addresses of some VGA registers.
  */
-#define CRTC_ADDR	0x3d4	/* Base port of the CRT Controller (color) */
+#define CRTC_ADDR	   0x3d4   /* Base port of the CRT Controller (color) */
 
-#define SEQU_ADDR	0x3c4	/* Base port of the Sequencer */
-#define GRAC_ADDR	0x3ce	/* Base port of the Graphics Controller */
+#define SEQU_ADDR	   0x3c4   /* Base port of the Sequencer */
+#define GRAC_ADDR	   0x3ce   /* Base port of the Graphics Controller */
 
 
 /*
@@ -105,56 +105,56 @@ unsigned actStart, visStart;
 
 /*
  * set320x200x256_X()
- *	sets mode 13h, then turns it into an unchained (planar), 4-page
- *	320x200x256 mode.
+ *	  sets mode 13h, then turns it into an unchained (planar), 4-page
+ *	  320x200x256 mode.
  */
 void set320x200x256_X(void)
-	{
-	union REGS r;
+		{
+		union REGS r;
 
-	/* Set VGA BIOS mode 13h: */
-	r.x.ax = 0x0013;
-	int86(0x10, &r, &r);
+		/* Set VGA BIOS mode 13h: */
+		r.x.ax = 0x0013;
+		int86(0x10, &r, &r);
 
-	/* Turn off the Chain-4 bit (bit 3 at index 4, port 0x3c4): */
-	outpw(SEQU_ADDR, 0x0604);
+		/* Turn off the Chain-4 bit (bit 3 at index 4, port 0x3c4): */
+		outpw(SEQU_ADDR, 0x0604);
 
-	/* Turn off word mode, by setting the Mode Control register
-	of the CRT Controller (index 0x17, port 0x3d4): */
-   	outpw(CRTC_ADDR, 0xE317);
+		/* Turn off word mode, by setting the Mode Control register
+		of the CRT Controller (index 0x17, port 0x3d4): */
+		outpw(CRTC_ADDR, 0xE317);
 
-	/* Turn off doubleword mode, by setting the Underline Location
-	   register (index 0x14, port 0x3d4): */
-	outpw(CRTC_ADDR, 0x0014);
+		/* Turn off doubleword mode, by setting the Underline Location
+		   register (index 0x14, port 0x3d4): */
+		outpw(CRTC_ADDR, 0x0014);
 
-	/* Clear entire video memory, by selecting all four planes, then
-	   writing 0 to entire segment. */
-	outpw(SEQU_ADDR, 0x0F02);
-	memset(vga+1, 0, 0xffff); /* stupid size_t exactly 1 too small */
-	vga[0] = 0;
+		/* Clear entire video memory, by selecting all four planes, then
+		   writing 0 to entire segment. */
+		outpw(SEQU_ADDR, 0x0F02);
+		memset(vga+1, 0, 0xffff); /* stupid size_t exactly 1 too small */
+		vga[0] = 0;
 
-	/* Update the global variables to reflect dimensions of this
-	   mode.  This is needed by most future drawing operations. */
-	width		= 320;
-	height	= 200;
+		/* Update the global variables to reflect dimensions of this
+		   mode.  This is needed by most future drawing operations. */
+		width		   = 320;
+		height  = 200;
 
-	/* Each byte addresses four pixels, so the width of a scan line
-	   in *bytes* is one fourth of the number of pixels on a line. */
-	widthBytes = width / 4;
+		/* Each byte addresses four pixels, so the width of a scan line
+		   in *bytes* is one fourth of the number of pixels on a line. */
+		widthBytes = width / 4;
 
-	/* By default we want screen refreshing and drawing operations
-	   to be based at offset 0 in the video segment. */
-	actStart = visStart = 0;
-	}
+		/* By default we want screen refreshing and drawing operations
+		   to be based at offset 0 in the video segment. */
+		actStart = visStart = 0;
+		}
 
 /*
  * setActiveStart() tells our graphics operations which address in video
  * memory should be considered the top left corner.
  */
 void setActiveStart(unsigned offset)
-	{
-	actStart = offset;
-	}
+		{
+		actStart = offset;
+		}
 
 /*
  * setVisibleStart() tells the VGA from which byte to fetch the first
@@ -165,13 +165,13 @@ void setActiveStart(unsigned offset)
  * set, but before the low byte is set, which produces a bad flicker.
  */
 void setVisibleStart(unsigned offset)
-	{
-	visStart = offset;
-	outpw(CRTC_ADDR, 0x0C);		/* set high byte */
-	outpw(CRTC_ADDR+1, visStart >> 8);
-	outpw(CRTC_ADDR, 0x0D);		/* set low byte */
-	outpw(CRTC_ADDR+1, visStart & 0xff);
-	}
+		{
+		visStart = offset;
+		outpw(CRTC_ADDR, 0x0C);		 /* set high byte */
+		outpw(CRTC_ADDR+1, visStart >> 8);
+		outpw(CRTC_ADDR, 0x0D);		 /* set low byte */
+		outpw(CRTC_ADDR+1, visStart & 0xff);
+		}
 
 /*
  * setXXXPage() sets the specified page by multiplying the page number
@@ -180,125 +180,134 @@ void setVisibleStart(unsigned offset)
  * function.  The first page is number 0.
  */
 void setActivePage(int page)
-	{
-	setActiveStart(page * widthBytes * height);
-	}
+		{
+		setActiveStart(page * widthBytes * height);
+		}
 
 void setVisiblePage(int page)
-	{
-	setVisibleStart(page * widthBytes * height);
-	}
+		{
+		setVisibleStart(page * widthBytes * height);
+		}
 
 void putPixel_X(int x, int y, byte color)
-	{
-	/* Each address accesses four neighboring pixels, so set
-	   Write Plane Enable according to which pixel we want
-	   to modify.  The plane is determined by the two least
-	   significant bits of the x-coordinate: */
-	outp(0x3c4, 0x02);
-	outp(0x3c5, 0x01 << (x & 3));
-
-	/* The offset of the pixel into the video segment is
-	   offset = (width * y + x) / 4, and write the given
-	   color to the plane we selected above.  Heed the active
-	   page start selection. */
-	vga[(unsigned)(widthBytes * y) + (x / 4) + actStart] = color;
-
-	}
+		{
+		/* Each address accesses four neighboring pixels, so set
+		   Write Plane Enable according to which pixel we want
+		   to modify.  The plane is determined by the two least
+		   significant bits of the x-coordinate: */
+		outp(0x3c4, 0x02);
+		outp(0x3c5, 0x01 << (x & 3));
+
+		/* The offset of the pixel into the video segment is
+		   offset = (width * y + x) / 4, and write the given
+		   color to the plane we selected above.  Heed the active
+		   page start selection. */
+		vga[(unsigned)(widthBytes * y) + (x / 4) + actStart] = color;
+
+		}
 
 byte getPixel_X(int x, int y)
-	{
-	/* Select the plane from which we must read the pixel color: */
-	outpw(GRAC_ADDR, 0x04);
-	outpw(GRAC_ADDR+1, x & 3);
+		{
+		/* Select the plane from which we must read the pixel color: */
+		outpw(GRAC_ADDR, 0x04);
+		outpw(GRAC_ADDR+1, x & 3);
 
-	return vga[(unsigned)(widthBytes * y) + (x / 4) + actStart];
+		return vga[(unsigned)(widthBytes * y) + (x / 4) + actStart];
 
-	}
+		}
 
 void set320x240x256_X(void)
-	{
-	/* Set the unchained version of mode 13h: */
-	set320x200x256_X();
-
-	/* Modify the vertical sync polarity bits in the Misc. Output
-	   Register to achieve square aspect ratio: */
-	outp(0x3C2, 0xE3);
-
-	/* Modify the vertical timing registers to reflect the increased
-	   vertical resolution, and to center the image as good as
-	   possible: */
-	outpw(0x3D4, 0x2C11);		/* turn off write protect */
-	outpw(0x3D4, 0x0D06);		/* vertical total */
-	outpw(0x3D4, 0x3E07);		/* overflow register */
-	outpw(0x3D4, 0xEA10);		/* vertical retrace start */
-	outpw(0x3D4, 0xAC11);		/* vertical retrace end AND wr.prot */
-	outpw(0x3D4, 0xDF12);		/* vertical display enable end */
-	outpw(0x3D4, 0xE715);		/* start vertical blanking */
-	outpw(0x3D4, 0x0616);		/* end vertical blanking */
-
-	/* Update mode info, so future operations are aware of the
-	   resolution */
-	height = 240;
-
-	}
-
-
-/*tile*/
+		{
+		/* Set the unchained version of mode 13h: */
+		set320x200x256_X();
+
+		/* Modify the vertical sync polarity bits in the Misc. Output
+		   Register to achieve square aspect ratio: */
+		outp(0x3C2, 0xE3);
+
+		/* Modify the vertical timing registers to reflect the increased
+		   vertical resolution, and to center the image as good as
+		   possible: */
+		outpw(0x3D4, 0x2C11);		   /* turn off write protect */
+		outpw(0x3D4, 0x0D06);		   /* vertical total */
+		outpw(0x3D4, 0x3E07);		   /* overflow register */
+		outpw(0x3D4, 0xEA10);		   /* vertical retrace start */
+		outpw(0x3D4, 0xAC11);		   /* vertical retrace end AND wr.prot */
+		outpw(0x3D4, 0xDF12);		   /* vertical display enable end */
+		outpw(0x3D4, 0xE715);		   /* start vertical blanking */
+		outpw(0x3D4, 0x0616);		   /* end vertical blanking */
+
+		/* Update mode info, so future operations are aware of the
+		   resolution */
+		height = 240;
+
+		}
+
+
+/*tile*/
 // This is Bresenham's Line Drawing Algorithm
 void drawline(int x1, int y1, int x2, int y2, char col)
 {
-	int d, x, y, ax, ay, sx, sy, dx, dy;
-
-	dx = x2-x1;
-	ax = ABS(dx) << 1;
-	sx = SGN(dx);
-	dy = y2-y1;
-	ay = ABS(dy) << 1;
-	sy = SGN(dy);
-
-	x = x1;
-	y = y1;
-	if( ax > ay )
-	{
-		d = ay - (ax >> 1);
-		while( x != x2 )
+		int d, x, y, ax, ay, sx, sy, dx, dy;
+
+		dx = x2-x1;
+		ax = ABS(dx) << 1;
+		sx = SGN(dx);
+		dy = y2-y1;
+		ay = ABS(dy) << 1;
+		sy = SGN(dy);
+
+		x = x1;
+		y = y1;
+		if( ax > ay )
 		{
-			putPixel_X( x, y, col );
-			if( d >= 0 )
-			{
-				y += sy;
-				d -= ax;
-			}
-		x += sx;
-		d += ay;
+				d = ay - (ax >> 1);
+				while( x != x2 )
+				{
+						putPixel_X( x, y, col );
+						if( d >= 0 )
+						{
+								y += sy;
+								d -= ax;
+						}
+				x += sx;
+				d += ay;
+				}
 		}
-	}
-	else
-	{
-		d = ax - (ay >> 1);
-		while( y != y2 )
+		else
 		{
-			putPixel_X( x, y, col );
-			if( d >= 0 )
-			{
-				x += sx;
-				d -= ay;
-			}
-			y += sy;
-			d += ax;
+				d = ax - (ay >> 1);
+				while( y != y2 )
+				{
+						putPixel_X( x, y, col );
+						if( d >= 0 )
+						{
+								x += sx;
+								d -= ay;
+						}
+						y += sy;
+						d += ax;
+				}
 		}
-	}
-	return;
+		return;
 }
 
 void drawrect(int x1, int y1, int x2, int y2, char color)
-{
-	drawline(x1,y1,x2,y1,color);
+{
+	/*drawline(x1,y1,x2,y1,color);
 	drawline(x1,y2,x2,y2,color);
 	drawline(x1,y1,x1,y2,color);
-	drawline(x2,y1,x2,y2+1,color);
-}
+	drawline(x2,y1,x2,y2+1,color);*/
+	//_fmemset(vga+x1+y2, color, 16*16);
+	byte far *p;
+	
+	p=vga+y1*width+x1;  // make p point to the start of the line
+	while((y2-y1))			// repeat for entire line height
+		{
+		_fmemset(p, color, x2-x1);	// set one line
+		p+=width;		// move down one row
+		}
+}
 
 
 /*-----------XXXX-------------*/
@@ -312,252 +321,252 @@ void drawrect(int x1, int y1, int x2, int y2, char color)
 int far *
 getFont()
 {
-    union REGPACK rg;
-    int seg;
-    int off;
-    memset(&rg, 0, sizeof(rg));
-
-    rg.w.ax = 0x1130;
-    rg.h.bh = 0x03;
-    intr(0x10, &rg);
-    seg = rg.w.es;
-    off = rg.w.bp;
-    
-
-    return (int far *)MK_FP(seg, off);
+	union REGPACK rg;
+	int seg;
+	int off;
+	memset(&rg, 0, sizeof(rg));
+
+	rg.w.ax = 0x1130;
+	rg.h.bh = 0x03;
+	intr(0x10, &rg);
+	seg = rg.w.es;
+	off = rg.w.bp;
+	
+
+	return (int far *)MK_FP(seg, off);
 }
 
 void drawChar(int x, int y, int color, byte c)
 {
-	int i, j;
-	int mask;
-	int far *font = getFont() + (c * 8);
-
-	for (i = 0; i < 8; i++)
-	{
-		mask = *font;
-		for (j = 0; j < 8; j++)
+		int i, j;
+		int mask;
+		int far *font = getFont() + (c * 8);
+
+		for (i = 0; i < 8; i++)
 		{
-			if (mask & 0x80)
-			{
-				//pixel(x + j, y + i, color);
-				putPixel_X(x + j, y + i, color);
-			}
-			mask <<= 1;
+				mask = *font;
+				for (j = 0; j < 8; j++)
+				{
+						if (mask & 0x80)
+						{
+								//pixel(x + j, y + i, color);
+								putPixel_X(x + j, y + i, color);
+						}
+						mask <<= 1;
+				}
+				font++;
 		}
-		font++;
-	}
 }
 
 void drawText(int x, int y, int color, byte string)
 {
-	while (string)
-	{
-		drawChar(x, y, color, string);
-		x += 8;
-		string++;
-	}
+		while (string)
+		{
+				drawChar(x, y, color, string);
+				x += 8;
+				string++;
+		}
 }
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// setvideo() - This function Manages the video modes                      //
-//                                                                         //
+//																		 //
+// setvideo() - This function Manages the video modes					  //
+//																		 //
 /////////////////////////////////////////////////////////////////////////////
 void setvideo(/*byte mode, */int vq){
-	union REGS in, out;
-
-	if(!vq){ // deinit the video
-		// change to the video mode we were in before we switched to mode 13h
-		in.h.ah = 0x00;
-		in.h.al = old_mode;
-		int86(0x10, &in, &out);
-
-	}else if(vq == 1){ // init the video
-		// get old video mode
-		in.h.ah = 0xf;
-		int86(0x10, &in, &out);
-		old_mode = out.h.al;
-
-		// enter mode
-		set320x240x256_X();
-	}
+		union REGS in, out;
+
+		if(!vq){ // deinit the video
+				// change to the video mode we were in before we switched to mode 13h
+				in.h.ah = 0x00;
+				in.h.al = old_mode;
+				int86(0x10, &in, &out);
+
+		}else if(vq == 1){ // init the video
+				// get old video mode
+				in.h.ah = 0xf;
+				int86(0x10, &in, &out);
+				old_mode = out.h.al;
+
+				// enter mode
+				set320x240x256_X();
+		}
 }
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
+//																		 //
 // cls() - This clears the screen to the specified color, on the VGA or on //
-//         the Virtual screen.                                             //
-//                                                                         //
+//		 the Virtual screen.											 //
+//																		 //
 /////////////////////////////////////////////////////////////////////////////
 void cls(byte color, byte *Where){
-	_fmemset(Where, color, width*height);
+		_fmemset(Where, color, width*(height*17));
 }
 
 //color ‚Ä‚·‚Æ
 int colortest(){
-	if(gq < NUM_COLORS){
-		cls(gq, vga);
-		gq++;
-	}else gq = 0;
-	return gq;
+		if(gq < NUM_COLORS){
+				cls(gq, vga);
+				gq++;
+		}else gq = 0;
+		return gq;
 }
 
 //color ‚Ä‚·‚Æ
 int colorz(){
-	if(gq < HGQ){
-//----		cls(gq, vaddr);
-		cls(gq, vga);
-		gq++;
-	}else gq = LGQ;
-	return gq;
+		if(gq < HGQ){
+//----		  cls(gq, vaddr);
+				cls(gq, vga);
+				gq++;
+		}else gq = LGQ;
+		return gq;
 }
 
 //slow spectrum down
 void ssd(int svq){
-	if(sy < height+1){
-		if(sx < width+1){
-			//plotpixel(xx, yy, coor, vga);
-			//ppf(sx, sy, coor, vga);
-			putPixel_X(sx, sy, coor);
-			//printf("%d %d %d %d\n", sx, sy, svq, coor);
-			sx++;
-		}else sx = 0;
-		if(sx == width){
-			sy++;
-			if(svq == 7) coor++;
-			if(sy == height && svq == 8) coor = rand()%NUM_COLORS;
-		}
-	}else sy = 0;
+		if(sy < height+1){
+				if(sx < width+1){
+						//plotpixel(xx, yy, coor, vga);
+						//ppf(sx, sy, coor, vga);
+						putPixel_X(sx, sy, coor);
+						//printf("%d %d %d %d\n", sx, sy, svq, coor);
+						sx++;
+				}else sx = 0;
+				if(sx == width){
+						sy++;
+						if(svq == 7) coor++;
+						if(sy == height && svq == 8) coor = rand()%NUM_COLORS;
+				}
+		}else sy = 0;
 }
 
 /*-----------ding-------------*/
 int ding(int q){
-	setActivePage(0);
-	setVisiblePage(0);
-	int d3y;
-
-//++++	if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ;
-	if((q == 2
-	||q==4
-	||q==16
-	) && gq == BONK-1){
-			if(coor < HGQ && coor < LGQ) coor = LGQ;
-			if(coor < HGQ-1){
-				coor++;
-		}else{ coor = LGQ;
-			bakax = rand()%3; bakay = rand()%3;
+		setActivePage(0);
+		setVisiblePage(0);
+		int d3y;
+
+//++++  if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ;
+		if((q == 2
+		||q==4
+		||q==16
+		) && gq == BONK-1){
+						if(coor < HGQ && coor < LGQ) coor = LGQ;
+						if(coor < HGQ-1){
+								coor++;
+				}else{ coor = LGQ;
+						bakax = rand()%3; bakay = rand()%3;
+				}
 		}
-	}
-
-	if(q == 5){ colortest(); return gq; }
-	if(q == 10){ colorz(); return gq; }
-	if(q == 11){ colorz(); delay(100); return gq; }
-	if(q == 8){ ssd(q); /*printf("%d\n", coor);*/ }
-	if(q == 6){
-		coor = rand()%NUM_COLORS;
-//----		cls(coor, vaddr);
-		cls(coor, vga);
-		//updatevbuff();
-	}
-
-	if(q == 7 || q== 9){
-		if(gq < HGQ){
-			if(q == 7) ssd(q);
-			if(q == 9){ ssd(q); coor++; }
-			gq++;
-		}else gq = LGQ;
-	}
-	if((q<5 && gq<BONK) || (q==16 && gq<BONK)){ // the number variable make the colors more noticable
-		if(q==1){
-			if(xx==width){bakax=0;}
-			if(xx==0){bakax=1;}
-			if(yy==height){bakay=0;}
-			if(yy==0){bakay=1;}
-		}else if(q==3){
-			if(xx!=width||yy!=height){
-				if(xx==0){bakax=1;bakay=-1;d3y=1;}
-				if(yy==0){bakax=1;bakay=0;d3y=1;}
-				if(xx==width){bakax=-1;bakay=-1;d3y=1;}
-				if(yy==height){bakax=1;bakay=0;d3y=1;}
-			}else if(xx==width&&yy==height) xx=yy=0;
+
+		if(q == 5){ colortest(); return gq; }
+		if(q == 10){ colorz(); return gq; }
+		if(q == 11){ colorz(); delay(100); return gq; }
+		if(q == 8){ ssd(q); /*printf("%d\n", coor);*/ }
+		if(q == 6){
+				coor = rand()%NUM_COLORS;
+//----		  cls(coor, vaddr);
+				cls(coor, vga);
+				//updatevbuff();
 		}
-		if(q==3){
-			if(d3y){
-				if(bakay<0){
-					yy--;
-					d3y--;
-				}else
-				if(bakay>0){
-					yy++;
-					d3y--;
-				}
-			}
-			if(bakax<0){
-				xx--;
-			}else
-			if(bakax>0){
-				xx++;
-			}
-		}else{
-			if(q==16)
-			{
-				if(!bakax){
-					xx--;//=TILEWH;
-				}else if(bakax>0){
-					xx++;//=TILEWH;
-				}
-				if(!bakay){
-					yy--;//=TILEWH;
-				}else if(bakay>0){
-					yy++;//=TILEWH;
+
+		if(q == 7 || q== 9){
+				if(gq < HGQ){
+						if(q == 7) ssd(q);
+						if(q == 9){ ssd(q); coor++; }
+						gq++;
+				}else gq = LGQ;
+		}
+		if((q<5 && gq<BONK) || (q==16 && gq<BONK)){ // the number variable make the colors more noticable
+				if(q==1){
+						if(xx==width){bakax=0;}
+						if(xx==0){bakax=1;}
+						if(yy==height){bakay=0;}
+						if(yy==0){bakay=1;}
+				}else if(q==3){
+						if(xx!=width||yy!=height){
+								if(xx==0){bakax=1;bakay=-1;d3y=1;}
+								if(yy==0){bakax=1;bakay=0;d3y=1;}
+								if(xx==width){bakax=-1;bakay=-1;d3y=1;}
+								if(yy==height){bakax=1;bakay=0;d3y=1;}
+						}else if(xx==width&&yy==height) xx=yy=0;
 				}
-			}else{
-				if(!bakax){
-					xx-=TILEWH;
-				}else if(bakax>1){
-					xx+=TILEWH;
+				if(q==3){
+						if(d3y){
+								if(bakay<0){
+										yy--;
+										d3y--;
+								}else
+								if(bakay>0){
+										yy++;
+										d3y--;
+								}
+						}
+						if(bakax<0){
+								xx--;
+						}else
+						if(bakax>0){
+								xx++;
+						}
+				}else{
+						if(q==16)
+						{
+								if(!bakax){
+										xx--;//=TILEWH;
+								}else if(bakax>0){
+										xx++;//=TILEWH;
+								}
+								if(!bakay){
+										yy--;//=TILEWH;
+								}else if(bakay>0){
+										yy++;//=TILEWH;
+								}
+						}else{
+								if(!bakax){
+										xx-=TILEWH;
+								}else if(bakax>1){
+										xx+=TILEWH;
+								}
+								if(!bakay){
+										yy-=TILEWH;
+								}else if(bakay>1){
+										yy+=TILEWH;
+								}
+						}
 				}
-				if(!bakay){
-					yy-=TILEWH;
-				}else if(bakay>1){
-					yy+=TILEWH;
+				// fixer
+				if(q!=16){
+						if(xx<0) xx=width;
+						if(yy<0) yy=height;
+						if(xx>width) xx=0;
+						if(yy>height) yy=0;
 				}
-			}
-		}
-		// fixer
-		if(q!=16){
-			if(xx<0) xx=width;
-			if(yy<0) yy=height;
-			if(xx>width) xx=0;
-			if(yy>height) yy=0;
-		}
 
 //interesting effects
-		if(q==16)
-		{
-		int tx=0,ty=0;
-		tx+=xx+16;
-		ty+=yy+16;
-		putPixel_X(tx, ty, coor);
-		//drawrect(tx, ty, tx+TILEWH, ty+TILEWH, coor);
-		//printf("%d %d %d %d %d %d\n", xx, yy, tx, ty, TILEWH);
-
-		// plot the pixel
-//----		ppf(xx, yy, coor, vga);
-//++++0000		putPixel_X(xx, yy, coor);
-		}else drawrect(xx, yy, xx+TILEWH-1, yy+TILEWH-1, coor);
-//----		if(q==2) ppf(rand()%, rand()%height, 0, vga);
-		if(q==2||q==16) putPixel_X(rand()%width, rand()%height, 0);
-		if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }
-		gq++;
+				if(q==16)
+				{
+				int tx=0,ty=0;
+				tx+=xx+16;
+				ty+=yy+16;
+				putPixel_X(tx, ty, coor);
+				//drawrect(tx, ty, tx+TILEWH, ty+TILEWH, coor);
+				//printf("%d %d %d %d %d %d\n", xx, yy, tx, ty, TILEWH);
+
+				// plot the pixel
+//----		  ppf(xx, yy, coor, vga);
+//++++0000			  putPixel_X(xx, yy, coor);
+				}else drawrect(xx, yy, xx+TILEWH-1, yy+TILEWH-1, coor);
+//----		  if(q==2) ppf(rand()%, rand()%height, 0, vga);
+				if(q==2||q==16) putPixel_X(rand()%width, rand()%height, 0);
+				if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }
+				gq++;
 //if(xx<0||xx>320||yy<0||yy>240)
-//	printf("%d %d %d %d %d %d\n", xx, yy, coor, bakax, bakay, getPixel_X(xx,yy));
-//	printf("%d\n", getPixel_X(xx,yy));
+//	  printf("%d %d %d %d %d %d\n", xx, yy, coor, bakax, bakay, getPixel_X(xx,yy));
+//	  printf("%d\n", getPixel_X(xx,yy));
 //0000
-//	drawText(0, 0, 15, getPixel_X(xx,yy));
-	}else gq = LGQ;
-	return gq;
+//	  drawText(0, 0, 15, getPixel_X(xx,yy));
+		}else gq = LGQ;
+		return gq;
 }
 
 
@@ -572,103 +581,103 @@ int ding(int q){
 #include <conio.h>
 
 void doTest(void)
-	{
-	int p, x, y, pages;
-
-	/* This is the way to calculate the number of pages available. */
-	pages = 65536L/(widthBytes*height); // apparently this takes the A000 address
+		{
+		int p, x, y, pages;
 
-	printf("%d\n", pages);
+		/* This is the way to calculate the number of pages available. */
+		pages = 65536L/(widthBytes*height); // apparently this takes the A000 address
 
-	for (p = 0; p <= pages; ++p)
-		{
-		setActivePage(p);
+		printf("%d\n", pages);
 
-		/* On each page draw a single colored border, and dump the palette
-		   onto a small square about the middle of the page. */
-		   
-		   //{
-			for (x = 0; x <= width; ++x)
+		for (p = 0; p <= pages; ++p)
 				{
-				putPixel_X(x, 0, p+1);
-				if(p!=pages) putPixel_X(x, height-1, p+1);
-					else putPixel_X(x, 99-1, p+1);
-				}
+				setActivePage(p);
 
-			for (y = 0; y <= height; ++y)
-				{
-				putPixel_X(0, y, p+1);
-				if(p!=pages) putPixel_X(width-1, y, p+1);
-					else putPixel_X(width-1, y, p+1);
-				}
+				/* On each page draw a single colored border, and dump the palette
+				   onto a small square about the middle of the page. */
 
-			for (x = 0; x < 16; ++x)
-				for (y = 0; y < 16; ++y)
-					putPixel_X(x+(p+2)*16, y+(p+2)*16, x + y*16);
-			//}
+				   //{
+						for (x = 0; x <= width; ++x)
+								{
+								putPixel_X(x, 0, p+1);
+								if(p!=pages) putPixel_X(x, height-1, p+1);
+										else putPixel_X(x, 99-1, p+1);
+								}
 
-		drawText(0, 0, 15, p);
+						for (y = 0; y <= height; ++y)
+								{
+								putPixel_X(0, y, p+1);
+								if(p!=pages) putPixel_X(width-1, y, p+1);
+										else putPixel_X(width-1, y, p+1);
+								}
 
-		}
+						for (x = 0; x < 16; ++x)
+								for (y = 0; y < 16; ++y)
+										putPixel_X(x+(p+2)*16, y+(p+2)*16, x + y*16);
+						//}
 
-	/* Each pages will now contain a different image.  Let the user cycle
-	   through all the pages by pressing a key. */
-	for (p = 0; p <= pages; ++p)
-		{
-		setVisiblePage(p);
-		//drawText(0, 240, 15, "bakapi");
-		getch();
-		}
+				drawText(0, 0, 15, p);
 
-	}
+				}
+
+		/* Each pages will now contain a different image.  Let the user cycle
+		   through all the pages by pressing a key. */
+		for (p = 0; p <= pages; ++p)
+				{
+				setVisiblePage(p);
+				//drawText(0, 240, 15, "bakapi");
+				getch();
+				}
+
+		}
 
 /*
  * Library test (program) entry point.
  */
 
 int main(void)
-	{
-	int key,d;
-	// main variables
-	d=1; // switch variable
-	key=4; // default screensaver number
-//	puts("First, have a look at the 320x200 mode.  I will draw some rubbish");
-//	puts("on all of the four pages, then let you cycle through them by");
-//	puts("hitting a key on each page.");
-//	puts("Press a key when ready...");
-//	getch();
-
-//	doTest();
-
-//	puts("Then, check out Mode X, 320x240 with 3 (and a half) pages.");
-//	puts("Press a key when ready...");
-//	getch();
-
-	setvideo(1);
+		{
+		int key,d;
+		// main variables
+		d=1; // switch variable
+		key=4; // default screensaver number
+//	  puts("First, have a look at the 320x200 mode.  I will draw some rubbish");
+//	  puts("on all of the four pages, then let you cycle through them by");
+//	  puts("hitting a key on each page.");
+//	  puts("Press a key when ready...");
+//	  getch();
+
+//	  doTest();
+
+//	  puts("Then, check out Mode X, 320x240 with 3 (and a half) pages.");
+//	  puts("Press a key when ready...");
+//	  getch();
+
+		setvideo(1);
 // screen savers
 
 /*while(d!=0){ // on!
-		if(!kbhit()){ // conditions of screen saver
-			ding(key);
-		}else{
-			setvideo(0);
-			// user imput switch
-			printf("Enter 1, 2, 3, 4, or 6 to run a screensaver, or enter 5 to quit.\n", getch());  // prompt the user
-			scanf("%d", &key);
-			//if(key==3){xx=yy=0;} // crazy screen saver wwww
-			if(key==5) d=0;
-			setvideo(1);
+				if(!kbhit()){ // conditions of screen saver
+						ding(key);
+				}else{
+						setvideo(0);
+						// user imput switch
+						printf("Enter 1, 2, 3, 4, or 6 to run a screensaver, or enter 5 to quit.\n", getch());  // prompt the user
+						scanf("%d", &key);
+						//if(key==3){xx=yy=0;} // crazy screen saver wwww
+						if(key==5) d=0;
+						setvideo(1);
+				}
+		}*/ // else off
+		while(!kbhit()){ // conditions of screen saver
+				ding(4);
+		}
+		//end of screen savers
+		doTest();
+		setvideo(0);
+		puts("Where to next?  It's your move! wwww");
+		printf("bakapi ver. 1.04.09a\nis made by sparky4i†ƒÖ…j feel free to use it ^^\nLicence: GPL v2\n");
+		return 0;
 		}
-	}*/ // else off
-	while(!kbhit()){ // conditions of screen saver
-		ding(4);
-	}
-	//end of screen savers
-	doTest();
-	setvideo(0);
-	puts("Where to next?  It's your move! wwww");
-	printf("bakapi ver. 1.04.09a\nis made by sparky4i†ƒÖ…j feel free to use it ^^\nLicence: GPL v2\n");
-	return 0;
-	}
 
 #endif
diff --git a/16/dos_gfx.h b/16/dos_gfx.h
index b95f0159..1036e362 100644
--- a/16/dos_gfx.h
+++ b/16/dos_gfx.h
@@ -9,14 +9,14 @@
 //static hgq=NUM_COLORS/(1/8)
 #define BONK            400
 #define LGQ             32
-#define HGQ             56
-#define TILEWH				16
+#define HGQ             56
+#define TILEWH                          16
 #define ABS(a)   ((a < 0) ? -a : a)
 #define SGN(a)   ((a < 0) ? -1 : 1)
 //#define VMEM            0xA000 // = vga
 //int width = 320;
 //int height = 240;
-
+
 void drawChar(int x, int y, int color, byte c);
 void drawText(int x, int y, int color, byte string);
 void setvideo(/*byte mode, */int vq);
@@ -25,9 +25,9 @@ void setvideo(/*byte mode, */int vq);
 void cls(byte color, byte *Where);
 //void clearscr();
 //void plotpixel(int x, int y, byte color, byte *Where);
-//void plotpixelfast(int x, int y, byte color, byte *Where);
-void putPixel_X(int x, int y, byte color);
-void putTile(int x, int y, byte color);
+//void plotpixelfast(int x, int y, byte color, byte *Where);
+void putPixel_X(int x, int y, byte color);
+//void putTile(int x, int y, byte color);
 //void BlockMove();
 //void eraseplayer(int x, int y);
 //void drawplayer(int x, int y, int color);
-- 
2.39.5