From: sparky4 <sparky4@cock.li>
Date: Tue, 3 Nov 2015 17:27:12 +0000 (-0600)
Subject: ><
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b819f19a349090e91d564381c4aec9be73628d6d;p=16.git

><
---

diff --git a/16.exe b/16.exe
index 4d0458f0..406511f8 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 2c8bcd99..03c0547f 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index f0c036a4..9bf6ef26 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index e9a7f35b..ec59343c 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index cc3bf843..14680260 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -60,7 +60,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
-				modexDrawSpritePBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data);
+				PBUFFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data);
 #else
 				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 14);
 #endif
@@ -101,7 +101,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
-				modexDrawSpritePBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, &player[pn].data);
+				PBUFFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, &player[pn].data);
 #else
 				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 10);
 #endif
@@ -142,7 +142,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
-				modexDrawSpritePBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, &player[pn].data);
+				PBUFFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, &player[pn].data);
 #else
 				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 9);
 #endif
@@ -183,7 +183,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
-				modexDrawSpritePBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, &player[pn].data);
+				PBUFFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, &player[pn].data);
 #else
 				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 12);
 #endif
@@ -661,10 +661,10 @@ void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword s
 	}
 
 #ifdef SPRITE
-#define FRAME1 modexDrawSpritePBufRegion(pip[1].page, x, y, 48, dire, 24, 32, &player[playnum].data);
-#define FRAME2 modexDrawSpritePBufRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
-#define FRAME3 modexDrawSpritePBufRegion(pip[1].page, x, y, 0, dire, 24, 32, &player[playnum].data);
-#define FRAME4 modexDrawSpritePBufRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
+#define FRAME1 PBUFFUN(pip[1].page, x, y, 48, dire, 24, 32, &player[playnum].data);
+#define FRAME2 PBUFFUN(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
+#define FRAME3 PBUFFUN(pip[1].page, x, y, 0, dire, 24, 32, &player[playnum].data);
+#define FRAME4 PBUFFUN(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
 #else
 #define FRAME1 modexClearRegion(pip[1].page, x, y, 24, 32, 2+dire);
 #define FRAME2 modexClearRegion(pip[1].page, x, y, 24, 32, 1+dire);
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index b1b8a745..4ec26e9a 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,7 +34,8 @@
 #include "src/lib/wcpu/wcpu.h"
 
 #define SPRITE
-#define TILERENDER
+#define PBUFFUN modexDrawBmpPBufRegion
+//#define TILERENDER
 
 typedef struct {
 	map_t *map;
diff --git a/test.exe b/test.exe
index e52ed8bb..7f1b675f 100755
Binary files a/test.exe and b/test.exe differ