*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@256 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-04-26 14:51:25 +00:00
parent ce58f07a34
commit 0ea4dac469
11 changed files with 199 additions and 1309 deletions
+12 -9
View File
@@ -55,7 +55,7 @@ void renderentities()
{
if(!e.spawned) continue;
if(e.type<I_CLIPS || e.type>I_AKIMBO) continue;
renderent(e, entmdlnames[e.type-I_CLIPS], (float)(1+sin(lastmillis/100.0+e.x+e.y)/20), lastmillis/10.0f);
renderent(e, entmdlnames[e.type-I_CLIPS], (float)(1+sin(lastmillis/100.0+e.x+e.y)/20), lastmillis/10.0f);
}
else switch(e.attr2)
{
@@ -113,6 +113,8 @@ void radditem(int i, int &v, int t)
if(v>is.max) v = is.max;
playsoundc(is.sound);
};
extern void secondary();
void realpickup(int n, dynent *d)
{
@@ -141,8 +143,9 @@ void realpickup(int n, dynent *d)
case I_AKIMBO:
d->akimbo = true;
d->mag[GUN_PISTOL] = 16;
radditem(n, d->ammo[1], 9);
d->mag[GUN_PISTOL] = 16;
radditem(n, d->ammo[1], 9);
secondary();
conoutf("a lesser man would use a single pistol");
break;
};
@@ -319,7 +322,6 @@ void item(int num)
//if (num==6) conoutf("sorry, no nades yet");
if (num==7) { player1->hasarmour=!player1->hasarmour; /*toggle armour*/ };
};
void weapon(int num)
@@ -333,13 +335,14 @@ void weapon(int num)
radd(player1);
}
gun_changed = true;
}
};
COMMAND(weapon, ARG_1INT);
COMMAND(item,ARG_1INT);
void akimbo(void)
void akimbo()
{
conoutf("akimbo=%d",player1->akimbo);
};
COMMAND(akimbo, ARG_NONE);
};
COMMAND(akimbo, ARG_NONE);
COMMAND(weapon, ARG_1INT);