*** empty log message ***
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@301 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+15
-15
@@ -55,8 +55,8 @@ COMMAND(weapon, ARG_1INT);
|
||||
COMMAND(shiftweapon, ARG_1INT);
|
||||
|
||||
void reload(dynent *d)
|
||||
{
|
||||
if(!d) return;
|
||||
{
|
||||
if(!d) return;
|
||||
|
||||
bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0;
|
||||
|
||||
@@ -97,7 +97,7 @@ void reload(dynent *d)
|
||||
if(akimbo) playsoundc(S_RAKIMBO);
|
||||
else playsoundc(guns[d->gunselect].reload);
|
||||
};
|
||||
|
||||
|
||||
void selfreload() { reload(player1); };
|
||||
COMMANDN(reload, selfreload, ARG_NONE);
|
||||
|
||||
@@ -249,7 +249,7 @@ void hit(int target, int damage, dynent *d, dynent *at)
|
||||
}
|
||||
}
|
||||
}
|
||||
if(at->bIsBot) addmsg(1, 5, SV_BOT2CLIENTDMG, target, damage, d->lifesequence, PlayerIndex);
|
||||
if(at->bIsBot) addmsg(1, 5, SV_BOT2CLIENTDMG, target, damage, d->lifesequence, PlayerIndex);
|
||||
else addmsg(1, 4, SV_DAMAGE, target, damage, d->lifesequence);
|
||||
playsound(S_PAIN1+rnd(5), &d->o);
|
||||
};
|
||||
@@ -658,7 +658,7 @@ void shoot(dynent *d, vec &targ)
|
||||
d->lastattackgun = -1;
|
||||
return;
|
||||
};
|
||||
// End mod
|
||||
// End mod
|
||||
|
||||
if(d->gunselect) d->mag[d->gunselect]--;
|
||||
|
||||
@@ -699,16 +699,16 @@ void shoot(dynent *d, vec &targ)
|
||||
dynent *o = players[i];
|
||||
if(!o) continue;
|
||||
raydamage(o, from, to, d, i);
|
||||
};
|
||||
|
||||
// Added by Rick: raydamage on bots too
|
||||
loopv(bots)
|
||||
{
|
||||
dynent *o = bots[i];
|
||||
if(!o || (o == d)) continue;
|
||||
raydamage(o, from, to, d, i);
|
||||
};
|
||||
};
|
||||
|
||||
// Added by Rick: raydamage on bots too
|
||||
loopv(bots)
|
||||
{
|
||||
dynent *o = bots[i];
|
||||
if(!o || (o == d)) continue;
|
||||
raydamage(o, from, to, d, i);
|
||||
};
|
||||
// End add by Rick
|
||||
|
||||
|
||||
if(d->bIsBot) raydamage(player1, from, to, d, -1);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user