*** empty log message ***
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1472 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -132,7 +132,8 @@ void deathstate(playerent *pl)
|
||||
{
|
||||
pl->state = CS_DEAD;
|
||||
pl->lastpain = pl->lastaction = lastmillis;
|
||||
pl->move = pl->pitch = pl->strafe = pl->roll = 0;
|
||||
pl->move = pl->strafe = 0;
|
||||
pl->pitch = pl->roll = 0;
|
||||
pl->attacking = false;
|
||||
|
||||
if(pl == player1)
|
||||
@@ -833,4 +834,5 @@ COMMAND(followplayer, ARG_1INT);
|
||||
COMMAND(toggledeathcam, ARG_NONE);
|
||||
|
||||
int isalive() { return player1->state==CS_ALIVE ? 1 : 0; }
|
||||
COMMANDN(alive, isalive, ARG_1EXP);
|
||||
COMMANDN(alive, isalive, ARG_1EXP);
|
||||
|
||||
|
||||
@@ -402,4 +402,5 @@ void scriptcontext(char *context, char *idname)
|
||||
void sealcontexts() { contextsealed = true; }
|
||||
|
||||
COMMAND(scriptcontext, ARG_2STR);
|
||||
COMMAND(sealcontexts, ARG_NONE);
|
||||
COMMAND(sealcontexts, ARG_NONE);
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ struct consolebuffer
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~consolebuffer() {}
|
||||
|
||||
virtual void render() = 0;
|
||||
};
|
||||
|
||||
|
||||
+3
-1
@@ -95,7 +95,6 @@ struct physent
|
||||
float maxspeed; // cubes per second, 24 for player
|
||||
int timeinair; // used for fake gravity
|
||||
float radius, eyeheight, aboveeye; // bounding box size
|
||||
virtual float dyneyeheight() { return crouching ? eyeheight*3.0f/4.0f : eyeheight; }
|
||||
bool inwater;
|
||||
bool onfloor, onladder, jumpnext, crouching;
|
||||
char move, strafe;
|
||||
@@ -106,6 +105,7 @@ struct physent
|
||||
{
|
||||
reset();
|
||||
}
|
||||
virtual ~physent() {}
|
||||
|
||||
void reset()
|
||||
{
|
||||
@@ -114,6 +114,8 @@ struct physent
|
||||
timeinair = 0;
|
||||
onfloor = onladder = inwater = jumpnext = crouching = false;
|
||||
}
|
||||
|
||||
virtual float dyneyeheight() { return crouching ? eyeheight*3.0f/4.0f : eyeheight; }
|
||||
};
|
||||
|
||||
struct dynent : physent // animated ent
|
||||
|
||||
@@ -175,7 +175,7 @@ struct hudmessages : consolebuffer
|
||||
{
|
||||
cline &c = conlines[i];
|
||||
int tw = text_width(c.cref);
|
||||
draw_text(c.cref, tw > VIRTW*0.8f ? 0 : (VIRTW*0.8f-tw)/2, ((VIRTH*0.8f)/4*3)+FONTH*i+pow((lastmillis-c.millis)/(float)dispmillis, 4)*VIRTH*0.8f/4.0f);
|
||||
draw_text(c.cref, int(tw > VIRTW*0.8f ? 0 : (VIRTW*0.8f-tw)/2), int(((VIRTH*0.8f)/4*3)+FONTH*i+pow((lastmillis-c.millis)/(float)dispmillis, 4)*VIRTH*0.8f/4.0f));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -291,7 +291,7 @@ void checkplayerloopsounds()
|
||||
// sync to model animation
|
||||
int basetime = -((int)(size_t)p&0xFFF);
|
||||
int time = lastmillis-basetime;
|
||||
int speed = 1860/p->maxspeed;
|
||||
int speed = int(1860/p->maxspeed);
|
||||
// TODO: share with model code
|
||||
if(time%speed < footstepalign) playsound(S_FOOTSTEPS, p);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user