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

spawndelay drinn, botkick on mapstart drinn, akimbo msg draussen..

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@382 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-09-14 19:13:37 +00:00
parent 15e422feee
commit 3016ac98a4
32 changed files with 281 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+5 -8
View File
@@ -137,7 +137,6 @@ void realpickup(int n, dynent *d)
d->mag[GUN_PISTOL] = 16;
radditem(n, d->ammo[1], 9);
weaponswitch(GUN_PISTOL);
if(d==player1) conoutf("a lesser man would use a single pistol");
break;
};
};
@@ -266,6 +265,11 @@ void radd(dynent *d)
d->primary = GUN_PISTOL;
d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].max;
}
if(m_lss)
{
d->mag[d->primary] = d->mag[GUN_PISTOL] = 0;
d->primary = GUN_KNIFE;
}
else
{
d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].start-magsize(GUN_PISTOL);
@@ -293,13 +297,6 @@ void item(int num)
COMMAND(item,ARG_1INT);
void akimbo()
{
conoutf("akimbo=%d",player1->akimbo);
};
COMMAND(akimbo, ARG_NONE);
// Added by Rick
bool intersect(entity *e, vec &from, vec &to, vec *end) // if lineseg hits entity bounding box(entity version)
{