//in.KbdDefs[0].downright = 0x51;\r
IN_SetControlType(0,player,nt);\r
for(i=0; i>MaxPlayers;i++)\r
- player[i].d=2;\r
+ player[i].enti.d =2;\r
}\r
\r
///////////////////////////////////////////////////////////////////////////\r
//\r
///////////////////////////////////////////////////////////////////////////\r
void near\r
-IN_ReadControl(int pn,player_t *player)\r
+IN_ReadControl(word pn, player_t *player)\r
{\r
boolean realdelta;\r
#if DEMO0\r
player[pn].info.dir = DirTable[conpee];\r
\r
if(DirTable[conpee]!=2) player[pn].pdir=DirTable[conpee];\r
- if(player[pn].q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))\r
+ if(player[pn].enti.q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))\r
{\r
- if(dir==2) player[pn].d = player[pn].info.dir;\r
- else player[pn].d = DirTable[dir];\r
+ if(dir==2) player[pn].enti.d = player[pn].info.dir;\r
+ else player[pn].enti.d = DirTable[dir];\r
}\r
\r
#if DEMO0\r
#endif\r
#ifdef __DEBUG_InputMgr__\r
if(dbg_testcontrolnoisy > 0)\r
-if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].q>1)\r
+if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].enti.q>1)\r
{\r
//printf("b1=%u b2=%u b3=%u b4=%u ", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);\r
- //printf("q=%d ", player[pn].q);\r
+ //printf("q=%d ", player[pn].enti.q);\r
//printf("cpee=%c ", dirchar(conpee));\r
- printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));\r
+ printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].enti.d), dirchar(player[pn].info.dir));\r
/*if(realdelta) */printf("dx=%d dy=%d mx=%d my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);\r
//else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);\r
printf("\n");\r
//init player!\r
void IN_initplayer(player_t *player, word pn)\r
{\r
- player[pn].x = player[pn].tx*TILEWH;\r
- player[pn].y = player[pn].ty*TILEWH;\r
- player[pn].triggerx = player[pn].tx;\r
- player[pn].triggery = player[pn].ty+1;\r
+ player[pn].enti.x = player[pn].enti.tx*TILEWH;\r
+ player[pn].enti.y = player[pn].enti.ty*TILEWH;\r
+ player[pn].enti.triggerx = player[pn].enti.tx;\r
+ player[pn].enti.triggery = player[pn].enti.ty+1;\r
/* player[0].info.x = player[0].tx;\r
player[0].info.xaxis = player[0].tx*TILEWH;\r
player[0].info.y = player[0].ty;\r
player[0].info.yaxis = player[0].ty*TILEWH;*/\r
- player[pn].q=1;\r
- player[pn].d=2;\r
- player[pn].hp=4;\r
- player[pn].speed=4;\r
- player[pn].persist_aniframe=0;\r
- player[pn].spt=(TILEWH/(player[pn].speed)); //speed per tile wwww\r
+ player[pn].enti.q =1;\r
+ player[pn].enti.d =2;\r
+ player[pn].enti.hp=4;\r
+ player[pn].enti.speed=4;\r
+ player[pn].enti.persist_aniframe=0;\r
+ player[pn].enti.spt=(TILEWH/(player[pn].enti.speed)); //speed per tile wwww\r
}\r