X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=bf0755e7a300c20f2dbd3ca0b43248c4677ec1b2;hb=e7e1040acdb9b603ce1043cc970a512f2d6b90e9;hp=0534708c3382d2e6c4951ad6058eb107acf26608;hpb=66a317137a97b0488d86969e1c9562ed061f0de5;p=16.git diff --git a/src/lib/16_in.h b/src/lib/16_in.h index 0534708c..bf0755e7 100755 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -29,8 +29,9 @@ #include #include "src/lib/16_head.h" -#include "src/lib/timer.h" +#include "src/lib/16_timer.h" #include "src/lib/bitmap.h" +#include "src/lib/planar.h" #ifdef __DEBUG__ //#define __DEBUG_InputMgr__ @@ -41,7 +42,13 @@ //#define TESTCONTROLNOISY #endif -static word testkeyin,testcontrolnoisy; +extern byte testkeyin,testcontrolnoisy; + +//if else for gfxtesting and direction +//player[pn].d == 2 || +//player[pn].d != 2 || +#define DIRECTIONIFELSE (player[pn].info.dir == 2) +//#define NDIRECTIONIFELSE (player[pn].info.dir != 2) #define KeyInt 9 // The keyboard ISR number @@ -219,10 +226,15 @@ typedef struct int triggery; //player's trigger box tile position on the viewable map int sheetsetx; //NOT USED YET! player sprite sheet set on the image x int sheetsety; //NOT USED YET! player sprite sheet set on the image y - word d; //direction!! wwww - word q; //loop variable + byte d; //direction to render sprite!! wwww + byte q; //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www + byte near pdir; //previous direction~ + //byte near kd[2]; //array of arrow key pressed word speed; //player speed! - bitmap_t data; //supposively the sprite sheet data +//0000 planar_buf_t huge *data; //supposively the sprite sheet data +// planar_buf_t data; //supposively the sprite sheet data +////0000---- + bitmap_t huge *data; //supposively the sprite sheet data sword hp; //hitpoints of the player int persist_aniframe; /* gonna be increased to 1 before being used, so 0 is ok for default */ CursorInfo info; @@ -281,8 +293,8 @@ extern void IN_SetKeyHook(void (*hook)()); extern void IN_ClearKeysDown(); //static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy); extern void IN_ReadCursor(CursorInfo *info); -extern void near IN_ReadControl(int playnum,player_t *player); -extern void IN_SetControlType(word playnum,player_t *player,ControlType type); +extern void near IN_ReadControl(int pn,player_t *player); +extern void IN_SetControlType(word pn,player_t *player,ControlType type); #if DEMO0 extern boolean IN_StartDemoRecord(word bufsize); extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);