From 9a1de7bcc2d740e7d1424e7efe86e02e6a9e3bc8 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Tue, 22 Mar 2016 13:49:17 -0500
Subject: [PATCH] wwww

---
 src/bakapi.c      |  1 +
 src/lib/bakapee.c | 72 ++++++++++++++++++++++-------------------------
 src/lib/bakapee.h |  1 +
 3 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/src/bakapi.c b/src/bakapi.c
index 9f471fdc..80ab7d4f 100755
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -54,6 +54,7 @@ main(int argc, char *argvar[])
 	bakapee.bakax=0;
 	bakapee.bakay=0;
 	bakapee.coor=0;
+	bakapee.tile=0;
 
 	/* setup camera and screen~ */
 	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index e553e10c..1639f242 100755
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -73,31 +73,35 @@ void ssd(page_t *page, bakapee_t *pee, word svq)
 //plot pixel or plot tile
 void dingpp(page_t *page, bakapee_t *pee)
 {
-#ifdef TILE
+	if(pee->tile)
+	{
 #ifndef MXLIB
 	//fill_block(pee->xx, pee->yy, pee->xx+TILEWH, pee->yy+TILEWH, pee->coor);
-	mxFillBox(pee->xx, pee->yy, TILEWH, TILEWH, pee->coor, OP_SET);
-#else
-	modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor);
-#endif
+		mxFillBox(pee->xx, pee->yy, TILEWH, TILEWH, pee->coor, OP_SET);
 #else
-	modexputPixel(page, pee->xx, pee->yy, pee->coor);
+		modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor);
 #endif
+	}
+	else
+		modexputPixel(page, pee->xx, pee->yy, pee->coor);
 }
 
 void dingo(page_t *page, bakapee_t *pee)
 {
-	#ifdef TILE
-	if(pee->xx<0) pee->xx=(page->sw-TILEWH);
-	if(pee->yy<0) pee->yy=(page->sh-TILEWH);
-	if(pee->xx>(page->sw-TILEWH)) pee->xx=0;
-	if(pee->yy>(page->sh-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
-	#else
-	if(pee->xx<0) pee->xx=page->sw;
-	if(pee->yy<0) pee->yy=page->sh;
-	if(pee->xx>page->sw) pee->xx=0;
-	if(pee->yy>page->sh) pee->yy=0;
-	#endif
+	if(pee->tile)
+	{
+		if(pee->xx<0) pee->xx=(page->sw-TILEWH);
+		if(pee->yy<0) pee->yy=(page->sh-TILEWH);
+		if(pee->xx>(page->sw-TILEWH)) pee->xx=0;
+		if(pee->yy>(page->sh-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
+	}
+		else
+	{
+		if(pee->xx<0) pee->xx=page->sw;
+		if(pee->yy<0) pee->yy=page->sh;
+		if(pee->xx>page->sw) pee->xx=0;
+		if(pee->yy>page->sh) pee->yy=0;
+	}
 }
 
 //assigning values from randomizer
@@ -106,35 +110,27 @@ void dingas(bakapee_t *pee)
 	if(pee->gq == BONK) dingu(pee);
 	if(!pee->bakax)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->xx-=TILEWH;
-		#else
-		pee->xx--;
-		#endif
+		else pee->xx--;
 	}
 	else if(pee->bakax>1)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->xx+=TILEWH;
-		#else
-		pee->xx++;
-		#endif
+		else pee->xx++;
 	}
 	if(!pee->bakay)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->yy-=TILEWH;
-		#else
-		pee->yy--;
-		#endif
+		else pee->yy--;
 	}
 	else if(pee->bakay>1)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->yy+=TILEWH;
-		#else
-		pee->yy++;
-		#endif
+		else pee->yy++;
 	}
 }
 
@@ -184,11 +180,10 @@ void ding(page_t *page, bakapee_t *pee, word q)
 			dingas(pee);
 			dingo(page, pee);
 			dingpp(page, pee);	//plot the pixel/tile
-#ifdef TILE
+			if(pee->tile)
 			modexClearRegion(page, (rand()*TILEWH)%page->width, (rand()*TILEWH)%(page->height), TILEWH, TILEWH, 0);
-#else
+			else
 			modexputPixel(page, rand()%page->width, rand()%page->height, 0);
-#endif
 		break;
 		case 3:
 			dingq(pee);
@@ -270,11 +265,10 @@ void ding(page_t *page, bakapee_t *pee, word q)
 			tx+=pee->xx+TILEWH+4;
 			ty+=pee->yy+TILEWH+4;
 			modexClearRegion(page, tx, ty, 4, 4, pee->coor);
-#ifdef TILE
+			if(pee->tile)
 			modexClearRegion(page, (rand()*TILEWH)%page->width, (rand()*TILEWH)%(page->height), TILEWH, TILEWH, 0);
-#else
+			else
 			modexputPixel(page, rand()%page->width, rand()%(page->height), 0);
-#endif
 			//printf("%d %d %d %d %d %d\n", pee->xx, pee->yy, tx, ty, TILEWH);
 		break;
 		default:
diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h
index 1f9c94e5..800e5777 100755
--- a/src/lib/bakapee.h
+++ b/src/lib/bakapee.h
@@ -44,6 +44,7 @@ typedef struct {
 	sword bakax, bakay;
 	sword xx, yy, sx, sy;
 	byte coor;
+	boolean tile;
 } bakapee_t;
 
 void clrstdin();
-- 
2.39.5