X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=6cdf2514c1905eba0e13dc280cf42435dde9f1f9;hb=b21fed9969cd357cd0aff8040453aa0677592de0;hp=eecfae5905bd772859827f1c8385ad0d2779825c;hpb=a203608488cb6d6e6d8147d31788318a7b63e6ad;p=16.git diff --git a/src/lib/16_in.h b/src/lib/16_in.h index eecfae59..6cdf2514 100755 --- a/src/lib/16_in.h +++ b/src/lib/16_in.h @@ -28,7 +28,7 @@ #define __16_IN__ #include -#include "src/lib/16_head.h" +#include "src/lib/16_head.h" #include "src/lib/bitmap.h" #ifdef __DEBUG__ @@ -175,14 +175,14 @@ typedef enum { dir_South,//dir_Soutinest, } Direction; typedef struct { - boolean button0,button1,button2,button3; - int x,y; - Motion xaxis,yaxis; - Direction dir; + boolean near button0,button1,button2,button3; + int near x,y; + Motion near xaxis,yaxis; + Direction near dir; } CursorInfo; typedef struct { - ScanCode button0,button1, + ScanCode near button0,button1, //upleft, up, down, @@ -194,7 +194,7 @@ typedef struct { ; } KeyboardDef; typedef struct { - word joyMinX,joyMinY, + word near joyMinX,joyMinY, threshMinX,threshMinY, threshMaxX,threshMaxY, joyMaxX,joyMaxY, @@ -215,15 +215,15 @@ typedef struct int triggerx; //player's trigger box tile position on the viewable map 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 + int sheetsety; //NOT USED YET! player sprite sheet set on the image y word d; //direction!! wwww - word q; //loop variable + word q; //loop variable word speed; //player speed! bitmap_t data; //supposively the sprite sheet data - sword hp; //hitpoints of the player + 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; + ControlType Controls; } player_t; /* @@ -280,7 +280,7 @@ 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 IN_ReadControl(int playnum,player_t *player); +extern void near IN_ReadControl(int playnum,player_t *player); extern void IN_SetControlType(word playnum,player_t *player,ControlType type); #if DEMO0 extern boolean IN_StartDemoRecord(word bufsize);