dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not...

[16.git] / src / lib / scroll16.h

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index b9bfed95962df95586a78f31a4e3120f7b05b033..873197bc2c1f439a24ceca41a0a9558f2f730ff4 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -41,15 +41,10 @@
 #include <hw/vga/vga.h>\r
 #include <hw/vga/vrl.h>\r
 \r
-//#define SPRITE\r
+#define SPRITE\r
 //#define TILERENDER\r
 \r
-//extern void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);\r
-\r
-//modexDrawSpritePBufRegion\r
-//modexDrawBmpPBufRegion\r
-//#define PBUFSFUN             modexDrawSpriteRegion\r
-//#define PBUFBFUN             modexDrawBmpRegion\r
+#define ANIMATESPRIFUN ZC_animatePlayer\r
 \r
 #define PLAYERBMPDATAVAR       player[pn].data\r
 #define PLAYERBMPDATA          *PLAYERBMPDATAVAR\r
@@ -162,7 +157,9 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 //void qclean();\r
 void shinku(global_game_variables_t *gv);\r
+void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw);\r
 void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
+void near ZC_animatePlayer_(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 \r
 // Move an entity around. Should actually be in 16_entity\r
@@ -175,3 +172,94 @@ void walk_player(player_t *player, map_view_t *map_v);
 void near mapScroll(map_view_t *mv, player_t *player);\r
 \r
 #endif /*__SCROLL16_H_*/\r
+//older zc_animate\r
+//#define SPRITO\r
+/*void near ZC_animatePlayer_(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
+{\r
+       sword x = player[pn].enti.x;\r
+       sword y = player[pn].enti.y;\r
+       word dire=10; //direction\r
+       sword qq; //scroll offset\r
+       word ls = player[pn].enti.persist_aniframe;\r
+#ifndef SPRITO\r
+       int i=0;\r
+#endif\r
+       switch(scrollswitch)\r
+       {\r
+               case 0:\r
+                       qq = 0;\r
+               break;\r
+               default:\r
+                       qq = ((player[pn].enti.q)*(player[pn].enti.speed));\r
+               break;\r
+       }\r
+#ifdef SPRITE\r
+       x-=4;\r
+#endif\r
+       y-=pip[0].map->tiles->tileHeight;\r
+       switch (player[pn].enti.d)\r
+       {\r
+               case 0:\r
+                       //up\r
+                       dire*=player[pn].enti.d+1;\r
+                       y-=qq;\r
+               break;\r
+               case 3:\r
+                       // right\r
+                       dire*=(player[pn].enti.d-1);\r
+                       x+=qq;\r
+               break;\r
+               case 2:\r
+               break;\r
+               case 4:\r
+                       //down\r
+                       dire*=(player[pn].enti.d-1);\r
+                       y+=qq;\r
+               break;\r
+               case 1:\r
+                       //left\r
+                       dire*=(player[pn].enti.d+3);\r
+                       x-=qq;\r
+               break;\r
+       }\r
+\r
+       //setting xy position\r
+       player[pn].ent->spri->x = x;\r
+       player[pn].ent->spri->y = y;\r
+\r
+#ifndef SPRITO\r
+//#define DRAWFRAME if (i == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video)\r
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
+#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
+#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);      DRAWFRAME;\r
+#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);        DRAWFRAME;\r
+#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
+#else\r
+#define NFRAME1 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 2+dire);\r
+#define NFRAME2 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
+#define NFRAME3 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, dire);\r
+#define NFRAME4 modexClearRegion(pip[(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
+#endif\r
+\r
+       switch(ls)\r
+       {\r
+               case 1:\r
+                       NFRAME1\r
+               break;\r
+               case 2:\r
+                       NFRAME2\r
+               break;\r
+               case 3:\r
+                       NFRAME3\r
+               break;\r
+               case 4:\r
+                       NFRAME4\r
+               break;\r
+       }\r
+       pip->video->r=1;\r
+}*/\r
+\r
+//modexDrawSpritePBufRegion\r
+//modexDrawBmpPBufRegion\r
+//#define PBUFSFUN             modexDrawSpriteRegion\r
+//#define PBUFBFUN             modexDrawBmpRegion\r