extern float usermousesensitivity;
extern bool ismotionblur;
extern bool showdamagebar; // (des)activate the damage bar
-extern bool decals;
+extern bool decalstoggle;
extern bool skyboxtexture;
extern float skyboxr;
extern float skyboxg;
void Game::playdialoguescenesound()
{
XYZ temppos;
- temppos = Person::players[Dialog::currentScene().participantfocus]->coords;
+ temppos = Person::players.at(Dialog::currentScene().participantfocus)->coords;
temppos = temppos - viewer;
Normalise(&temppos);
temppos += viewer;
int closest = -1;
float closestdist = std::numeric_limits<float>::max();
- for (int i = 0; i < Object::objects.size(); i++) {
- float distance = distsq(&Object::objects[i]->position, &Person::players[0]->coords);
+ for (unsigned int i = 0; i < Object::objects.size(); i++) {
+ float distance = distsq(&Object::objects[i]->position,
+ &Person::players[0]->coords);
if (distance < closestdist) {
closestdist = distance;
- closest = i;
+ closest = (int) i;
}
}
return closest;
"Textures/Skybox(snow)/Down.jpg");
-
-
texdetail = temptexdetail;
} else if (environment == desertenvironment) {
windvector = 0;
"Textures/Skybox(sand)/Down.jpg");
-
-
texdetail = temptexdetail;
} else if (environment == grassyenvironment) {
windvector = 0;
"Textures/Skybox(grass)/Down.jpg");
-
texdetail = temptexdetail;
}
temptexdetail = texdetail;
texdetail = temptexdetail;
}
-void Game::Loadlevel(int which)
+bool Game::LoadLevel(int which)
{
stealthloading = 0;
whichlevel = which;
if (which == -1) {
- Loadlevel("tutorial", true);
+ return LoadLevel("tutorial", true);
} else if (which >= 0 && which <= 15) {
char buf[32];
snprintf(buf, 32, "map%d", which + 1); // challenges
- Loadlevel(buf);
- } else
- Loadlevel("mapsave");
+ return LoadLevel(buf);
+ } else {
+ return LoadLevel("mapsave");
+ }
}
-void Game::Loadlevel(const std::string& name, bool tutorial)
+bool Game::LoadLevel(const std::string& name, bool tutorial)
{
+ const std::string level_path = Folders::getResourcePath("Maps/" + name);
+ if (!Folders::file_exists(level_path)) {
+ perror(std::string("LoadLevel: Could not open file '" + level_path).c_str());
+ return false;
+ }
+
int indemo; // FIXME this should be removed
int templength;
float lamefloat;
int mapvers;
FILE *tfile;
errno = 0;
- tfile = Folders::openMandatoryFile( Folders::getResourcePath("Maps/"+name), "rb" );
+ tfile = Folders::openMandatoryFile(level_path, "rb");
pause_sound(stream_firesound);
scoreadded = 0;
freeze = 0;
winfreeze = 0;
- for (int i = 0; i < 100; i++)
+ for (unsigned char i = 0; i < 100; i++)
bonusnum[i] = 0;
numfalls = 0;
}
if (!stealthloading) {
- terrain.numdecals = 0;
+ terrain.decals.clear();
Sprite::deleteSprites();
for (int i = 0; i < subdivision; i++) {
funpackf(tfile, "Bi", &environment);
+ if (environment != oldenvironment)
+ Setenvironment(environment);
+ oldenvironment = environment;
+
Object::LoadObjectsFromFile(tfile, stealthloading);
if (mapvers >= 7) {
funpackf(tfile, "Bf Bf Bf Bf", &mapcenter.x, &mapcenter.y, &mapcenter.z, &mapradius);
SetUpLighting();
- if (environment != oldenvironment)
- Setenvironment(environment);
- oldenvironment = environment;
if (!stealthloading) {
Object::AddObjectsToTerrain();
oldmusicvolume[2] = 0;
oldmusicvolume[3] = 0;
- if (!firstload)
- firstload = 1;
-
leveltime = 0;
wonleveltime = 0;
visibleloading = false;
+
+ return true;
}
void doDevKeys()
/* Grow tree leaves?? */
if (Input::isKeyPressed(SDL_SCANCODE_Y)) {
- for (int i = 0; i < Object::objects.size(); i++) {
- if (Object::objects[i]->type == treeleavestype) {
- Object::objects[i]->scale *= .9;
+ for (auto& an_object : Object::objects) {
+ if (an_object->type == treeleavestype) {
+ an_object->scale *= .9;
}
}
}
void doJumpReversals()
{
- for (unsigned k = 0; k < Person::players.size(); k++)
- for (unsigned i = k; i < Person::players.size(); i++) {
- if (i == k)
- continue;
+ for (unsigned k = 0; k < Person::players.size(); k++) {
+ for (unsigned i = k + 1; i < Person::players.size(); i++) {
if ( Person::players[k]->skeleton.free == 0 &&
Person::players[i]->skeleton.oldfree == 0 &&
(Person::players[i]->animTarget == jumpupanim ||
}
}
}
+ }
}
void doAerialAcrobatics()
lowpointtarget = lowpoint + DoRotation(Person::players[k]->facing, 0, -90, 0) * 1.5;
XYZ tempcoords1 = lowpoint;
whichhit = Object::objects[i]->model.LineCheck(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw);
- if (whichhit != -1 && fabs(Object::objects[i]->model.facenormals[whichhit].y) < .3) {
- Person::players[k]->setAnimation(walljumpleftanim);
+ if (whichhit != -1 && fabs(Object::objects[i]->model.Triangles[whichhit].facenormal.y) < .3) {
+ Person::players[k]->setTargetAnimation(walljumpleftanim);
emit_sound_at(movewhooshsound, Person::players[k]->coords);
if (k == 0)
pause_sound(whooshsound);
- lowpointtarget = DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[i]->yaw, 0);
+ lowpointtarget = DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[i]->yaw, 0);
Person::players[k]->yaw = -asin(0 - lowpointtarget.x) * 180 / M_PI;
if (lowpointtarget.z < 0)
Person::players[k]->yaw = 180 - Person::players[k]->yaw;
lowpoint = tempcoords1;
lowpointtarget = lowpoint + DoRotation(Person::players[k]->facing, 0, 90, 0) * 1.5;
whichhit = Object::objects[i]->model.LineCheck(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw);
- if (whichhit != -1 && fabs(Object::objects[i]->model.facenormals[whichhit].y) < .3) {
- Person::players[k]->setAnimation(walljumprightanim);
+ if (whichhit != -1 && fabs(Object::objects[i]->model.Triangles[whichhit].facenormal.y) < .3) {
+ Person::players[k]->setTargetAnimation(walljumprightanim);
emit_sound_at(movewhooshsound, Person::players[k]->coords);
if (k == 0)
pause_sound(whooshsound);
- lowpointtarget = DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[i]->yaw, 0);
+ lowpointtarget = DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[i]->yaw, 0);
Person::players[k]->yaw = -asin(0 - lowpointtarget.x) * 180 / M_PI;
if (lowpointtarget.z < 0)
Person::players[k]->yaw = 180 - Person::players[k]->yaw;
lowpoint = tempcoords1;
lowpointtarget = lowpoint + Person::players[k]->facing * 2;
whichhit = Object::objects[i]->model.LineCheck(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw);
- if (whichhit != -1 && fabs(Object::objects[i]->model.facenormals[whichhit].y) < .3) {
- Person::players[k]->setAnimation(walljumpbackanim);
+ if (whichhit != -1 && fabs(Object::objects[i]->model.Triangles[whichhit].facenormal.y) < .3) {
+ Person::players[k]->setTargetAnimation(walljumpbackanim);
emit_sound_at(movewhooshsound, Person::players[k]->coords);
if (k == 0)
pause_sound(whooshsound);
- lowpointtarget = DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[i]->yaw, 0);
+ lowpointtarget = DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[i]->yaw, 0);
Person::players[k]->yaw = -asin(0 - lowpointtarget.x) * 180 / M_PI;
if (lowpointtarget.z < 0)
Person::players[k]->yaw = 180 - Person::players[k]->yaw;
lowpoint = tempcoords1;
lowpointtarget = lowpoint - Person::players[k]->facing * 2;
whichhit = Object::objects[i]->model.LineCheck(&lowpoint, &lowpointtarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw);
- if (whichhit != -1 && fabs(Object::objects[i]->model.facenormals[whichhit].y) < .3) {
- Person::players[k]->setAnimation(walljumpfrontanim);
+ if (whichhit != -1 && fabs(Object::objects[i]->model.Triangles[whichhit].facenormal.y) < .3) {
+ Person::players[k]->setTargetAnimation(walljumpfrontanim);
emit_sound_at(movewhooshsound, Person::players[k]->coords);
if (k == 0)
pause_sound(whooshsound);
- lowpointtarget = DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[i]->yaw, 0);
+ lowpointtarget = DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[i]->yaw, 0);
Person::players[k]->yaw = -asin(0 - lowpointtarget.x) * 180 / M_PI;
if (lowpointtarget.z < 0)
Person::players[k]->yaw = 180 - Person::players[k]->yaw;
lowpoint.y += (float)j / 13;
lowpointtarget = lowpoint + facing * 1.3;
flatfacing = Person::players[k]->coords;
- Person::players[k]->coords = colpoint - DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[k]->yaw, 0) * .01;
+ Person::players[k]->coords = colpoint - DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[k]->yaw, 0) * .01;
Person::players[k]->coords.y = lowpointtarget.y - .07;
Person::players[k]->currentoffset = (flatfacing - Person::players[k]->coords) / Person::players[k]->scale;
}
emit_sound_at(jumpsound, Person::players[k]->coords, 128.);
- lowpointtarget = DoRotation(Object::objects[i]->model.facenormals[whichhit], 0, Object::objects[i]->yaw, 0);
+ lowpointtarget = DoRotation(Object::objects[i]->model.Triangles[whichhit].facenormal, 0, Object::objects[i]->yaw, 0);
Person::players[k]->yaw = -asin(0 - lowpointtarget.x) * 180 / M_PI;
if (lowpointtarget.z < 0)
Person::players[k]->yaw = 180 - Person::players[k]->yaw;
Person::players[k]->frameTarget = 1;
//hang ledge (?)
if (j > 25) {
- Person::players[k]->setAnimation(hanganim);
+ Person::players[k]->setTargetAnimation(hanganim);
Person::players[k]->jumppower = 0;
}
}
//stagger off ledge (?)
if (Person::players[k]->animTarget == staggerbackhighanim || Person::players[k]->animTarget == staggerbackhardanim)
Person::players[k]->RagDoll(0);
- Person::players[k]->setAnimation(jumpdownanim);
+ Person::players[k]->setTargetAnimation(jumpdownanim);
if (!k)
emit_sound_at(whooshsound, Person::players[k]->coords, 128.);
Person::players[i]->animTarget == staffhitanim ||
Person::players[i]->animTarget == staffspinhitanim)
if (distsq(&Person::players[k]->coords, &Person::players[i]->coords) < 6.5 && !Person::players[i]->skeleton.free) {
- Person::players[k]->setAnimation(dodgebackanim);
+ Person::players[k]->setTargetAnimation(dodgebackanim);
Person::players[k]->targetyaw = roughDirectionTo(Person::players[k]->coords, Person::players[i]->coords);
Person::players[k]->targettilt2 = pitchTo(Person::players[k]->coords, Person::players[i]->coords);
}
if (Person::players[k]->animTarget != dodgebackanim) {
if (k == 0)
numflipped++;
- Person::players[k]->setAnimation(backhandspringanim);
+ Person::players[k]->setTargetAnimation(backhandspringanim);
Person::players[k]->targetyaw = -yaw + 180;
if (Person::players[k]->leftkeydown)
Person::players[k]->targetyaw -= 45;
Person::players[i]->skeleton.free &&
Person::players[i]->skeleton.longdead > 1000) {
Person::players[k]->animTarget = killanim;
- //TODO: refactor this out, what does it do?
- for (int j = 0; j < terrain.numdecals; j++) {
- if ((terrain.decaltype[j] == blooddecal || terrain.decaltype[j] == blooddecalslow) &&
- terrain.decalalivetime[j] < 2)
- terrain.DeleteDecal(j);
- }
- for (int l = 0; l < Object::objects.size(); l++) {
- if (Object::objects[l]->model.type == decalstype)
- for (int j = 0; j < Object::objects[l]->model.numdecals; j++) {
- if ((Object::objects[l]->model.decaltype[j] == blooddecal ||
- Object::objects[l]->model.decaltype[j] == blooddecalslow) &&
- Object::objects[l]->model.decalalivetime[j] < 2)
- Object::objects[l]->model.DeleteDecal(j);
- }
+ terrain.deleteDeadDecals();
+ for (unsigned int l = 0; l < Object::objects.size(); l++) {
+ if (Object::objects[l]->model.type == decalstype) {
+ Object::objects[l]->model.deleteDeadDecals();
+ }
}
}
if (!Person::players[i]->dead || musictype != 2)
Person::players[i]->skeleton.free) &&
(!Person::players[i]->dead || musictype != stream_fighttheme)) {
Person::players[k]->animTarget = dropkickanim;
- for (int j = 0; j < terrain.numdecals; j++) {
- if ((terrain.decaltype[j] == blooddecal || terrain.decaltype[j] == blooddecalslow) &&
- terrain.decalalivetime[j] < 2) {
- terrain.DeleteDecal(j);
+ terrain.deleteDeadDecals();
+ for (unsigned int l = 0; l < Object::objects.size(); l++) {
+ if (Object::objects[l]->model.type == decalstype) {
+ Object::objects[l]->model.deleteDeadDecals();
}
}
- for (int l = 0; l < Object::objects.size(); l++) {
- if (Object::objects[l]->model.type == decalstype)
- for (int j = 0; j < Object::objects[l]->model.numdecals; j++) {
- if ((Object::objects[l]->model.decaltype[j] == blooddecal ||
- Object::objects[l]->model.decaltype[j] == blooddecalslow) &&
- Object::objects[l]->model.decalalivetime[j] < 2) {
- Object::objects[l]->model.DeleteDecal(j);
- }
- }
- }
}
}
if (Animation::animations[Person::players[k]->animTarget].attack == normalattack &&
Person::players[k]->rabbitkickenabled) ||
Person::players[k]->jumpkeydown)) {
oldattackkey = 1;
- Person::players[k]->setAnimation(rabbitkickanim);
+ Person::players[k]->setTargetAnimation(rabbitkickanim);
}
//update counts
if (Animation::animations[Person::players[k]->animTarget].attack && k == 0) {
if (Person::players[k]->howactive == typeactive || hostile)
if (Person::players[k]->isIdle()) {
if (Person::players[k]->howactive < typesleeping)
- Person::players[k]->setAnimation(Person::players[k]->getStop());
+ Person::players[k]->setTargetAnimation(Person::players[k]->getStop());
else if (Person::players[k]->howactive == typesleeping)
- Person::players[k]->setAnimation(getupfromfrontanim);
+ Person::players[k]->setTargetAnimation(getupfromfrontanim);
if (!editorenabled)
Person::players[k]->howactive = typeactive;
}
if (Person::players[i]->howactive == typeactive || hostile)
if (Person::players[i]->isIdle()) {
if (Person::players[i]->howactive < typesleeping)
- Person::players[i]->setAnimation(Person::players[k]->getStop());
+ Person::players[i]->setTargetAnimation(Person::players[k]->getStop());
else
- Person::players[i]->setAnimation(getupfromfrontanim);
+ Person::players[i]->setTargetAnimation(getupfromfrontanim);
if (!editorenabled)
Person::players[i]->howactive = typeactive;
}
hostile = 1;
}
- if (Person::players[Dialog::currentScene().participantfocus]->dead) {
+ if (Person::players.at(Dialog::currentScene().participantfocus)->dead) {
Dialog::indialogue = -1;
Dialog::directing = false;
cameramode = 0;
Person::players[i]->avoidsomething = 0;
//avoid flaming things
- for (int j = 0; j < Object::objects.size(); j++)
+ for (unsigned int j = 0; j < Object::objects.size(); j++)
if (Object::objects[j]->onfire)
if (distsq(&Person::players[i]->coords, &Object::objects[j]->position) < sq(Object::objects[j]->scale) * 200)
if ( distsq(&Person::players[i]->coords, &Object::objects[j]->position) <
Person::players[i]->isIdle() ||
Person::players[i]->aitype != playercontrolled) {
Person::players[i]->throwtogglekeydown = 1;
- Person::players[i]->setAnimation(crouchremoveknifeanim);
+ Person::players[i]->setTargetAnimation(crouchremoveknifeanim);
Person::players[i]->targetyaw = roughDirectionTo(Person::players[i]->coords, weapons[j].position);
Person::players[i]->hasvictim = 0;
}
Person::players[i]->coords.y < weapons[j].position.y) {
if (!Person::players[i]->isFlip()) {
Person::players[i]->throwtogglekeydown = 1;
- Person::players[i]->setAnimation(removeknifeanim);
+ Person::players[i]->setTargetAnimation(removeknifeanim);
Person::players[i]->targetyaw = roughDirectionTo(Person::players[i]->coords, weapons[j].position);
}
if (Person::players[i]->isFlip()) {
Person::players[i]->throwtogglekeydown = 1;
Person::players[i]->victim = Person::players[j];
Person::players[i]->hasvictim = 1;
- Person::players[i]->setAnimation(crouchremoveknifeanim);
+ Person::players[i]->setTargetAnimation(crouchremoveknifeanim);
Person::players[i]->targetyaw = roughDirectionTo(Person::players[i]->coords, Person::players[j]->coords);
}
if (Person::players[i]->animTarget == rollanim || Person::players[i]->animTarget == backhandspringanim) {
if (!Person::players[i]->isFlip()) {
Person::players[i]->throwtogglekeydown = 1;
Person::players[i]->victim = Person::players[j];
- Person::players[i]->setAnimation(knifethrowanim);
+ Person::players[i]->setTargetAnimation(knifethrowanim);
Person::players[i]->targetyaw = roughDirectionTo(Person::players[i]->coords, Person::players[j]->coords);
Person::players[i]->targettilt2 = pitchTo(Person::players[i]->coords, Person::players[j]->coords);
}
isgood = false;
if (isgood && Person::players[i]->creature != wolftype) {
if (Person::players[i]->isIdle() && Person::players[i]->num_weapons && weapons[Person::players[i]->weaponids[0]].getType() == knife) {
- Person::players[i]->setAnimation(drawrightanim);
+ Person::players[i]->setTargetAnimation(drawrightanim);
Person::players[i]->drawtogglekeydown = 1;
}
if ((Person::players[i]->isIdle() ||
Person::players[i]->isRun())) &&
Person::players[i]->num_weapons &&
weapons[Person::players[i]->weaponids[0]].getType() == sword) {
- Person::players[i]->setAnimation(drawleftanim);
+ Person::players[i]->setTargetAnimation(drawleftanim);
Person::players[i]->drawtogglekeydown = 1;
}
if (Person::players[i]->isCrouch() && Person::players[i]->num_weapons && weapons[Person::players[i]->weaponids[0]].getType() == knife) {
- Person::players[i]->setAnimation(crouchdrawrightanim);
+ Person::players[i]->setTargetAnimation(crouchdrawrightanim);
Person::players[i]->drawtogglekeydown = 1;
}
}
Person::players[i]->attackkeydown &&
musictype != stream_fighttheme) {
if (weapons[Person::players[i]->weaponids[Person::players[i]->weaponactive]].getType() == knife)
- Person::players[i]->setAnimation(crouchstabanim);
+ Person::players[i]->setTargetAnimation(crouchstabanim);
if (weapons[Person::players[i]->weaponids[Person::players[i]->weaponactive]].getType() == sword)
- Person::players[i]->setAnimation(swordgroundstabanim);
+ Person::players[i]->setTargetAnimation(swordgroundstabanim);
Person::players[i]->hasvictim = 0;
}
}
Person::players[i]->lowreversaldelay = .5;
if (Person::players[i]->isIdle()) {
- Person::players[i]->setAnimation(Person::players[i]->getCrouch());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getCrouch());
Person::players[i]->transspeed = 10;
}
if (Person::players[i]->isRun() ||
Person::players[i]->rightkeydown ||
Person::players[i]->forwardkeydown ||
Person::players[i]->backkeydown))) {
- Person::players[i]->setAnimation(rollanim);
+ Person::players[i]->setTargetAnimation(rollanim);
Person::players[i]->transspeed = 20;
}
}
Person::players[i]->animCurrent = Person::players[i]->getCrouch();
Person::players[i]->frameCurrent = 0;
}
- Person::players[i]->setAnimation(Person::players[i]->getIdle());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getIdle());
Person::players[i]->transspeed = 10;
}
}
if (Person::players[i]->animTarget == sneakanim) {
- Person::players[i]->setAnimation(Person::players[i]->getIdle());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getIdle());
Person::players[i]->transspeed = 10;
}
}
!Person::players[i]->jumpkeydown &&
Person::players[i]->crouchkeydown)) {
if (Person::players[i]->aitype == passivetype)
- Person::players[i]->setAnimation(walkanim);
+ Person::players[i]->setTargetAnimation(walkanim);
else
- Person::players[i]->setAnimation(Person::players[i]->getRun());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getRun());
}
if (Person::players[i]->isCrouch()) {
Person::players[i]->animTarget = sneakanim;
Person::players[i]->frameTarget = 0;
}
if (Person::players[i]->animTarget == hanganim/*&&(!Person::players[i]->forwardstogglekeydown||Person::players[i]->aitype!=playercontrolled)*/) {
- Person::players[i]->setAnimation(climbanim);
+ Person::players[i]->setTargetAnimation(climbanim);
Person::players[i]->frameTarget = 1;
Person::players[i]->jumpclimb = 1;
}
Person::players[i]->frameTarget > 0 &&
!Person::players[i]->jumpkeydown &&
Person::players[i]->crouchkeydown)) {
- Person::players[i]->setAnimation(Person::players[i]->getRun());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getRun());
}
if (Person::players[i]->isCrouch()) {
Person::players[i]->animTarget = sneakanim;
Person::players[i]->frameTarget > 0 &&
!Person::players[i]->jumpkeydown &&
Person::players[i]->crouchkeydown)) {
- Person::players[i]->setAnimation(Person::players[i]->getRun());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getRun());
}
if (Person::players[i]->isCrouch()) {
Person::players[i]->animTarget = sneakanim;
Person::players[i]->frameTarget > 0 &&
!Person::players[i]->jumpkeydown &&
Person::players[i]->crouchkeydown)) {
- Person::players[i]->setAnimation(Person::players[i]->getRun());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getRun());
}
if (Person::players[i]->isCrouch()) {
Person::players[i]->animTarget = sneakanim;
((Person::players[i]->animTarget != rabbitrunninganim &&
Person::players[i]->animTarget != wolfrunninganim) || i != 0)) {
Person::players[i]->jumpstart = 0;
- Person::players[i]->setAnimation(jumpupanim);
+ Person::players[i]->setTargetAnimation(jumpupanim);
Person::players[i]->yaw = Person::players[i]->targetyaw;
Person::players[i]->transspeed = 20;
Person::players[i]->FootLand(leftfoot, 1);
emit_sound_at(jumpsound, Person::players[i]->coords, 128.);
}
if ((Person::players[i]->isIdle()) && Person::players[i]->jumppower > 1) {
- Person::players[i]->setAnimation(Person::players[i]->getLanding());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getLanding());
Person::players[i]->frameTarget = 2;
Person::players[i]->landhard = 0;
Person::players[i]->jumpstart = 1;
}
if (!movekey) {
- if (Person::players[i]->isRun() || Person::players[i]->animTarget == walkanim)
- Person::players[i]->setAnimation(Person::players[i]->getStop());
+ if (Person::players[i]->isRun() || Person::players[i]->animTarget == walkanim) {
+ Person::players[i]->setTargetAnimation(Person::players[i]->getStop());
+ }
if (Person::players[i]->animTarget == sneakanim) {
Person::players[i]->animTarget = Person::players[i]->getCrouch();
- if (Person::players[i]->animCurrent == sneakanim)
+ if (Person::players[i]->animCurrent == sneakanim) {
Person::players[i]->target = 0;
+ }
Person::players[i]->frameTarget = 0;
}
}
Person::players[i]->aitype == searchtype ||
(Person::players[i]->aitype == passivetype &&
Person::players[i]->numwaypoints <= 1)))
- Person::players[i]->setAnimation(Person::players[i]->getStop());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getStop());
if (Person::players[i]->isRun() && (Person::players[i]->aitype == passivetype))
- Person::players[i]->setAnimation(Person::players[i]->getStop());
+ Person::players[i]->setTargetAnimation(Person::players[i]->getStop());
}
}
if (Person::players[i]->animTarget == rollanim)
//stop to turn in right direction
if (fabs(Person::players[k]->yaw - Person::players[k]->targetyaw) > 90 && (Person::players[k]->isRun() || Person::players[k]->animTarget == walkanim))
- Person::players[k]->setAnimation(Person::players[k]->getStop());
+ Person::players[k]->setTargetAnimation(Person::players[k]->getStop());
if (Person::players[k]->animTarget == backhandspringanim || Person::players[k]->animTarget == dodgebackanim)
Person::players[k]->targettilt = 0;
Person::players[i]->aitype == getweapontype ||
Person::players[i]->aitype == gethelptype ||
Person::players[i]->aitype == searchtype) &&
- !Person::players[i]->dead/*&&Person::players[i]->surprised<=0*/ &&
+ !Person::players[i]->dead &&
(Person::players[i]->animTarget != sneakattackedanim &&
Person::players[i]->animTarget != knifesneakattackedanim &&
Person::players[i]->animTarget != swordsneakattackedanim)) {
if (!Person::players[0]->dead && targetlevel != whichlevel)
startbonustotal = bonustotal;
- if (Person::players[0]->dead)
- Loadlevel(whichlevel);
- else
- Loadlevel(targetlevel);
+ LoadLevel(targetlevel);
fireSound();
loading = 3;
fireSound(firestartsound);
- Loadlevel(campaignlevels[Account::active().getCampaignChoicesMade()].mapname.c_str());
+ LoadLevel(campaignlevels[Account::active().getCampaignChoicesMade()].mapname.c_str());
fireSound();
loading = 2;
loadtime = 0;
targetlevel = 7;
- if (!firstload)
+ if (!firstLoadDone) {
LoadStuff();
+ }
whichchoice = 0;
actuallevel = campaignlevels[actuallevel].nextlevel.front();
visibleloading = true;
stillloading = 1;
- Loadlevel(campaignlevels[actuallevel].mapname.c_str());
+ LoadLevel(campaignlevels[actuallevel].mapname.c_str());
campaign = 1;
mainmenu = 0;
gameon = 1;
projects / lugaru.git / blobdiff