mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 18:36:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/XProger/master'

Browse Source
This commit is contained in:
Gh0stBlade
2017-05-14 20:39:39 +01:00
parent 6cce1fea62 10c31fee39
commit 9c95d6fc3a
1 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/lara.h
View File

@@ -1513,6 +1513,7 @@ struct Lara : Character {
} }
virtual int getStateGround() { virtual int getStateGround() {
int res = STATE_STOP;
angle.x = 0.0f; angle.x = 0.0f;
if ((state == STATE_STOP || state == STATE_TREAD) && (input & ACTION) && emptyHands() && doPickUp()) if ((state == STATE_STOP || state == STATE_TREAD) && (input & ACTION) && emptyHands() && doPickUp())
@@ -1547,7 +1548,6 @@ struct Lara : Character {
// ready to jump // ready to jump
if (state == STATE_COMPRESS) { if (state == STATE_COMPRESS) {
int res;
float ext = angle.y; float ext = angle.y;
switch (input & (RIGHT | LEFT | FORTH | BACK)) { switch (input & (RIGHT | LEFT | FORTH | BACK)) {
case RIGHT : res = STATE_RIGHT_JUMP; ext += PI * 0.5f; break; case RIGHT : res = STATE_RIGHT_JUMP; ext += PI * 0.5f; break;
@@ -1582,11 +1582,35 @@ struct Lara : Character {
// walk button is pressed // walk button is pressed
if ((input & WALK) && animation.index != ANIM_RUN_START) { if ((input & WALK) && animation.index != ANIM_RUN_START) {
if (input & FORTH) return STATE_WALK; float ext = angle.y;
if (input & BACK) return STATE_BACK;
if (input & LEFT) return STATE_STEP_LEFT; if (input & FORTH) {
if (input & RIGHT) return STATE_STEP_RIGHT; res = STATE_WALK;
return STATE_STOP; } else if (input & BACK) {
res = STATE_BACK;
ext += PI;
} else if (input & LEFT) {
res = STATE_STEP_LEFT;
ext -= PI * 0.5f;
} else if (input & RIGHT) {
res = STATE_STEP_RIGHT;
ext += PI * 0.5f;
}
int maxAscent = 256 + 128;
int maxDescent = maxAscent;
if (state == STATE_STEP_LEFT || state == STATE_STEP_RIGHT)
maxAscent = maxDescent = 64;
if (state == STATE_STOP && res != STATE_STOP) {
vec3 p = pos;
collision = Collision(level, getRoomIndex(), p, vec3(0.0f), vec3(0.0f), LARA_RADIUS * 1.1f, ext, 0, LARA_HEIGHT, maxAscent, maxDescent);
if (collision.side == Collision::FRONT)
res = STATE_STOP;
}
return res;
} }
if ((input & ACTION) && emptyHands()) { if ((input & ACTION) && emptyHands()) {
@@ -1602,9 +1626,11 @@ struct Lara : Character {
} }
// only dpad buttons pressed // only dpad buttons pressed
if (input & FORTH) return STATE_RUN; if (input & FORTH)
if (input & BACK) return STATE_FAST_BACK; res = STATE_RUN;
if (input & (LEFT | RIGHT)) { else if (input & BACK)
res = STATE_FAST_BACK;
else if (input & (LEFT | RIGHT)) {
if (state == STATE_FAST_TURN) if (state == STATE_FAST_TURN)
return state; return state;
@@ -1612,7 +1638,15 @@ struct Lara : Character {
if (input & RIGHT) return (state == STATE_TURN_RIGHT && animation.prev == animation.index) ? STATE_FAST_TURN : STATE_TURN_RIGHT; if (input & RIGHT) return (state == STATE_TURN_RIGHT && animation.prev == animation.index) ? STATE_FAST_TURN : STATE_TURN_RIGHT;
} }
return STATE_STOP; if (state == STATE_STOP && res != STATE_STOP) {
float ext = angle.y + (res == STATE_RUN ? 0.0f : PI);
vec3 p = pos;
collision = Collision(level, getRoomIndex(), p, vec3(0.0f), vec3(0.0f), LARA_RADIUS * 1.1f, ext, 0, LARA_HEIGHT, 256 + 128, 0xFFFFFF);
if (collision.side == Collision::FRONT)
res = STATE_STOP;
}
return res;
} }
void slideStart() { void slideStart() {