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

pickup and armour fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@34 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
arghvark
2005-08-23 16:02:53 +00:00
parent 407befc0f3
commit 50ed00160b
10 changed files with 152 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+14 -11
View File
@@ -111,11 +111,11 @@ void realpickup(int n, dynent *d)
case I_ARMOUR:
radditem(n, d->armour, 8);
d->armourtype = A_YELLOW;
//d->hasarmour = true;
break;
case I_QUAD:
radditem(n, d->quadmillis, 9);
//radditem(n, d->quadmillis, 9);
conoutf("a lesser man would use a single pistol");
break;
};
@@ -167,7 +167,7 @@ void pickup(int n, dynent *d)
break;
case I_QUAD:
additem(n, d->quadmillis, 60, 9);
//additem(n, d->quadmillis, 60, 9);
break;
case CARROT:
@@ -225,22 +225,25 @@ void radd(dynent *d)
}
else if (d->primary==GUN_GRENADE)
{
conoutf("you don't have to worry about blowing your hand off just yet...");
//conoutf("you don't have to worry about blowing your hand off just yet...");
}
if (d->armour)
if (d->hasarmour)
{
d->armour = 100;
if(gamemode==m_arena)
d->armour = 100;
}
};
void add(int num)
void item(int num)
{
if (num>0 && num<6) player1->nextprimary = num;
if (num==6) conoutf("sorry, no nades yet");
if (num==7) { player1->hasarmour=!player1->hasarmour; /*toggle armour*/ };
if (num>0 && num<8) player1->nextprimary = num;
};
COMMAND(add,ARG_1INT);
COMMAND(item,ARG_1INT);