OSDN Git Service
(root)
/
proj16
/
16.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
notime
[proj16/16.git]
/
src
/
inputest.c
diff --git
a/src/inputest.c
b/src/inputest.c
index
8d76a7f
..
efba746
100755
(executable)
--- a/
src/inputest.c
+++ b/
src/inputest.c
@@
-25,6
+25,9
@@
#include "src/lib/16_in.h"
\r
#include "src/lib/16_tail.h"
\r
\r
#include "src/lib/16_in.h"
\r
#include "src/lib/16_tail.h"
\r
\r
+#define INPUTEST_JOYSTICKPADTEST
\r
+//#define INPUTEST_MOUSETEST
\r
+
\r
void
\r
main(int argc, char *argv[])
\r
{
\r
void
\r
main(int argc, char *argv[])
\r
{
\r
@@
-32,20
+35,37
@@
main(int argc, char *argv[])
#ifdef __DEBUG_InputMgr__
\r
dbg_testkeyin=0;
\r
dbg_testcontrolnoisy=1;
\r
#ifdef __DEBUG_InputMgr__
\r
dbg_testkeyin=0;
\r
dbg_testcontrolnoisy=1;
\r
+ dbg_joymousedelta=0;
\r
#endif
\r
start_timer(&gvar);
\r
//Startup16(&gvar);
\r
IN_Startup(&gvar);
\r
IN_Default(0,&gvar.player[0],
\r
#endif
\r
start_timer(&gvar);
\r
//Startup16(&gvar);
\r
IN_Startup(&gvar);
\r
IN_Default(0,&gvar.player[0],
\r
-ctrl_Keyboard1, &gvar);
\r
-//ctrl_Joystick1);
\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Keyboard1
\r
+ #endif
\r
+ #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Joystick1
\r
+ #endif
\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Mouse
\r
+ #endif
\r
+ , &gvar);
\r
IN_SetControlType(&gvar.player[0],
\r
IN_SetControlType(&gvar.player[0],
\r
-ctrl_Keyboard1);
\r
-//ctrl_Joystick1);
\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Keyboard1
\r
+ #endif
\r
+ #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Joystick1
\r
+ #endif
\r
+ #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)
\r
+ ctrl_Mouse
\r
+ #endif
\r
+ );
\r
\r
gvar.player[0].enti.q=1;
\r
gvar.player[0].enti.d=2;
\r
\r
gvar.player[0].enti.q=1;
\r
gvar.player[0].enti.d=2;
\r
- gvar.player[0].enti.sp
eed
=4;
\r
+ gvar.player[0].enti.sp
t
=4;
\r
\r
//0000 nibbletest();
\r
//0000 booleantest();
\r
\r
//0000 nibbletest();
\r
//0000 booleantest();
\r
@@
-58,7
+78,7
@@
ctrl_Keyboard1);
{
\r
//right movement
\r
case 3:
\r
{
\r
//right movement
\r
case 3:
\r
- if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
eed
)))
\r
+ if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
t
)))
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
@@
-66,7
+86,7
@@
ctrl_Keyboard1);
\r
//left movement
\r
case 1:
\r
\r
//left movement
\r
case 1:
\r
- if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
eed
)))
\r
+ if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
t
)))
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
@@
-74,7
+94,7
@@
ctrl_Keyboard1);
\r
//down movement
\r
case 4:
\r
\r
//down movement
\r
case 4:
\r
- if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
eed
)))
\r
+ if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
t
)))
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
@@
-82,7
+102,7
@@
ctrl_Keyboard1);
\r
//up movement
\r
case 0:
\r
\r
//up movement
\r
case 0:
\r
- if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
eed
)))
\r
+ if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.sp
t
)))
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
{
\r
gvar.player[0].enti.q++;
\r
} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
\r
@@
-112,5
+132,8
@@
ctrl_Keyboard1);
#ifdef __DEBUG_InputMgr__
\r
printf("testkeyin=%u\n", dbg_testkeyin);
\r
printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
\r
#ifdef __DEBUG_InputMgr__
\r
printf("testkeyin=%u\n", dbg_testkeyin);
\r
printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
\r
+ printf("dbg_joymousedelta=%u\n", dbg_joymousedelta);
\r
#endif
\r
#endif
\r
+ printf("JoysPresent={%d,%d}\n", gvar.in.JoysPresent[0], gvar.in.JoysPresent[1]);
\r
+ printf("MousePresent=%d\n", gvar.in.MousePresent);
\r
}
\r
}
\r