kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nade-in-hand explodes => suicide & some minor other stuff

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5730 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-10-09 20:05:43 +00:00
parent d78954f068
commit c1f7286b86
6 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+4 -4
View File
@@ -799,7 +799,7 @@ bool weapon::valid(int id) { return id>=0 && id<NUMGUNS; }
// grenadeent
enum { NS_NONE, NS_ACTIVATED = 0, NS_THROWED, NS_EXPLODED };
enum { NS_NONE, NS_ACTIVATED = 0, NS_THROWN, NS_EXPLODED };
grenadeent::grenadeent (playerent *owner, int millis)
{
@@ -822,7 +822,7 @@ grenadeent::~grenadeent()
void grenadeent::explode()
{
if(nadestate!=NS_ACTIVATED && nadestate!=NS_THROWED ) return;
if(nadestate!=NS_ACTIVATED && nadestate!=NS_THROWN ) return;
nadestate = NS_EXPLODED;
static vec n(0,0,0);
hits.setsize(0);
@@ -870,7 +870,7 @@ void grenadeent::activate(const vec &from, const vec &to)
void grenadeent::_throw(const vec &from, const vec &vel)
{
if(nadestate!=NS_ACTIVATED) return;
nadestate = NS_THROWED;
nadestate = NS_THROWN;
this->vel = vel;
this->o = from;
this->resetinterp();
@@ -896,7 +896,7 @@ void grenadeent::moveoutsidebbox(const vec &direction, playerent *boundingbox)
}
void grenadeent::destroy() { explode(); }
bool grenadeent::applyphysics() { return nadestate==NS_THROWED; }
bool grenadeent::applyphysics() { return nadestate==NS_THROWN; }
void grenadeent::oncollision()
{