X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=d13d7d01b30b272ff2e210b3d9d4e74679ed4271;hb=46a8c35140479f5957e35eeb8cd27da9b9da6630;hp=30032eefd1e096d8e032802359de8f30775f4519;hpb=4e89dfc14f40f8f7a7c1deab29b3e6b4730308d0;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
old mode 100644
new mode 100755
index 30032eef..d13d7d01
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -20,540 +20,315 @@
  *
  */
 
-#include "src/lib/dos_kb.h"
-#include "src/lib/mapread.h"
+#include "src/lib/scroll16.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
-#include "src/lib/planar.h"
-//====#include "src\lib\ems.c"
+
+//#define FADE
+#define MODEX	//this is for mode x initiating
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
-//optimize scroll*!!!!
-
-typedef struct {
-	map_t *map;
-	page_t *page;
-	int tx; //appears to be the top left tile position on the viewable screen map
-	int ty; //appears to be the top left tile position on the viewable screen map
-	word dxThresh; //????
-	word dyThresh; //????
-} map_view_t;
-
-typedef struct {
-	int x; //player exact position on the viewable map
-	int y; //player exact position on the viewable map
-	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
-	int triggerx; //player's trigger box tile position on the viewable map
-	int triggery; //player's trigger box tile position on the viewable map
-	int setx; //NOT USED YET! player sprite sheet set on the image x
-	int sety; //NOT USED YET! player sprite sheet set on the image y
-	word q; //loop variable
-	word d; //direction
-	bitmap_t data; //supposively the sprite sheet data
-	int hp; //hitpoints of the player
-} actor_t;
-
-typedef struct
-{
-	map_view_t *mv;
-} map_view_db_t;
-
-map_t allocMap(int w, int h);
-void initMap(map_t *map);
-void mapScrollRight(map_view_t *mv, byte offset, word id);
-void mapScrollLeft(map_view_t *mv, byte offest, word id);
-void mapScrollUp(map_view_t *mv, byte offset, word id);
-void mapScrollDown(map_view_t *mv, byte offset, word id);
-void mapGoTo(map_view_t *mv, int tx, int ty);
-void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void qclean();
-void pdump(map_view_t *pee);
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);
-
-#define TILEWH 16
-#define QUADWH			TILEWH/2
-#define SPEED 4
-//#define LOOPMAX (TILEWH/SPEED)
-
-//place holder definitions
-//#define MAPX 200
-//#define MAPY 150
-//#define TRIGGX 10
-//#define TRIGGY 9
-
-void main() {
-//++++	size_t oldfreemem=GetFreeSize();
-	/*long emmhandle;
-	long emsavail;
-	char teststr[80];*/
-	word panswitch=0, panq=1, pand=0, panpagenum=0; //for panning!
-	int i;
-	static word paloffset=0;
-	bitmap_t ptmp;//, npctmp; // player sprite
-	planar_buf_t *p;
+global_game_variables_t gvar;
+static map_t map;
+player_t player[MaxPlayers];
+//page_t screen, gvar.video.page[1], gvar.video.page[2];
+map_view_t mv[3];
+bitmap_t p;
+word pn=0;
+static planar_buf_t huge *pp;
+float t;
+sword bakapee;
+
+//	word panswitch=0, panq=1, pand=0;
+	word panpagenum=0; //for panning!
+	unsigned int i;
 	const char *cpus;
-	static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
-	page_t screen, screen2, screen3;
-	map_t map;
-	map_view_t mv[3];//mv, mv2, mv3;
-	map_view_t *bg, *spri, *mask;//, *tmp;
+	//static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+
 	//map_view_db_t pgid[4];
-	byte *dpal, *gpal;
+	word pg;
+//#ifdef FADE
+	static word paloffset=0;
+	byte *dpal, *default_pal;
+//#endif
+	byte *gpal;
 	byte *ptr;
 	byte *mappalptr;
-	actor_t player;
-	//actor_t npc0;
 
-//	atexit(qclean());
-	/*if(!emmtest())
-	{
-		printf("Expanded memory is not present\n");
-		exit(0);
-	}
+void main(int argc, char *argv[])
+{
+	byte *mesg=malloc(sizeof(dword));
 
-	if(!emmok())
-	{
-		printf("Expanded memory manager is not present\n");
-		exit(0);
-	}
+	if(argv[1]) bakapee = atoi(argv[1]);
+	else bakapee = 1;
 
-	emsavail = emmavail();
-	if(emsavail == -1)
-	{
-		printf("Expanded memory manager error\n");
-		exit(0);
+	// DOSLIB: check our environment
+	probe_dos();
+
+	// DOSLIB: what CPU are we using?
+	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
+	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
+	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+	//      the CPU to carry out tasks. --J.C.
+	cpu_probe();
+
+	// DOSLIB: check for VGA
+	if (!probe_vga()) {
+		printf("VGA probe failed\n");
+		return;
+	}
+	// hardware must be VGA or higher!
+	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
+		printf("This program requires VGA or higher graphics hardware\n");
+		return;
 	}
-	printf("There are %ld pages available\n",emsavail);
 
-	if((emmhandle = emmalloc(emsavail)) < 0)
-	{
-		printf("Insufficient pages available\n");
-		exit(0);
-	}*/
+	player[0].persist_aniframe=0;
+	player[0].speed=4;
+	//player[0].data = &pp;
+
+	printf("starting timer	");
+	start_timer(&gvar);
+	printf("ok\n");
+
+//	atexit(qclean());
 
 	/* create the map */
-//0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-//0000	fprintf(stderr, "testing~\n");
+	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
-//0000	fprintf(stderr, "yay map loaded~~\n");
-//----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
-	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
-//----	initMap(&map);
+	chkmap(&map, 0);
+	printf("chkmap ok	");
+	fprintf(stderr, "yay map loaded~~\n");
 	mv[0].map = &map;
 	mv[1].map = &map;
 	mv[2].map = &map;
 
 	/* draw the tiles */
+#ifdef MODEX
 	ptr = map.data;
-	mappalptr = map.tiles->data->palette;
+	//mappalptr = map.tiles->btdata->palette;
+
 	/* data */
-//0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
-	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+	//++++p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
-//0000	printf("Total used @ before planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
-	p = planar_buf_from_bitmap(&ptmp);
-//0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
+////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
+	/*++++printf("load pee!!	");
+	pp = planar_buf_from_bitmap(&p);
+	printf("done!\n");*/
 
-	/*if(isEMS())
-	{
-		XMOVE mm;
-		mm.length=sizeof(map);
-		mm.sourceH=0;
-		mm.sourceOff=(long)&map;
-		mm.destH=emmhandle;
-		mm.destOff=1;
-		//halp!
-		ist = move_emem(&mm);
-		printf("%d\n", coretotalEMS());
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		//printf("%d\n", emmhandle);
-	}
-
-	if(isEMS())
-	{
-		XMOVE mm;
-		mm.length=emmhandle;
-		mm.sourceH=0;
-		mm.sourceOff=(long)&ptmp;
-		mm.destH=emmhandle;
-		mm.destOff=0;
-		//halp!
-		ist = move_emem(&mm);
-		printf("%d\n", coretotalEMS());
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		//printf("%d\n", emmhandle);
-	}
-*/
+#endif
+	/*	input!	*/
+	IN_Startup();
+	IN_Default(0,&player,ctrl_Joystick);
 
 	/* save the palette */
+#ifdef MODEX
+#ifdef FADE
 	dpal = modexNewPal();
+	default_pal = modexNewPal();
+	*default_pal = *dpal;
 	modexPalSave(dpal);
 	modexFadeOff(4, dpal);
+#endif
 
-	setkb(1);
-	modexEnter();
+	textInit();
+	VGAmodeX(bakapee, 1, &gvar);
+//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+#ifdef FADE
 	modexPalBlack();	//reset the palette~
+#endif
+#endif
 //	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
-	ptmp.offset=(paloffset/3);
-	modexPalUpdate(&ptmp, &paloffset, 0, 0);
-	//printf("	%d\n", sizeof(ptmp.data));
+//++++	player[0].data.offset=(paloffset/3);
+//++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
+		//modexPalUpdate1(p.palette);
+//++++0000		modexPalUpdate1(map.tiles->btdata->palette);
+	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
-	map.tiles->data->offset=(paloffset/3);
+//++++	map.tiles->data->offset=(paloffset/3);
 	//XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0);
-	printf("\n====\n");
-	printf("0	paloffset=	%d\n", paloffset/3);
-	printf("====\n\n");
+//	printf("\n====\n");
+//	printf("0	paloffset=	%d\n", paloffset/3);
+//	printf("====\n\n");
+#ifdef MODEX
+#ifdef FADE
 	gpal = modexNewPal();
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
 	modexPalBlack();	//so player will not see loadings~
+#endif
+#endif
 
 	/* setup camera and screen~ */
-	screen = modexDefaultPage();
-	screen.width += (TILEWH*2);
-	screen.height += (TILEWH*2);//+QUADWH;
-	mv[0].page = &screen;
-	screen2 = modexNextPage(mv[0].page);
-	mv[1].page = &screen2;
-	screen3 = modexNextPage0(mv[1].page, 320, 240);	//(352*176)+1024 is the remaining amount of memory left wwww
-	//screen3 = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
-	mv[2].page = &screen3;
+	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
+	gvar.video.page[0].width += (TILEWH*2);
+	gvar.video.page[0].height += (TILEWH*2);
+	mv[0].page = &gvar.video.page[0];
+	gvar.video.page[1] = modexNextPage(mv[0].page);
+	mv[1].page = &gvar.video.page[1];
 
-	/* set up paging */
-	bg = &mv[0];
-	spri = &mv[1];
-	mask = &mv[2];
+	gvar.video.page[2] = modexNextPageFlexibleSize(mv[1].page, gvar.video.page[0].sw, gvar.video.page[0].sh);	//(352*176)+1024 is the remaining amount of memory left wwww
+	//gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
+	mv[2].page = &gvar.video.page[2];
 
+	/* set up paging */
 //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(bg, 0, 0);
-	mapGoTo(spri, 0, 0);
+	mapGoTo(&mv[0], 0, 0);
+	mapGoTo(&mv[1], 0, 0);
 	//mapGoTo(mask, 0, 0);
-
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
-	player.tx = bg->tx + 10;
-	player.ty = bg->ty + 8;
-	player.x = player.tx*TILEWH;
-	player.y = player.ty*TILEWH;
-	player.triggerx = player.tx;
-	player.triggery = player.ty+1;
-	player.q=1;
-	player.d=0;
-	player.hp=4;
-	//npc
-	/*npc0.tx = bg->tx + 1;
-	npc0.ty = bg->ty + 1;
-	npc0.x = npc0.tx*TILEWH;
-	npc0.y = npc0.ty*TILEWH;
-	npc0.triggerx = npc0.tx;
-	npc0.triggery = npc0.ty+1;
-	npc0.q=1;
-	npc0.d=0;
-	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
-	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-
-	modexShowPage(spri->page);
-//	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
-	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
+	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
+	IN_initplayer(&player, 0);
+
+	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
+#ifndef	SPRITE
+	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
+#else
+	//PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
+	PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
+#endif
+
+	modexShowPage(mv[1].page);
+	shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
+	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+#ifdef MODEX
+#ifdef FADE
 	modexFadeOn(4, gpal);
-	while(!keyp(1) && player.hp>0)
+#endif
+#endif
+	while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
 	{
+		shinku(&gvar);
+		IN_ReadControl(0,&player);
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
-	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
-	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+	//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 	//player movement
-	//TODO: make movement into a function!
-	if(!panswitch){
-	//right movement
-	if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)
-	{
-		if(player.d == 0){ player.d = 2; }
-		if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollRight(mv, SPEED, 0);
-				mapScrollRight(mv, SPEED, 1);
-				//mapScrollRight(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx++; }
-		}
-		else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.x+=SPEED;
-				//animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx+1;
-		player.triggery = player.ty;
-	}
-
-	//left movement
-	if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)
-	{
-		if(player.d == 0){ player.d = 4; }
-		if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollLeft(mv, SPEED, 0);
-				mapScrollLeft(mv, SPEED, 1);
-				//mapScrollLeft(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx--; }
-		}
-		else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.x-=SPEED;
-				//animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx-1;
-		player.triggery = player.ty;
-	}
-
-	//down movement
-	if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)
-	{
-		if(player.d == 0){ player.d = 3; }
-		if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollDown(mv, SPEED, 0);
-				mapScrollDown(mv, SPEED, 1);
-				//mapScrollDown(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty++; }
-		}
-		else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.y+=SPEED;
-				//animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx;
-		player.triggery = player.ty+1;
-	}
-
-	//up movement
-	if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)
-	{
-		if(player.d == 0){ player.d = 1; }
-		if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollUp(mv, SPEED, 0);
-				mapScrollUp(mv, SPEED, 1);
-				//mapScrollUp(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty--; }
-		}
-		else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.y-=SPEED;
-				//animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				modexShowPage(spri->page);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx;
-		player.triggery = player.ty-1;
-	}
-}else{
+	//if(!panswitch){
+		walk(mv, player, 0);
+	/*}else{
 //88 switch!
 	//right movement
-	if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)
+	if((IN_KeyDown(77) && !IN_KeyDown(75) && pand == 0) || pand == 2)
 	{
 		if(pand == 0){ pand = 2; }
-			if(panq<=(TILEWH/SPEED))
+			if(panq<=(TILEWH/(player[0].speed)))
 			{
 				switch(panpagenum)
 				{
 					case 0:
 						//bg
-						bg->page->dx++;
-						modexShowPage(bg->page);
+						mv[0].page->dx++;
+						modexShowPage(mv[0].page);
 					break;
 					case 1:
 						//spri
-						spri->page->dx++;
-						modexShowPage(spri->page);
+						mv[1].page->dx++;
+						modexShowPage(mv[1].page);
 					break;
 					case 2:
 						//fg
-						mask->page->dx++;
-						modexShowPage(mask->page);
+						mv[2].page->dx++;
+						modexShowPage(mv[2].page);
 					break;
 				}
 				panq++;
 			} else { panq = 1; pand = 0; }
 	}
 	//left movement
-	if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)
+	if((IN_KeyDown(75) && !IN_KeyDown(77) && pand == 0) || pand == 4)
 	{
 		if(pand == 0){ pand = 4; }
-			if(panq<=(TILEWH/SPEED))
+			if(panq<=(TILEWH/(player[0].speed)))
 			{
 				switch(panpagenum)
 				{
 					case 0:
 						//bg
-						bg->page->dx--;
-						modexShowPage(bg->page);
+						mv[0].page->dx--;
+						modexShowPage(mv[0].page);
 					break;
 					case 1:
 						//spri
-						spri->page->dx--;
-						modexShowPage(spri->page);
+						mv[1].page->dx--;
+						modexShowPage(mv[1].page);
 					break;
 					case 2:
 						//fg
-						mask->page->dx--;
-						modexShowPage(mask->page);
+						mv[2].page->dx--;
+						modexShowPage(mv[2].page);
 					break;
 				}
 				panq++;
 			} else { panq = 1; pand = 0; }
 	}
 	//down movement
-	if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)
+	if((IN_KeyDown(72) && !IN_KeyDown(80) && pand == 0) || pand == 3)
 	{
 		if(pand == 0){ pand = 3; }
-			if(panq<=(TILEWH/SPEED))
+			if(panq<=(TILEWH/(player[0].speed)))
 			{
 				switch(panpagenum)
 				{
 					case 0:
 						//bg
-						bg->page->dy--;
-						modexShowPage(bg->page);
+						mv[0].page->dy--;
+						modexShowPage(mv[0].page);
 					break;
 					case 1:
 						//spri
-						spri->page->dy--;
-						modexShowPage(spri->page);
+						mv[1].page->dy--;
+						modexShowPage(mv[1].page);
 					break;
 					case 2:
 						//fg
-						mask->page->dy--;
-						modexShowPage(mask->page);
+						mv[2].page->dy--;
+						modexShowPage(mv[2].page);
 					break;
 				}
 				panq++;
 			} else { panq = 1; pand = 0; }
 	}
 	//up movement
-	if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)
+	if((IN_KeyDown(80) && !IN_KeyDown(72) && pand == 0) || pand == 1)
 	{
 		if(pand == 0){ pand = 1; }
-			if(panq<=(TILEWH/SPEED))
+			if(panq<=(TILEWH/(player[0].speed)))
 			{
 				switch(panpagenum)
 				{
 					case 0:
 						//bg
-						bg->page->dy++;
-						modexShowPage(bg->page);
+						mv[0].page->dy++;
+						modexShowPage(mv[0].page);
 					break;
 					case 1:
 						//spri
-						spri->page->dy++;
-						modexShowPage(spri->page);
+						mv[1].page->dy++;
+						modexShowPage(mv[1].page);
 					break;
 					case 2:
 						//fg
-						mask->page->dy++;
-						modexShowPage(mask->page);
+						mv[2].page->dy++;
+						modexShowPage(mv[2].page);
 					break;
 				}
 				panq++;
 			} else { panq = 1; pand = 0; }
 	}
-}
+}*/
+
 
 	//the scripting stuf....
 
-	//if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
-	if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
+	if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -562,69 +337,103 @@ void main() {
 		}
 		nosound();
 	}
-	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
+	if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
 	//debugging binds!
-	//if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
-	if(keyp(2)){ modexShowPage(bg->page); panpagenum=0; }
-	if(keyp(3)){ modexShowPage(spri->page); panpagenum=1; }
-	if(keyp(4)){ modexShowPage(mask->page); panpagenum=2; }
-	if(keyp(25)){ pdump(bg); pdump(spri); }	//p
-	if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }
-	if(keyp(22)){
-	paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
+	//if(IN_KeyDown(0x0E)) while(1){ if(xmsmalloc(24)) break; }
+	if(IN_KeyDown(2)){ modexShowPage(mv[0].page); panpagenum=0; }
+	if(IN_KeyDown(3)){ modexShowPage(mv[1].page); panpagenum=1; }
+	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); panpagenum=2; }
+	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page); }	//p
+#ifdef MODEX
+#ifdef FADE
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
+	if(IN_KeyDown(22)){
+	paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
-	 pdump(bg); pdump(spri); }
+	 modexpdump(mv[0].page); modexpdump(mv[1].page); }
+#endif
+#endif
 	//pan switch
-	if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }	//f12
+	//if(IN_KeyDown(88)){if(!panswitch) panswitch++; else panswitch--; }	//f12
 	//TSR
-	if(keyp(87))	//f11
+	if(IN_KeyDown(87))	//f11
 	{
-		modexLeave();
-		setkb(0);
+		VGAmodeX(0, 0, &gvar);
+		IN_Shutdown();
 		__asm
 		{
 			mov ah,31h
 			int 21h
 		}
 	}
+	if(IN_KeyDown(88))	//s
+	{
+		switch(gvar.kurokku.fpscap)
+		{
+			case 0:
+				gvar.kurokku.fpscap=1;
+			break;
+			case 1:
+				gvar.kurokku.fpscap=0;
+			break;
+		}
+		IN_Ack();
+	}
+	//TODO fmemtest into page
+	if(IN_KeyDown(4+1))	//4
+	{
+		pg=1;
+		SELECT_ALL_PLANES();
+		_fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
+	}
 
-	if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break;	//incase things go out of sync!
-
+	//9
+	if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
+	//if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
+	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
+#ifdef MODEX
+#ifdef FADE
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
-	modexLeave();
-	setkb(0);
-	printf("Project 16 scroll.exe\n");
-	printf("tx: %d\n", bg->tx);
-	printf("ty: %d\n", bg->ty);
-	printf("player.x: %d", player.x); printf("		player.y: %d\n", player.y);
-	//if(player.hp==0) printf("%d wwww\n", player.y+8);
-	//else printf("\nplayer.y: %d\n", player.y);
-	printf("player.tx: %d", player.tx); printf("		player.ty: %d\n", player.ty);
-	printf("player.triggx: %d", player.triggerx); printf("	player.triggy: %d\n", player.triggery);
-	printf("player.hp: %d", player.hp);	printf("	player.q: %d", player.q);	printf("	player.d: %d\n", player.d);
-	printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);
-	printf("palette offset:	%d\n", paloffset/3);
+#endif
+	VGAmodeX(0, 1, &gvar);
+#endif
+	IN_Shutdown();
+	printf("Project 16 scroll.exe. This is just a test file!\n");
+	printf("version %s\n", VERSION);
+	printf("tx: %d\n", mv[0].tx);
+	printf("ty: %d\n", mv[0].ty);
+	printf("player[0].x: %d", player[0].x); printf("		player[0].y: %d\n", player[0].y);
+	//if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
+	//else printf("\nplayer[0].y: %d\n", player[0].y);
+	printf("player[0].tx: %d", player[0].tx); printf("		player[0].ty: %d\n", player[0].ty);
+	printf("player[0].triggx: %d", player[0].triggerx); printf("	player[0].triggy: %d\n", player[0].triggery);
+	printf("player[0].hp: %d", (player[0].hp));	printf("	player[0].q: %d", player[0].q);	printf("	player[0].info.dir: %d", player[0].info.dir);	printf("	player[0].d: %d\n", player[0].d);
+		printf("pdir=%d\n", player[0].pdir);
+	printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
+//	printf("palette offset:	%d\n", paloffset/3);
 //++++	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
 //++++	printf("Total free: %zu\n", GetFreeSize());
-	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
-	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
-	printf("Screen2: %dx", screen2.width);	printf("%d\n", screen2.height);
-	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
-	//xmsfree(&map);
-	//xmsfree(bg);
-	//xmsfree(spri);
-	//xmsfree(mask);
-	//xmsreport();
-	//emmclose(emmhandle);
+//not used now	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
+//not used now	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
+	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d\n", gvar.video.page[0].height);
+	printf("Screen: %dx", gvar.video.page[0].sw);	printf("%d\n", gvar.video.page[0].sh);
+	printf("tile resolution: %dx", gvar.video.page[0].tilesh);	printf("%d\n", gvar.video.page[0].tilesh);
+	printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
+//	printf("Screen2: %dx", gvar.video.page[1].width);	printf("%d\n", gvar.video.page[1].height);
+//	printf("map: %dx%d\n", map.width, map.height);
+//	printf("\n");
+//	printf("player[0].info.x: %d", player[0].info.xaxis); printf("		player[0].info.y: %d\n", player[0].info.yaxis);
+//	printf("player[0].info.tx: %d", player[0].info.x); printf("		player[0].info.ty: %d\n", player[0].info.y);
+	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
+
 	switch(detectcpu())
 	{
 		case 0: cpus = "8086/8088 or 186/88"; break;
@@ -633,345 +442,9 @@ void main() {
 		default: cpus = "internal error"; break;
 	}
 	printf("detected CPU type: %s\n", cpus);
+#ifdef MODEX
+#ifdef FADE
 	modexFadeOn(4, dpal);
-}
-
-
-map_t
-allocMap(int w, int h) {
-	map_t result;
-
-	result.width =w;
-	result.height=h;
-	result.data = malloc(sizeof(byte) * w * h);
-	//result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);
-	/*if(isEMS() || checkEMS())
-	{
-		XMOVE mm;
-		//emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
-		mm.length=sizeof(result);
-		mm.sourceH=0;
-		mm.sourceOff=ptr2long(&result);
-		mm.destH=emmhandle;
-		mm.destOff=0;
-		ist = move_emem(&mm);
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		printf("%d\n", coretotalEMS());
-	}*/
-
-	return result;
-}
-
-void
-initMap(map_t *map) {
-	/* just a place holder to fill out an alternating pattern */
-	int x, y, xx, yy;
-	int i, q;
-//	int tile = 1;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles = malloc(sizeof(tiles_t));
-	//else
-	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
-
-	/* create the tile set */
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data = malloc(sizeof(bitmap_t));
-	//else
-	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
-//	map->tiles->data->width = (TILEWH/**2*/);
-//	map->tiles->data->height= TILEWH;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
-	//else
-	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
-//	map->tiles->tileHeight = TILEWH;
-//	map->tiles->tileWidth =TILEWH;
-//	map->tiles->rows = 1;
-//	map->tiles->cols = 1;//2;
-
-	/*q=0;
-	//for(y=0; y<map->height; y++) {
-	//for(x=0; x<map->width; x++) {
-	i=0;
-	for(yy=0; yy<TILEWH; yy++) {
-	for(xx=0; xx<(TILEWH); xx++) {
-		//if(x<TILEWH){
-		  map->tiles->data->data[i+1] = map->data[q];//28;//0x24;
-//		  printf("[%d]", map->tiles->data->data[i]);
-		//}else{
-		  //map->tiles->data->data[i] = map->data[q];//0;//0x34;
-		  //printf("]%d[==[%d]", i, map->tiles->data->data[i]);
-		//}
-		i++;
-	}
-//	printf("\n");
-	}
-//	printf("[%d]", map->data[q]);
-	q++;
-//	}
-	//printf("\n\n");
-//	}*/
-
-	/*i=0;
-	for(y=0; y<map->height; y++) {
-		for(x=0; x<map->width; x++) {
-//			map->data[i]=255;
-			printf("[%d]", map->data[i]);
-			//tile = tile ? 0 : 1;
-			i++;
-		}
-		//tile = tile ? 0 : 1;
-	}*/
-}
-
-
-void
-mapScrollRight(map_view_t *mv, byte offset, word id)
-{
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv[id].page->dx += offset;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dx >= mv[id].dxThresh ) {
-	/* go forward one tile */
-	mv[id].tx++;
-	/* Snap the origin forward */
-	mv[id].page->data += 4;
-	mv[id].page->dx = mv[id].map->tiles->tileWidth;
-
-	/* draw the next column */
-	x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth;
-		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x);
-		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
-	}
-}
-
-
-void
-mapScrollLeft(map_view_t *mv, byte offset, word id)
-{
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv[id].page->dx -= offset;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dx == 0) {
-	/* go backward one tile */
-	mv[id].tx--;
-
-	/* Snap the origin backward */
-	mv[id].page->data -= 4;
-	mv[id].page->dx = mv[id].map->tiles->tileWidth;
-
-	/* draw the next column */
-	x= 0;
-		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx-1, mv[0].ty-1, 0);
-		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
-	}
-}
-
-
-void
-mapScrollUp(map_view_t *mv, byte offset, word id)
-{
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv[id].page->dy -= offset;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dy == 0 ) {
-	/* go down one tile */
-	mv[id].ty--;
-	/* Snap the origin downward */
-	mv[id].page->data -= mv[id].page->width*4;
-	mv[id].page->dy = mv[id].map->tiles->tileHeight;
-
-	/* draw the next row */
-	y= 0;
-		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty-1, 0);
-		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
-	}
-}
-
-
-void
-mapScrollDown(map_view_t *mv, byte offset, word id)
-{
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv[id].page->dy += offset;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dy >= mv[id].dyThresh ) {
-	/* go down one tile */
-	mv[id].ty++;
-	/* Snap the origin downward */
-	mv[id].page->data += mv[id].page->width*4;
-	mv[id].page->dy = mv[id].map->tiles->tileHeight;
-
-	/* draw the next row */
-	y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight;
-		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty+15, y);
-		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
-	}
-}
-
-
-void
-mapGoTo(map_view_t *mv, int tx, int ty) {
-	int px, py;
-	unsigned int i;
-
-	/* set up the coordinates */
-	mv->tx = tx;
-	mv->ty = ty;
-	mv->page->dx = mv->map->tiles->tileWidth;
-	mv->page->dy = mv->map->tiles->tileHeight;
-
-	/* set up the thresholds */
-	mv->dxThresh = mv->map->tiles->tileWidth * 2;
-	mv->dyThresh = mv->map->tiles->tileHeight * 2;
-
-	/* draw the tiles */
-	modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
-	py=0;
-	i=mv->ty * mv->map->width + mv->tx;
-	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
-		mapDrawRow(mv, tx-1, ty, py);
-	i+=mv->map->width - tx;
-	}
-}
-
-
-void
-mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
-	word rx;
-	word ry;
-	//if(i==0) i=2;
-	if(i==0)
-	{
-		//wwww
-		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
-	}
-	else
-	{
-	rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
-	ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
-////0000	printf("i=%d\n", i);
-	//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);
-	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
-	}
-}
-
-
-void
-mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
-	word x;
-	int i;
-
-	/* the position within the map array */
-	i=ty * mv->map->width + tx;
-	for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
-	if(i>=0) {
-		/* we are in the map, so copy! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i++; /* next! */
-	}
-}
-
-void
-mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
-	int y;
-	int i;
-
-	/* location in the map array */
-	i=ty * mv->map->width + tx;
-
-	/* We'll copy all of the columns in the screen,
-	   i + 1 row above and one below */
-	for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
-	if(i>=0) {
-		/* we are in the map, so copy away! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i += mv->map->width;
-	}
-}
-
-void qclean()
-{
-	modexLeave();
-	setkb(0);
-}
-
-void pdump(map_view_t *pee)
-{
-	int mult=(QUADWH);
-	int palq=(mult)*TILEWH;
-	int palcol=0;
-	int palx, paly;
-	for(paly=0; paly<palq; paly+=mult){
-		for(palx=0; palx<palq; palx+=mult){
-				modexClearRegion(pee->page, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
-			palcol++;
-		}
-	}
-}
-
-void
-animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)
-{
-	sword dire=32*d; //direction
-	sword qq; //scroll offset
-
-	if(scrolloffsetswitch==0) qq = 0;
-	else qq = ((lp)*SPEED);
-	switch (d)
-	{
-		case 0:
-			//up
-			x=x-4;
-			y=y-qq-TILEWH;
-		break;
-		case 1:
-			// right
-			x=x+qq-4;
-			y=y-TILEWH;
-		break;
-		case 2:
-			//down
-			x=x-4;
-			y=y+qq-TILEWH;
-		break;
-		case 3:
-			//left
-			x=x-qq-4;
-			y=y-TILEWH;
-		break;
-	}
-	modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
-	if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
-	if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
-	if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
-	if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
-	//TODO: mask copy //modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
-	//modexClearRegion(top->page, 66, 66, 2, 40, 0);
-	//modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);
-	//turn this off if XT
-	//XTif(detectcpu() > 0)
-	modexWaitBorder();
+#endif
+#endif
 }