Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index e39c400e29554414cb80e87465160af6670c6a1e..bf0755e7a300c20f2dbd3ca0b43248c4677ec1b2 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,7 +29,7 @@
 \r
 #include <string.h>\r
 #include "src/lib/16_head.h"\r
-#include "src/lib/timer.h"\r
+#include "src/lib/16_timer.h"\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
 \r
@@ -42,11 +42,13 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern byte testkeyin,testcontrolnoisy,gfxtest;\r
+extern byte testkeyin,testcontrolnoisy;\r
 \r
 //if else for gfxtesting and direction\r
-#define DIRECTIONIFELSEGFXTEST (player[pn].d == 2 && gfxtest) || (player[pn].info.dir == 2 && !gfxtest)\r
-#define NDIRECTIONIFELSEGFXTEST (player[pn].d != 2 && gfxtest) || (player[pn].info.dir != 2 && !gfxtest)\r
+//player[pn].d == 2 ||\r
+//player[pn].d != 2 ||\r
+#define DIRECTIONIFELSE        (player[pn].info.dir == 2)\r
+//#define NDIRECTIONIFELSE     (player[pn].info.dir != 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -227,6 +229,7 @@ typedef     struct
        byte d;         //direction to render sprite!! wwww\r
        byte q;         //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
        byte near pdir; //previous direction~\r
+       //byte near kd[2];      //array of arrow key pressed\r
        word speed;             //player speed!\r
 //0000 planar_buf_t huge *data; //supposively the sprite sheet data\r
 //     planar_buf_t data; //supposively the sprite sheet data\r