X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_in.h;h=9e4bfc2e88ae047cf49024a4e5919e5818cc117a;hb=c11666ac6f605f561e9c6c6f2bba3bccea4a7b18;hp=29ecc130e1f91616bf870bd9f88a895c6ea30f90;hpb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;p=16.git diff --git a/src/lib/16_in.h b/src/lib/16_in.h index 29ecc130..9e4bfc2e 100755 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -33,11 +33,8 @@ #ifdef __WATCOMC__ //borland C BCEXMM.EXE #include "src/lib/16_dbg.h" #include "src/lib/16_sprit.h" -#include "src/lib/bitmap.h" //old format -#endif -#ifdef __DEBUG__ -#define __DEBUG_InputMgr__ -extern boolean dbg_testkeyin,dbg_testcontrolnoisy; +#include "src/lib/16_enti.h" +//#include "src/lib/bitmap.h" //old format #endif //if else for gfxtesting and direction @@ -53,7 +50,7 @@ extern boolean dbg_testkeyin,dbg_testcontrolnoisy; #define JoyScaleShift 8 #define MaxJoyValue 5000 -#define MaxPlayers 4 +#define MaxPlayers 2//futre plans for multiple playable charaters and being able to alternate #define MaxKbds 2 #define MaxJoys 2 #define MaxPads 2 @@ -228,12 +225,14 @@ typedef struct #ifdef __WATCOMC__ struct sprite *spri; //supposively the sprite sheet data memptr gr; + entity_t *ent; #endif bitmap_t *data; //supposively the sprite sheet data//old format 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; ControlType Controls; + int dx, dy, delta; //TODO: what is this? ^^ } player_t; /*