X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7d68b45d6e3e65d32d30bd1a9b723b904f5f98d8;hb=663e52d5641538fc75ccdad3ba2529a27e8e0ff8;hp=23307d63ff47179e057430db08d018e347d96f51;hpb=0700b16203a3e0325bd4186546b29043b94d3c43;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 23307d63..7d68b45d 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,11 +36,11 @@ 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;
 
-void main(int argc, char *argv[])
-{
 //	word panswitch=0, panq=1, pand=0;
 	word panpagenum=0; //for panning!
 	unsigned int i;
@@ -56,16 +56,21 @@ void main(int argc, char *argv[])
 	byte *gpal;
 	byte *ptr;
 	byte *mappalptr;
-	byte *mesg=malloc(sizeof(dword));
 
+void main(int argc, char *argv[])
+{
+	byte *mesg=malloc(sizeof(dword));
 
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
+	testcontrolnoisy=0;
+
 	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;
@@ -73,12 +78,10 @@ void main(int argc, char *argv[])
 //	atexit(qclean());
 
 	/* create the map */
-	fprintf(stderr, "testing map load~\n");
+	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
-//0000	map.width=0;
-//0000	map.height=0;
 	chkmap(&map, 0);
-	printf("chkmap ok\n");
+	printf("chkmap ok	");
 	fprintf(stderr, "yay map loaded~~\n");
 	mv[0].map = ↦
 	mv[1].map = ↦
@@ -87,15 +90,18 @@ 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
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
-	(player[0].data) = *planar_buf_from_bitmap(&p);
-//0000	printf("planar buffer ok\n");
+////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
+	printf("load pee!!	");
+	pp = planar_buf_from_bitmap(&p);
+	printf("done!\n");
+
 #endif
 	/*	input!	*/
 	IN_Startup();
@@ -113,7 +119,7 @@ void main(int argc, char *argv[])
 
 	textInit();
 	VGAmodeX(bakapee, &gvar);
-	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
@@ -121,7 +127,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);
@@ -145,6 +152,7 @@ void main(int argc, char *argv[])
 	mv[0].page = &gvar.video.page[0];
 	gvar.video.page[1] = modexNextPage(mv[0].page);
 	mv[1].page = &gvar.video.page[1];
+
 	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];
@@ -153,12 +161,12 @@ void main(int argc, char *argv[])
 	bg = &mv[0];
 	spri = &mv[1];
 	mask = &mv[2];
-
+//IN_Ack();
 //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(mask, 0, 0);
-
+//IN_Ack();
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
 	player[0].tx = bg->tx + bg->page->tilemidposscreenx;
@@ -185,15 +193,17 @@ 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);*/
+
 	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
-#ifdef	SPRITE
+#ifndef	SPRITE
 	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
-	modexDrawSpritePBufRegion(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
 
 	modexShowPage(spri->page);
-	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
 	modexFadeOn(4, gpal);
@@ -414,6 +424,7 @@ void main(int argc, char *argv[])
 	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());