*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@763 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/clients2c.cpp

@@ -524,4 +524,5 @@ void test2()
 	conoutf("%f %f %f", player1->o.x, player1->o.y, (float) S((ushort)(player1->o.x), (ushort)(player1->o.y))->floor);
 };
 
-COMMAND(test2, ARG_NONE);
+COMMAND(test2, ARG_NONE);
+

source/src/server.cpp

@@ -682,8 +682,7 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
             };
             loopi(3) clients[cn]->pos[i] = getuint(p);
             getuint(p);
-            loopi(5) getint(p);
-            int state = (getint(p)>>5)&7;
+            loopi(6) getint(p);
             if(cl->type==ST_TCPIP)
             {
                 cl->position.setsizenodelete(0);

source/src/weapon.cpp

@@ -17,7 +17,7 @@ guninfo guns[NUMGUNS] =
     { S_SUBGUN,		S_RSUBGUN,  1650,   80,		16/*15*/,0,   0, 70,   15,   30,   1,  2,  true,	"subgun"  },
     { S_SNIPER,		S_RSNIPER,  1950,   1500,   85,     0,   0, 60,   50,   5,    4,  4,  false,	"sniper"  },
     { S_ASSAULT,	S_RASSAULT,  2000,   130,   25,     0,   0, 20,   40,   20,   0,  2,  true,	"assault"  },  //recoil was 44
-    { S_NULL,		S_NULL,     1000,   1200,   150,    20,  6,  1,    1,   1,    3,  1,  "grenade" },
+    { S_NULL,		S_NULL,     1000,   1200,   150,    20,  6,  1,    1,   1,    3,  1,  false, "grenade" },
 };