wwww
Revision | ea5bcfc4dfd9567bcb6c13aca55680da7873c758 (tree) |
---|---|
Time | 2016-08-08 06:05:09 |
Author | sparky4 <sparky4@cock...> |
Commiter | sparky4 |
16_in todo slightly updated thinking about making jpoystick input verbose
@@ -235,7 +235,7 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm) | ||
235 | 235 | //fat=segm*0xfffflu; |
236 | 236 | //length-=fat; |
237 | 237 | // printf("CA_FarRead doesn't support 64K reads yet!\n"); |
238 | - return 0;//todo: EXPAND!!! | |
238 | + return 0;//TODO: EXPAND!!! | |
239 | 239 | } |
240 | 240 | |
241 | 241 | //if(!fat&&!segm) |
@@ -380,39 +380,8 @@ static word lasttime; | ||
380 | 380 | |
381 | 381 | //TODO: inject p16 input controls! |
382 | 382 | //which is this |
383 | - /* if(DIRECTIONIFELSE) | |
384 | - { | |
385 | - if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){ | |
386 | - if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])) | |
387 | - my = motion_Up; | |
388 | - if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])) | |
389 | - my = motion_Down; | |
390 | - }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){ | |
391 | - if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])) | |
392 | - mx = motion_Left; | |
393 | - if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1) | |
394 | - mx = motion_Right; | |
395 | - }else | |
396 | - //if(mx+my!=1 && mx+my!=-1 && mx!=my!=0) | |
397 | - { //2 keys pressed | |
398 | - switch (player[pn].pdir) | |
399 | - { | |
400 | - case 0: | |
401 | - case 4: | |
402 | - if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])) dir = DirTable[1]; | |
403 | - else if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])) dir = DirTable[3]; | |
404 | - break; | |
405 | - case 1: | |
406 | - case 3: | |
407 | - if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])) dir = DirTable[0]; | |
408 | - else if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])) dir = DirTable[4]; | |
409 | - break; | |
410 | - default: | |
411 | - break; | |
412 | - } | |
413 | - if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c ", dirchar(player[pn].pdir)); } | |
414 | - }//else printf(" "); | |
415 | - }*/ | |
383 | + //into joystick code! | |
384 | + //look at IN_ReadControl | |
416 | 385 | if (x < def->threshMinX) |
417 | 386 | { |
418 | 387 | if (x < def->joyMinX) |
@@ -889,7 +858,7 @@ register KeyboardDef *def; | ||
889 | 858 | mx = motion_Left,my = motion_Down; |
890 | 859 | else if (Keyboard[def->downright]) |
891 | 860 | mx = motion_Right,my = motion_Down;*/ |
892 | - if(DIRECTIONIFELSE) | |
861 | + if(DIRECTIONIFELSE)//(player[pn].info.dir == 2) | |
893 | 862 | { |
894 | 863 | if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){ |
895 | 864 | if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])) |