• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

wwww


Commit MetaInfo

Revisionea5bcfc4dfd9567bcb6c13aca55680da7873c758 (tree)
Time2016-08-08 06:05:09
Authorsparky4 <sparky4@cock...>
Commitersparky4

Log Message

16_in todo slightly updated thinking about making jpoystick input verbose

Change Summary

Incremental Difference

--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -235,7 +235,7 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
235235 //fat=segm*0xfffflu;
236236 //length-=fat;
237237 // printf("CA_FarRead doesn't support 64K reads yet!\n");
238- return 0;//todo: EXPAND!!!
238+ return 0;//TODO: EXPAND!!!
239239 }
240240
241241 //if(!fat&&!segm)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -380,39 +380,8 @@ static word lasttime;
380380
381381 //TODO: inject p16 input controls!
382382 //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
416385 if (x < def->threshMinX)
417386 {
418387 if (x < def->joyMinX)
@@ -889,7 +858,7 @@ register KeyboardDef *def;
889858 mx = motion_Left,my = motion_Down;
890859 else if (Keyboard[def->downright])
891860 mx = motion_Right,my = motion_Down;*/
892- if(DIRECTIONIFELSE)
861+ if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)
893862 {
894863 if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
895864 if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))