X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=edd86d62c7cbc968126892393132fdbfdb066733;hb=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;hp=f490ab28aee614f6de91869e4be22f105e7b7ef4;hpb=0004dc99fabef783aacb99f55e315d2df0d44e9d;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index f490ab28..edd86d62 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & 0gwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -27,22 +27,25 @@
 void
 main(int argc, char *argv[])
 {
+	global_game_variables_t gvar;
 	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
 	testkeyin=0;
 	testcontrolnoisy=1;
-	gfxtest=0;
+	testctrltype=1;
 	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	IN_Default(0,&player,ctrl_Joystick1);
 	//while(!IN_KeyDown(sc_Escape))
 	player[0].q=1;
 	player[0].d=2;
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
+	start_timer(&gvar);
 	while(!IN_KeyDown(sc_Escape))
 	{
-		#define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;
+		shinkutxt(&gvar);
 		IN_ReadControl(0,&player);
+		#define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;
 		switch(player[0].d)
 		{
 		//right movement
@@ -84,6 +87,19 @@ main(int argc, char *argv[])
 		//printf("%u\n", IN_KeyDown(sc_Escape));
 		//if(
 		IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
+		if(IN_KeyDown(88))	//speed
+		{
+			switch(gvar.kurokku.fpscap)
+			{
+				case 0:
+					gvar.kurokku.fpscap=1;
+				break;
+				case 1:
+					gvar.kurokku.fpscap=0;
+				break;
+			}
+			//IN_Ack();
+		}
 	}
 	IN_Shutdown();
 	//printf("%u\n", in.Keyboard[sc_Escape]);
@@ -91,4 +107,5 @@ main(int argc, char *argv[])
 	printf("version %s\n", VERSION);
 	printf("testkeyin=%u\n", testkeyin);
 	printf("testcontrolnoisy=%u\n", testcontrolnoisy);
+	printf("testctrltype=%u\n", testctrltype);
 }