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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@275 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-04-27 14:37:27 +00:00
parent 93ecf468ce
commit a4bab13d21
14 changed files with 147 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+31 -25
View File
@@ -21,30 +21,38 @@ guninfo guns[NUMGUNS] =
};
bool gun_changed = false;
void primary()
{
player1->gunselect=player1->primary;
gun_changed = true;
};
void secondary()
{
player1->gunselect=GUN_PISTOL;
gun_changed = true;
};
void melee()
{
player1->gunselect=GUN_KNIFE;
gun_changed = true;
};
COMMAND(primary,ARG_NONE);
COMMAND(secondary,ARG_NONE);
COMMAND(melee,ARG_NONE);
bool gun_changed = false;
void changeweapon(int gun)
{
if(gun>=0) gun %= G_NUM;
else gun = G_NUM-(gun % G_NUM);
gun_changed = true;
switch(gun)
{
case G_PRIMARY: player1->gunselect=player1->primary; break;
case G_SECONDARY: player1->gunselect=GUN_PISTOL; break;
case G_MELEE: player1->gunselect=GUN_KNIFE; break;
case G_GRENADE: player1->gunselect=GUN_GRENADE; break;
};
};
void shiftweapon(int i)
{
int gun;
switch(player1->gunselect)
{
case GUN_KNIFE: gun=G_MELEE; break;
case GUN_PISTOL: gun=G_SECONDARY; break;
case GUN_GRENADE: gun=G_GRENADE; break;
default: gun=G_PRIMARY; break;
};
gun += i;
changeweapon(gun);
}
COMMAND(changeweapon, ARG_1INT);
COMMAND(shiftweapon, ARG_1INT);
void reload()
{
@@ -454,8 +462,6 @@ void raydamage(dynent *o, vec &from, vec &to, dynent *d, int i)
}
else if(intersect(o, from, to)) hitpush(i, qdam, o, d, from, to);
};
extern int scoped;
void spreadandrecoil(vec & from, vec & to, dynent * d)
{