==== MAJOR CHANGES ARE BEING MADE!! WWWW ====

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index d020d58c4742112063af36a3e2fb338be2447e3f..07b3930696bd68a310dd005af2a543d63e3bb79c 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -41,10 +41,10 @@ main(int argc, char *argv[])
        IN_Default(0,&player,ctrl_Keyboard1);\r
        IN_SetControlType(0,&player,ctrl_Keyboard1);\r
 \r
-       player[0].q=1;\r
-       player[0].d=2;\r
-       player[0].persist_aniframe=0;\r
-       player[0].speed=4;\r
+       player[0].enti.q=1;\r
+       player[0].enti.d=2;\r
+       player[0].enti.persist_aniframe=0;\r
+       player[0].enti.speed=4;\r
 \r
 //0000 nibbletest();\r
 //0000 booleantest();\r
@@ -53,43 +53,43 @@ main(int argc, char *argv[])
        {\r
 //0000         shinkutxt(&gvar);\r
                IN_ReadControl(0, &player);\r
-               #define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;\r
-               switch(player[0].d)\r
+               #define INC_PER_FRAME if(player[0].enti.q&1) player[0].enti.persist_aniframe++; if(player[0].enti.persist_aniframe>4) player[0].enti.persist_aniframe = 1;\r
+               switch(player[0].enti.d)\r
                {\r
                //right movement\r
                case 3:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //left movement\r
                case 1:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //down movement\r
                case 4:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //up movement\r
                case 0:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
        }\r
                //printf("%u\n", IN_KeyDown(sc_Escape));\r