spawning in bot modes fixed, damageblend lock fixed, reloading locks weapon switch

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1507 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-27 15:14:53 +00:00
parent c85954a26f
commit da4a5ddfe6
6 changed files with 15 additions and 8 deletions
+3 -2
View File
@@ -333,10 +333,10 @@ void findplayerstart(playerent *d)
void spawnplayer(playerent *d)
{
findplayerstart(d);
d->respawn();
d->spawnstate(gamemode);
d->state = d==player1 && editmode ? CS_EDITING : CS_ALIVE;
findplayerstart(d);
}
void respawnself()
@@ -344,9 +344,10 @@ void respawnself()
if(m_mp(gamemode)) addmsg(SV_TRYSPAWN, "r");
else
{
showscores(false);
setscope(false);
spawnplayer(player1);
player1->lifesequence++;
showscores(false);
}
}
+1 -1
View File
@@ -5,7 +5,7 @@
void renderdocsection(void *menu, bool init);
extern hashtable<char *, ident> *idents;
extern hashtable<const char *, ident> *idents;
struct docargument
{
+1 -1
View File
@@ -323,7 +323,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
glVertex2i(0, VIRTH);
glEnd();
glDepthMask(GL_TRUE);
dblend -= max(0, curtime/3);
dblend = max(0, dblend-curtime/3);
}
glEnable(GL_TEXTURE_2D);
+1 -1
View File
@@ -303,7 +303,7 @@ void preload_playermodels()
void preload_entmodels()
{
extern char *entmdlnames[];
extern const char *entmdlnames[];
loopi(I_AKIMBO-I_CLIPS+1)
{
model *mdl = loadmodel(entmdlnames[i]);
+8 -3
View File
@@ -36,7 +36,11 @@ void weaponswitch(weapon *w)
w->onselecting();
}
void selectweapon(weapon *w) { if(w && w->selectable()) weaponswitch(w); }
void selectweapon(weapon *w)
{
if(w && w->selectable() && player1->weaponsel->deselectable())
weaponswitch(w);
}
void selectweaponi(int w)
{
@@ -637,8 +641,8 @@ void weapon::onselecting()
void weapon::renderhudmodel() { renderhudmodel(owner->lastaction); }
int weapon::dynspread() { return info.spread; }
float weapon::dynrecoil() { return info.recoil; }
bool weapon::selectable() { return !reloading && this != owner->weaponsel && owner->state == CS_ALIVE && !owner->weaponchanging; }
bool weapon::selectable() { return this != owner->weaponsel && owner->state == CS_ALIVE && !owner->weaponchanging; }
bool weapon::deselectable() { return !reloading; }
struct grenadeent : bounceent
@@ -752,6 +756,7 @@ struct grenades : weapon
from.mul(1.1f*owner->radius);
from.add(owner->o);
thrownade(from, vel, inhandnade);
owner->attacking = false;
}
void thrownade(const vec &from, const vec &vel, bounceent *p)
+1
View File
@@ -27,6 +27,7 @@ struct weapon
virtual int modelanim() = 0;
virtual void updatetimers();
virtual bool selectable();
virtual bool deselectable();
virtual void renderstats();
virtual void renderhudmodel();