X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=39a9d614c7001c393f373107349529883374db03;hb=9c4ac95a4b988defb3dd98eac76b38fbf7baa762;hp=eb60019526cd06876b0f75fce37269891a5efd18;hpb=1170e45860266537729a5a54eaafdf50511f5315;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index eb600195..39a9d614 100755
--- 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.
  *
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -36,6 +36,8 @@ player_t player[MaxPlayers];
 map_view_t mv[3];
 map_view_t *bg, *spri, *mask;//, *tmp;
 bitmap_t p;
+word pn=0;
+static planar_buf_t huge *pp;
 float t;
 sword bakapee;
 
@@ -57,28 +59,47 @@ sword bakapee;
 
 void main(int argc, char *argv[])
 {
-
 	byte *mesg=malloc(sizeof(dword));
 
-
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
+	// 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;
+	}
+
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
+	//player[0].data = &pp;
 
-	printf("starting timer\n");
+	printf("starting timer	");
 	start_timer(&gvar);
 	printf("ok\n");
-	//extern struct inconfig inpu;
 
 //	atexit(qclean());
 
 	/* create the map */
-	fprintf(stderr, "testing map load~\n");
+	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
 	chkmap(&map, 0);
-	printf("chkmap ok\n");
+	printf("chkmap ok	");
 	fprintf(stderr, "yay map loaded~~\n");
 	mv[0].map = ↦
 	mv[1].map = ↦
@@ -87,14 +108,17 @@ void main(int argc, char *argv[])
 	/* draw the tiles */
 #ifdef MODEX
 	ptr = map.data;
-	mappalptr = map.tiles->btdata->palette;
+	//mappalptr = map.tiles->btdata->palette;
 
 	/* data */
-	p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+	//++++p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
 ////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
+	/*++++printf("load pee!!	");
+	pp = planar_buf_from_bitmap(&p);
+	printf("done!\n");*/
 
 #endif
 	/*	input!	*/
@@ -112,7 +136,7 @@ void main(int argc, char *argv[])
 #endif
 
 	textInit();
-	VGAmodeX(bakapee, &gvar);
+	VGAmodeX(bakapee, 1, &gvar);
 //	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
@@ -121,7 +145,8 @@ void main(int argc, char *argv[])
 //	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
 //++++	player[0].data.offset=(paloffset/3);
 //++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-		modexPalUpdate1(p.palette);
+		//modexPalUpdate1(p.palette);
+		modexPalUpdate1(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
 //++++	map.tiles->data->offset=(paloffset/3);
@@ -164,18 +189,7 @@ void main(int argc, char *argv[])
 	//default player position on the viewable map
 	player[0].tx = bg->tx + bg->page->tilemidposscreenx;
 	player[0].ty = bg->ty + bg->page->tilemidposscreeny;
-	player[0].x = player[0].tx*TILEWH;
-	player[0].y = player[0].ty*TILEWH;
-	player[0].triggerx = player[0].tx;
-	player[0].triggery = player[0].ty+1;
-/*	player[0].info.x = player[0].tx;
-	player[0].info.xaxis = player[0].tx*TILEWH;
-	player[0].info.y = player[0].ty;
-	player[0].info.yaxis = player[0].ty*TILEWH;*/
-	player[0].q=1;
-	player[0].d=2;
-	player[0].hp=4;
-//	player[0].persist_aniframe=0;
+	IN_initplayer(&player, 0);
 	//npc
 	/*npc0.tx = bg->tx + 1;
 	npc0.ty = bg->ty + 1;
@@ -186,14 +200,15 @@ void main(int argc, char *argv[])
 	npc0.q=1;
 	npc0.d=0;
 	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
-IN_Ack();
+
 	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(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
+	//PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
+	PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
 #endif
-IN_Ack();
+
 	modexShowPage(spri->page);
 	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
@@ -343,16 +358,16 @@ IN_Ack();
 	if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
 	if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
 	if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }
-	if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); }	//p
+	if(IN_KeyDown(25)){ modexpdump(bg->page); modexpdump(spri->page); }	//p
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); }
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(bg->page); modexpdump(spri->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->page); pdump(spri->page); }
+	 modexpdump(bg->page); modexpdump(spri->page); }
 #endif
 #endif
 	//pan switch
@@ -360,7 +375,7 @@ IN_Ack();
 	//TSR
 	if(IN_KeyDown(87))	//f11
 	{
-		VGAmodeX(0, &gvar);
+		VGAmodeX(0, 0, &gvar);
 		IN_Shutdown();
 		__asm
 		{
@@ -403,7 +418,7 @@ IN_Ack();
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, &gvar);
+	VGAmodeX(0, 1, &gvar);
 #endif
 	IN_Shutdown();
 	printf("Project 16 scroll.exe. This is just a test file!\n");
@@ -416,6 +431,7 @@ IN_Ack();
 	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", bg->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());