From 0509ed6031e409e17ef2df125bc70ae78c529578 Mon Sep 17 00:00:00 2001 From: driAn Date: Thu, 27 Apr 2006 15:34:37 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@277 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/client.cpp | 2 +- source/src/rendermd3.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index 333c03f2..2cdcfcc3 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -263,7 +263,7 @@ void c2sinfo(dynent *d) // send update to the server putint(p, SV_INITC2S); sendstring(player1->name, p); sendstring(player1->team, p); - sendstring(player1->skin, p); + putint(p, player1->skin); putint(p, player1->lifesequence); }; loopv(messages) // send messages collected during the previous frames diff --git a/source/src/rendermd3.cpp b/source/src/rendermd3.cpp index 0efd0ac4..afedb154 100644 --- a/source/src/rendermd3.cpp +++ b/source/src/rendermd3.cpp @@ -456,9 +456,10 @@ struct weaponmove if(player1->gunselect==player1->lastattackgun) { - int percent_done = timediff*100/attackdelay(player1->gunselect); + int animtime = /*throwingnade ? 5000 : */attackdelay(player1->gunselect); + int percent_done = timediff*100/animtime; if(percent_done > 100) percent_done = 100.0; - // f(x) = -sin(x-1.5)^3A + // f(x) = -sin(x-1.5)^3 kick = -sin(pow((1.5f/100*percent_done)-1.5f,3)); };