From 41a26086b96860a1a35f2110c6a4aaecdb7a5ce9 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Sun, 17 Apr 2016 15:25:10 -0500
Subject: [PATCH] wwww

---
 src/lib/bakapee.c | 6 +++---
 src/lib/modex16.c | 8 ++++----
 src/lib/modex16.h | 6 +++---
 src/palettel.c    | 2 +-
 src/scroll.c      | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 1626fd1d..8b40f964 100755
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -34,7 +34,7 @@ void colortest(page_t *page, bakapee_t *pee)
 {
 	//if(pee->coor < 256)
 	//{
-		cls(page, pee->coor, VGA);
+		modexcls(page, pee->coor, VGA);
 		pee->coor++;
 	//}else pee->coor = 0;
 }
@@ -44,7 +44,7 @@ void colorz(page_t *page, bakapee_t *pee)
 {
 	if(pee->coor <= HGQ)
 	{
-		cls(page, pee->coor, VGA);
+		modexcls(page, pee->coor, VGA);
 		pee->coor++;
 	}else pee->coor = LGQ;
 }
@@ -228,7 +228,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		break;
 		case 6:
 			pee->coor = rand()%256;
-			cls(page, pee->coor, VGA);
+			modexcls(page, pee->coor, VGA);
 		break;
 		case 7:
 			if(pee->coor <= HGQ)
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fcec8d38..6f8d64fa 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -636,7 +636,7 @@ printf("\nqqqqqqqq\n\n");
 		pp = q;
 		//printf("1(*i)=%02d\n", (*i)/3);
 		//printf("1z=%02d\n", z/3);
-		chkcolor(bmp, &q, &a, &aa, &z, i);
+		modexchkcolor(bmp, &q, &a, &aa, &z, i);
 		//printf("2(*i)=%02d\n", (*i)/3);
 		//printf("2z=%02d\n", z/3);
 		aq=0;
@@ -753,7 +753,7 @@ modexPalOverscan(byte *p, word col)
 
 //color checker~
 //i want to make another vesion that checks the palette when the palette is being appened~
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
 {
 		byte *pal;
 		word zz=0;
@@ -1006,7 +1006,7 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 }
 
 /* palette dump on display! */
-void pdump(page_t *pee)
+void modexpdump(page_t *pee)
 {
 	int mult=(QUADWH);
 	int palq=(mult)*TILEWH;
@@ -1026,7 +1026,7 @@ void pdump(page_t *pee)
 //		 the Virtual screen.											 //
 //																		 //
 /////////////////////////////////////////////////////////////////////////////
-void cls(page_t *page, byte color, byte *Where)
+void modexcls(page_t *page, byte color, byte *Where)
 {
 	//modexClearRegion(page, 0, 0, page->width, page->height, color);
 	/* set map mask to all 4 planes */
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 6b8622f1..acdf63e9 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -120,14 +120,14 @@ void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(byte *p, word col);
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
-void pdump(page_t *pee);
-void cls(page_t *page, byte color, byte *Where);
+void modexpdump(page_t *pee);
+void modexcls(page_t *page, byte color, byte *Where);
 //void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */
diff --git a/src/palettel.c b/src/palettel.c
index d07452b6..5ce5c809 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
 	modexLoadPalFile(bakapee, &pal);
 	modexPalUpdate1(pal);
 	modexFadeOn(1, pal);
-	pdump(&gvar.video.page[0]);
+	modexpdump(&gvar.video.page[0]);
 	getch();
 	VGAmodeX(0, 0, &gvar);
 	modexPalUpdate1(pal);
diff --git a/src/scroll.c b/src/scroll.c
index b7ecc00b..e619bfa3 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -369,16 +369,16 @@ void main(int argc, char *argv[])
 	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
-- 
2.39.2