X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=a400c22321826144d3cb1db681c1c42408d54e67;hb=31191d0c0118f6abfccd7bf3ecc13bbfef3fa335;hp=e4fb6401d5b9cb5a8a883da45f34e476fe764095;hpb=9d126720312b8fa13279c144b2f74bc3d2c66fd9;p=lugaru.git
diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index e4fb640..a400c22 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -34,6 +34,7 @@ along with Lugaru. If not, see .
#include "User/Settings.hpp"
#include "Utils/Folders.hpp"
#include "Utils/Input.hpp"
+#include "Tutorial.hpp"
#if PLATFORM_UNIX
#include
@@ -112,12 +113,7 @@ extern float skyboxlightb;
extern float fadestart;
extern float slomospeed;
extern float slomofreq;
-extern int tutoriallevel;
extern float smoketex;
-extern float tutorialstagetime;
-extern int tutorialstage;
-extern float tutorialmaxtime;
-extern float tutorialsuccess;
extern bool againbonus;
extern bool reversaltrain;
extern bool canattack;
@@ -418,70 +414,6 @@ int findPathDist(int start, int end)
return smallestcount;
}
-int Game::checkcollide(XYZ startpoint, XYZ endpoint)
-{
- float minx, minz, maxx, maxz, miny, maxy;
-
- minx = min(startpoint.x, endpoint.x) - 1;
- miny = min(startpoint.y, endpoint.y) - 1;
- minz = min(startpoint.z, endpoint.z) - 1;
- maxx = max(startpoint.x, endpoint.x) + 1;
- maxy = max(startpoint.y, endpoint.y) + 1;
- maxz = max(startpoint.z, endpoint.z) + 1;
-
- for (int i = 0; i < Object::objects.size(); i++) {
- if (checkcollide(startpoint, endpoint, i, minx, miny, minz, maxx, maxy, maxz) != -1) {
- return i;
- }
- }
-
- return -1;
-}
-
-int Game::checkcollide(XYZ startpoint, XYZ endpoint, int what)
-{
- float minx, minz, maxx, maxz, miny, maxy;
-
- minx = min(startpoint.x, endpoint.x) - 1;
- miny = min(startpoint.y, endpoint.y) - 1;
- minz = min(startpoint.z, endpoint.z) - 1;
- maxx = max(startpoint.x, endpoint.x) + 1;
- maxy = max(startpoint.y, endpoint.y) + 1;
- maxz = max(startpoint.z, endpoint.z) + 1;
-
- return checkcollide(startpoint, endpoint, what, minx, miny, minz, maxx, maxy, maxz);
-}
-
-int Game::checkcollide(XYZ startpoint, XYZ endpoint, int what, float minx, float miny, float minz, float maxx, float maxy, float maxz)
-{
- XYZ colpoint, colviewer, coltarget;
-
- if (what == 1000) {
- if (terrain.lineTerrain(startpoint, endpoint, &colpoint) != -1) {
- return what;
- }
- } else {
- if ( Object::objects[what]->position.x > minx - Object::objects[what]->model.boundingsphereradius &&
- Object::objects[what]->position.x < maxx + Object::objects[what]->model.boundingsphereradius &&
- Object::objects[what]->position.y > miny - Object::objects[what]->model.boundingsphereradius &&
- Object::objects[what]->position.y < maxy + Object::objects[what]->model.boundingsphereradius &&
- Object::objects[what]->position.z > minz - Object::objects[what]->model.boundingsphereradius &&
- Object::objects[what]->position.z < maxz + Object::objects[what]->model.boundingsphereradius) {
- if ( Object::objects[what]->type != treeleavestype &&
- Object::objects[what]->type != bushtype &&
- Object::objects[what]->type != firetype) {
- colviewer = startpoint;
- coltarget = endpoint;
- if (Object::objects[what]->model.LineCheck(&colviewer, &coltarget, &colpoint, &Object::objects[what]->position, &Object::objects[what]->yaw) != -1) {
- return what;
- }
- }
- }
- }
-
- return -1;
-}
-
void Setenvironment(int which)
{
LOGFUNC;
@@ -614,8 +546,7 @@ void Game::Loadlevel(int which)
whichlevel = which;
if (which == -1) {
- tutoriallevel = -1;
- Loadlevel("tutorial");
+ Loadlevel("tutorial", true);
} else if (which >= 0 && which <= 15) {
char buf[32];
snprintf(buf, 32, "map%d", which + 1); // challenges
@@ -624,7 +555,7 @@ void Game::Loadlevel(int which)
Loadlevel("mapsave");
}
-void Game::Loadlevel(const std::string& name)
+void Game::Loadlevel(const std::string& name, bool tutorial)
{
int indemo; // FIXME this should be removed
int templength;
@@ -635,25 +566,23 @@ void Game::Loadlevel(const std::string& name)
LOG(std::string("Loading level...") + name);
if (!gameon)
- visibleloading = 1;
+ visibleloading = true;
if (stealthloading)
- visibleloading = 0;
+ visibleloading = false;
if (!stillloading)
loadtime = 0;
gamestarted = 1;
numenvsounds = 0;
- if (tutoriallevel != -1)
- tutoriallevel = 0;
- else
- tutoriallevel = 1;
+ Tutorial::active = tutorial;
- if (tutoriallevel == 1)
- tutorialstage = 0;
- if (tutorialstage == 0) {
- tutorialstagetime = 0;
- tutorialmaxtime = 1;
+ if (Tutorial::active) {
+ Tutorial::stage = 0;
+ }
+ if (Tutorial::stage == 0) {
+ Tutorial::stagetime = 0;
+ Tutorial::maxtime = 1;
}
pause_sound(whooshsound);
pause_sound(stream_firesound);
@@ -734,8 +663,7 @@ void Game::Loadlevel(const std::string& name)
terrain.patchobjectnum[i][j] = 0;
}
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
}
weapons.clear();
@@ -792,8 +720,7 @@ void Game::Loadlevel(const std::string& name)
weapons.push_back(Weapon(type, 0));
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
funpackf(tfile, "Bf Bf Bf", &Person::players[0]->armorhead, &Person::players[0]->armorhigh, &Person::players[0]->armorlow);
funpackf(tfile, "Bf Bf Bf", &Person::players[0]->protectionhead, &Person::players[0]->protectionhigh, &Person::players[0]->protectionlow);
@@ -852,20 +779,14 @@ void Game::Loadlevel(const std::string& name)
Hotspot::hotspots.clear();
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
if (!stealthloading) {
Object::ComputeCenter();
-
- if (visibleloading)
- LoadingScreen();
-
Object::ComputeRadius();
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
int numplayers;
funpackf(tfile, "Bi", &numplayers);
@@ -881,8 +802,7 @@ void Game::Loadlevel(const std::string& name)
cerr << "Invalid Person found in " << name << endl;
}
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
funpackf(tfile, "Bi", &numpathpoints);
if (numpathpoints > 30 || numpathpoints < 0)
@@ -893,8 +813,7 @@ void Game::Loadlevel(const std::string& name)
funpackf(tfile, "Bi", &pathpointconnect[j][k]);
}
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
funpackf(tfile, "Bf Bf Bf Bf", &mapcenter.x, &mapcenter.y, &mapcenter.z, &mapradius);
@@ -906,18 +825,15 @@ void Game::Loadlevel(const std::string& name)
if (!stealthloading) {
Object::AddObjectsToTerrain();
terrain.DoShadows();
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
Object::DoShadows();
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
}
fclose(tfile);
for (unsigned i = 0; i < Person::players.size(); i++) {
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
if (i == 0) {
Person::players[i]->burnt = 0;
Person::players[i]->bled = 0;
@@ -972,8 +888,7 @@ void Game::Loadlevel(const std::string& name)
}
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
if (cellophane) {
Person::players[i]->proportionhead.z = 0;
@@ -1039,8 +954,7 @@ void Game::Loadlevel(const std::string& name)
hawkcoords = Person::players[0]->coords;
hawkcoords.y += 30;
- if (visibleloading)
- LoadingScreen();
+ Game::LoadingScreen();
LOG("Starting background music...");
@@ -1064,536 +978,7 @@ void Game::Loadlevel(const std::string& name)
leveltime = 0;
wonleveltime = 0;
- visibleloading = 0;
-}
-
-void doTutorial()
-{
- if (tutorialstagetime > tutorialmaxtime) {
- tutorialstage++;
- tutorialsuccess = 0;
- if (tutorialstage <= 1) {
- canattack = 0;
- cananger = 0;
- reversaltrain = 0;
- }
- switch (tutorialstage) {
- case 1:
- tutorialmaxtime = 5;
- break;
- case 2:
- tutorialmaxtime = 2;
- break;
- case 3:
- tutorialmaxtime = 600;
- break;
- case 4:
- tutorialmaxtime = 1000;
- break;
- case 5:
- tutorialmaxtime = 600;
- break;
- case 6:
- tutorialmaxtime = 600;
- break;
- case 7:
- tutorialmaxtime = 600;
- break;
- case 8:
- tutorialmaxtime = 600;
- break;
- case 9:
- tutorialmaxtime = 600;
- break;
- case 10:
- tutorialmaxtime = 2;
- break;
- case 11:
- tutorialmaxtime = 1000;
- break;
- case 12:
- tutorialmaxtime = 1000;
- break;
- case 13:
- tutorialmaxtime = 2;
- break;
- case 14: {
- tutorialmaxtime = 3;
-
- XYZ temp, temp2;
-
- temp.x = 1011;
- temp.y = 84;
- temp.z = 491;
- temp2.x = 1025;
- temp2.y = 75;
- temp2.z = 447;
-
- Person::players[1]->coords = (temp + temp2) / 2;
-
- emit_sound_at(fireendsound, Person::players[1]->coords);
-
- for (unsigned i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
- if (Random() % 2 == 0) {
- if (!Person::players[1]->skeleton.free)
- temp2 = (Person::players[1]->coords - Person::players[1]->oldcoords) / multiplier / 2; //velocity/2;
- if (Person::players[1]->skeleton.free)
- temp2 = Person::players[1]->skeleton.joints[i].velocity * Person::players[1]->scale / 2;
- if (!Person::players[1]->skeleton.free)
- temp = DoRotation(DoRotation(DoRotation(Person::players[1]->skeleton.joints[i].position, 0, 0, Person::players[1]->tilt), Person::players[1]->tilt2, 0, 0), 0, Person::players[1]->yaw, 0) * Person::players[1]->scale + Person::players[1]->coords;
- if (Person::players[1]->skeleton.free)
- temp = Person::players[1]->skeleton.joints[i].position * Person::players[1]->scale + Person::players[1]->coords;
- Sprite::MakeSprite(breathsprite, temp, temp2, 1, 1, 1, .6 + (float)abs(Random() % 100) / 200 - .25, 1);
- }
- }
- }
- break;
- case 15:
- tutorialmaxtime = 500;
- break;
- case 16:
- tutorialmaxtime = 500;
- break;
- case 17:
- tutorialmaxtime = 500;
- break;
- case 18:
- tutorialmaxtime = 500;
- break;
- case 19:
- tutorialstage = 20;
- break;
- case 20:
- tutorialmaxtime = 500;
- break;
- case 21:
- tutorialmaxtime = 500;
- if (bonus == cannon) {
- bonus = Slicebonus;
- againbonus = 1;
- } else
- againbonus = 0;
- break;
- case 22:
- tutorialmaxtime = 500;
- break;
- case 23:
- tutorialmaxtime = 500;
- break;
- case 24:
- tutorialmaxtime = 500;
- break;
- case 25:
- tutorialmaxtime = 500;
- break;
- case 26:
- tutorialmaxtime = 2;
- break;
- case 27:
- tutorialmaxtime = 4;
- reversaltrain = 1;
- cananger = 1;
- Person::players[1]->aitype = attacktypecutoff;
- break;
- case 28:
- tutorialmaxtime = 400;
- break;
- case 29:
- tutorialmaxtime = 400;
- Person::players[0]->escapednum = 0;
- break;
- case 30:
- tutorialmaxtime = 4;
- reversaltrain = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
- break;
- case 31:
- tutorialmaxtime = 13;
- break;
- case 32:
- tutorialmaxtime = 8;
- break;
- case 33:
- tutorialmaxtime = 400;
- cananger = 1;
- canattack = 1;
- Person::players[1]->aitype = attacktypecutoff;
- break;
- case 34:
- tutorialmaxtime = 400;
- break;
- case 35:
- tutorialmaxtime = 400;
- break;
- case 36:
- tutorialmaxtime = 2;
- reversaltrain = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
- break;
- case 37:
- damagedealt = 0;
- damagetaken = 0;
- tutorialmaxtime = 50;
- cananger = 1;
- canattack = 1;
- Person::players[1]->aitype = attacktypecutoff;
- break;
- case 38:
- tutorialmaxtime = 4;
- canattack = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
- break;
- case 39: {
- XYZ temp, temp2;
-
- temp.x = 1011;
- temp.y = 84;
- temp.z = 491;
- temp2.x = 1025;
- temp2.y = 75;
- temp2.z = 447;
-
- Weapon w(knife, -1);
- w.position = (temp + temp2) / 2;
- w.tippoint = (temp + temp2) / 2;
-
- w.velocity = 0.1;
- w.tipvelocity = 0.1;
- w.missed = 1;
- w.hitsomething = 0;
- w.freetime = 0;
- w.firstfree = 1;
- w.physics = 1;
-
- weapons.push_back(w);
- }
- break;
- case 40:
- tutorialmaxtime = 300;
- break;
- case 41:
- tutorialmaxtime = 300;
- break;
- case 42:
- tutorialmaxtime = 8;
- break;
- case 43:
- tutorialmaxtime = 300;
- break;
- case 44:
- weapons[0].owner = 1;
- Person::players[0]->weaponactive = -1;
- Person::players[0]->num_weapons = 0;
- Person::players[1]->weaponactive = 0;
- Person::players[1]->num_weapons = 1;
- Person::players[1]->weaponids[0] = 0;
-
- cananger = 1;
- canattack = 1;
- Person::players[1]->aitype = attacktypecutoff;
-
- tutorialmaxtime = 300;
- break;
- case 45:
- weapons[0].owner = 1;
- Person::players[0]->weaponactive = -1;
- Person::players[0]->num_weapons = 0;
- Person::players[1]->weaponactive = 0;
- Person::players[1]->num_weapons = 1;
- Person::players[1]->weaponids[0] = 0;
-
- tutorialmaxtime = 300;
- break;
- case 46:
- weapons[0].owner = 1;
- Person::players[0]->weaponactive = -1;
- Person::players[0]->num_weapons = 0;
- Person::players[1]->weaponactive = 0;
- Person::players[1]->num_weapons = 1;
- Person::players[1]->weaponids[0] = 0;
-
- weapons[0].setType(sword);
-
- tutorialmaxtime = 300;
- break;
- case 47: {
- tutorialmaxtime = 10;
-
- XYZ temp, temp2;
-
- temp.x = 1011;
- temp.y = 84;
- temp.z = 491;
- temp2.x = 1025;
- temp2.y = 75;
- temp2.z = 447;
-
- Weapon w(sword, -1);
- w.position = (temp + temp2) / 2;
- w.tippoint = (temp + temp2) / 2;
-
- w.velocity = 0.1;
- w.tipvelocity = 0.1;
- w.missed = 1;
- w.hitsomething = 0;
- w.freetime = 0;
- w.firstfree = 1;
- w.physics = 1;
-
- weapons.push_back(w);
-
- weapons[0].owner = 1;
- weapons[1].owner = 0;
- Person::players[0]->weaponactive = 0;
- Person::players[0]->num_weapons = 1;
- Person::players[0]->weaponids[0] = 1;
- Person::players[1]->weaponactive = 0;
- Person::players[1]->num_weapons = 1;
- Person::players[1]->weaponids[0] = 0;
-
- }
- break;
- case 48:
- canattack = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
-
- tutorialmaxtime = 15;
-
- weapons[0].owner = 1;
- weapons[1].owner = 0;
- Person::players[0]->weaponactive = 0;
- Person::players[0]->num_weapons = 1;
- Person::players[0]->weaponids[0] = 1;
- Person::players[1]->weaponactive = 0;
- Person::players[1]->num_weapons = 1;
- Person::players[1]->weaponids[0] = 0;
-
- if (Person::players[0]->weaponactive != -1)
- weapons[Person::players[0]->weaponids[Person::players[0]->weaponactive]].setType(staff);
- else
- weapons[0].setType(staff);
- break;
- case 49:
- canattack = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
-
- tutorialmaxtime = 200;
-
- weapons[1].position = 1000;
- weapons[1].tippoint = 1000;
-
- weapons[0].setType(knife);
-
- weapons[0].owner = 0;
- Person::players[1]->weaponactive = -1;
- Person::players[1]->num_weapons = 0;
- Person::players[0]->weaponactive = 0;
- Person::players[0]->num_weapons = 1;
- Person::players[0]->weaponids[0] = 0;
-
- break;
- case 50: {
- tutorialmaxtime = 8;
-
- XYZ temp, temp2;
- emit_sound_at(fireendsound, Person::players[1]->coords);
-
- for (unsigned i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
- if (Random() % 2 == 0) {
- if (!Person::players[1]->skeleton.free)
- temp2 = (Person::players[1]->coords - Person::players[1]->oldcoords) / multiplier / 2; //velocity/2;
- if (Person::players[1]->skeleton.free)
- temp2 = Person::players[1]->skeleton.joints[i].velocity * Person::players[1]->scale / 2;
- if (!Person::players[1]->skeleton.free)
- temp = DoRotation(DoRotation(DoRotation(Person::players[1]->skeleton.joints[i].position, 0, 0, Person::players[1]->tilt), Person::players[1]->tilt2, 0, 0), 0, Person::players[1]->yaw, 0) * Person::players[1]->scale + Person::players[1]->coords;
- if (Person::players[1]->skeleton.free)
- temp = Person::players[1]->skeleton.joints[i].position * Person::players[1]->scale + Person::players[1]->coords;
- Sprite::MakeSprite(breathsprite, temp, temp2, 1, 1, 1, .6 + (float)abs(Random() % 100) / 200 - .25, 1);
- }
- }
-
- Person::players[1]->num_weapons = 0;
- Person::players[1]->weaponstuck = -1;
- Person::players[1]->weaponactive = -1;
-
- weapons.clear();
- }
- break;
- case 51:
- tutorialmaxtime = 80000;
- break;
- default:
- break;
- }
- if (tutorialstage <= 51)
- tutorialstagetime = 0;
- }
-
- //Tutorial success
- if (tutorialstagetime < tutorialmaxtime - 3) {
- switch (tutorialstage) {
- case 3:
- if (deltah || deltav)
- tutorialsuccess += multiplier;
- break;
- case 4:
- if (Person::players[0]->forwardkeydown || Person::players[0]->backkeydown || Person::players[0]->leftkeydown || Person::players[0]->rightkeydown)
- tutorialsuccess += multiplier;
- break;
- case 5:
- if (Person::players[0]->jumpkeydown)
- tutorialsuccess = 1;
- break;
- case 6:
- if (Person::players[0]->isCrouch())
- tutorialsuccess = 1;
- break;
- case 7:
- if (Person::players[0]->animTarget == rollanim)
- tutorialsuccess = 1;
- break;
- case 8:
- if (Person::players[0]->animTarget == sneakanim)
- tutorialsuccess += multiplier;
- break;
- case 9:
- if (Person::players[0]->animTarget == rabbitrunninganim || Person::players[0]->animTarget == wolfrunninganim)
- tutorialsuccess += multiplier;
- break;
- case 11:
- if (Person::players[0]->isWallJump())
- tutorialsuccess = 1;
- break;
- case 12:
- if (Person::players[0]->animTarget == flipanim)
- tutorialsuccess = 1;
- break;
- case 15:
- if (Person::players[0]->animTarget == upunchanim || Person::players[0]->animTarget == winduppunchanim)
- tutorialsuccess = 1;
- break;
- case 16:
- if (Person::players[0]->animTarget == winduppunchanim)
- tutorialsuccess = 1;
- break;
- case 17:
- if (Person::players[0]->animTarget == spinkickanim)
- tutorialsuccess = 1;
- break;
- case 18:
- if (Person::players[0]->animTarget == sweepanim)
- tutorialsuccess = 1;
- break;
- case 19:
- if (Person::players[0]->animTarget == dropkickanim)
- tutorialsuccess = 1;
- break;
- case 20:
- if (Person::players[0]->animTarget == rabbitkickanim)
- tutorialsuccess = 1;
- break;
- case 21:
- if (bonus == cannon)
- tutorialsuccess = 1;
- break;
- case 22:
- if (bonus == spinecrusher)
- tutorialsuccess = 1;
- break;
- case 23:
- if (Person::players[0]->animTarget == walljumprightkickanim || Person::players[0]->animTarget == walljumpleftkickanim)
- tutorialsuccess = 1;
- break;
- case 24:
- if (Person::players[0]->animTarget == rabbittacklinganim)
- tutorialsuccess = 1;
- break;
- case 25:
- if (Person::players[0]->animTarget == backhandspringanim)
- tutorialsuccess = 1;
- break;
- case 28:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversed && Person::players[0]->feint)
- tutorialsuccess = 1;
- break;
- case 29:
- if (Person::players[0]->escapednum == 2) {
- tutorialsuccess = 1;
- reversaltrain = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
- }
- break;
- case 33:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal)
- tutorialsuccess = 1;
- break;
- case 34:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal)
- tutorialsuccess = 1;
- break;
- case 35:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal) {
- tutorialsuccess = 1;
- reversaltrain = 0;
- cananger = 0;
- Person::players[1]->aitype = passivetype;
- }
- break;
- case 40:
- if (Person::players[0]->num_weapons > 0)
- tutorialsuccess = 1;
- break;
- case 41:
- if (Person::players[0]->weaponactive == -1 && Person::players[0]->num_weapons > 0)
- tutorialsuccess = 1;
- break;
- case 43:
- if (Person::players[0]->animTarget == knifeslashstartanim)
- tutorialsuccess = 1;
- break;
- case 44:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal)
- tutorialsuccess = 1;
- break;
- case 45:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal)
- tutorialsuccess = 1;
- break;
- case 46:
- if (Animation::animations[Person::players[0]->animTarget].attack == reversal)
- tutorialsuccess = 1;
- break;
- case 49:
- if (Person::players[1]->weaponstuck != -1)
- tutorialsuccess = 1;
- break;
- default:
- break;
- }
- if (tutorialsuccess >= 1)
- tutorialstagetime = tutorialmaxtime - 3;
-
-
- if (tutorialstagetime == tutorialmaxtime - 3) {
- emit_sound_np(consolesuccesssound);
- }
-
- if (tutorialsuccess >= 1) {
- if (tutorialstage == 34 || tutorialstage == 35)
- tutorialstagetime = tutorialmaxtime - 1;
- }
- }
-
- if (tutorialstage < 14 || tutorialstage >= 50) {
- Person::players[1]->coords.y = 300;
- Person::players[1]->velocity = 0;
- }
+ visibleloading = false;
}
void doDevKeys()
@@ -2620,8 +2005,8 @@ void doAerialAcrobatics()
if (whichhit != -1) {
if (whichhit != -1 && Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim)
Person::players[k]->collided = 1;
- if (checkcollide(lowpoint7, lowpointtarget7) == -1)
- if (checkcollide(lowpoint6, lowpointtarget6) == -1)
+ if (Object::checkcollide(lowpoint7, lowpointtarget7) == -1)
+ if (Object::checkcollide(lowpoint6, lowpointtarget6) == -1)
if ( Object::objects[i]->model.LineCheckPossible(&lowpoint2, &lowpointtarget2,
&colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw) != -1 &&
Object::objects[i]->model.LineCheckPossible(&lowpoint3, &lowpointtarget3,
@@ -2931,7 +2316,7 @@ void doAttacks()
}
if (attackweapon) {
//sweep
- if ((tutoriallevel != 1 || !attackweapon) &&
+ if ((!Tutorial::active || !attackweapon) &&
distance < 2.5 * sq(Person::players[k]->scale * 5) &&
randattack == 0 &&
Animation::animations[Person::players[i]->animTarget].height != lowheight)
@@ -2965,7 +2350,7 @@ void doAttacks()
randattack >= 3)
Person::players[k]->animTarget = staffspinhitanim;
//spinkick
- else if ((tutoriallevel != 1 || !attackweapon) &&
+ else if ((!Tutorial::active || !attackweapon) &&
distance < 2.5 * sq(Person::players[k]->scale * 5) &&
randattack == 1 &&
Animation::animations[Person::players[i]->animTarget].height != lowheight)
@@ -2983,7 +2368,7 @@ void doAttacks()
Person::players[k]->animTarget = wolfslapanim;
}
//sneak attacks
- if ((k == 0) && (tutoriallevel != 1 || tutorialstage == 22) &&
+ if ((k == 0) && (!Tutorial::active || Tutorial::stage == 22) &&
Person::players[i]->howactive < typedead1 &&
distance < 1.5 * sq(Person::players[k]->scale * 5) &&
!Person::players[i]->skeleton.free &&
@@ -3104,7 +2489,7 @@ void doAttacks()
distance < 1.5 * sq(Person::players[k]->scale * 5)))) {
Person::players[k]->victim = Person::players[i];
Person::players[k]->hasvictim = 1;
- if (attackweapon && tutoriallevel != 1) {
+ if (attackweapon && !Tutorial::active) {
//crouchstab
if (Person::players[k]->crouchkeydown && attackweapon == knife && distance < 1.5 * sq(Person::players[k]->scale * 5))
Person::players[k]->animTarget = crouchstabanim;
@@ -3372,7 +2757,7 @@ void doPlayerCollisions()
(k != 0 || Person::players[k]->skeleton.free) ||
(Animation::animations[Person::players[i]->animTarget].height == highheight &&
Animation::animations[Person::players[k]->animTarget].height == highheight)) {
- if (tutoriallevel != 1) {
+ if (!Tutorial::active) {
emit_sound_at(heavyimpactsound, Person::players[i]->coords);
}
@@ -3616,7 +3001,7 @@ void doAI(unsigned i)
if ((Person::players[i]->collided > .8 && Person::players[i]->jumppower >= 5))
Person::players[i]->jumpkeydown = 1;
- if ((tutoriallevel != 1 || cananger) &&
+ if ((!Tutorial::active || cananger) &&
hostile &&
!Person::players[0]->dead &&
distsq(&Person::players[i]->coords, &Person::players[0]->coords) < 400 &&
@@ -3639,7 +3024,7 @@ void doAI(unsigned i)
if (distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 400)
if (normaldotproduct(Person::players[i]->facing, Person::players[j]->coords - Person::players[i]->coords) > 0)
if (Person::players[j]->coords.y < Person::players[i]->coords.y + 5 || Person::players[j]->onterrain)
- if (!Person::players[j]->isWallJump() && -1 == checkcollide(
+ if (!Person::players[j]->isWallJump() && -1 == Object::checkcollide(
DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)
*Person::players[i]->scale + Person::players[i]->coords,
DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)
@@ -3724,7 +3109,7 @@ void doAI(unsigned i)
//hearing sounds
if (!editorenabled) {
if (Person::players[i]->howactive <= typesleeping)
- if (numenvsounds > 0 && (tutoriallevel != 1 || cananger) && hostile)
+ if (numenvsounds > 0 && (!Tutorial::active || cananger) && hostile)
for (int j = 0; j < numenvsounds; j++) {
float vol = Person::players[i]->howactive == typesleeping ? envsoundvol[j] - 14 : envsoundvol[j];
if (vol > 0 && distsq(&Person::players[i]->coords, &envsound[j]) <
@@ -3740,7 +3125,7 @@ void doAI(unsigned i)
}
if (Person::players[i]->howactive < typesleeping &&
- ((tutoriallevel != 1 || cananger) && hostile) &&
+ ((!Tutorial::active || cananger) && hostile) &&
!Person::players[0]->dead &&
distsq(&Person::players[i]->coords, &Person::players[0]->coords) < 400 &&
Person::players[i]->occluded < 25) {
@@ -3782,7 +3167,7 @@ void doAI(unsigned i)
if (abs(Random() % 2) || Animation::animations[Person::players[j]->animTarget].height != lowheight || j != 0)
if (distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 400)
if (normaldotproduct(Person::players[i]->facing, Person::players[j]->coords - Person::players[i]->coords) > 0)
- if ((-1 == checkcollide(
+ if ((-1 == Object::checkcollide(
DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*
Person::players[i]->scale + Person::players[i]->coords,
DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*
@@ -3835,9 +3220,9 @@ void doAI(unsigned i)
test2.y += 5;
XYZ test = Person::players[i]->coords + Person::players[i]->facing;
test.y -= 10;
- j = checkcollide(test2, test, Person::players[i]->laststanding);
+ j = Object::checkcollide(test2, test, Person::players[i]->laststanding);
if (j == -1)
- j = checkcollide(test2, test);
+ j = Object::checkcollide(test2, test);
if (j == -1) {
Person::players[i]->velocity = 0;
Person::players[i]->setAnimation(Person::players[i]->getStop());
@@ -3900,7 +3285,7 @@ void doAI(unsigned i)
if ((Person::players[i]->collided > .8 && Person::players[i]->jumppower >= 5))
Person::players[i]->jumpkeydown = 1;
- if (numenvsounds > 0 && ((tutoriallevel != 1 || cananger) && hostile))
+ if (numenvsounds > 0 && ((!Tutorial::active || cananger) && hostile))
for (int k = 0; k < numenvsounds; k++) {
if (distsq(&Person::players[i]->coords, &envsound[k]) < 2 * (envsoundvol[k] + envsoundvol[k] * (Person::players[i]->creature == rabbittype) * 3)) {
Person::players[i]->aitype = attacktypecutoff;
@@ -3911,7 +3296,7 @@ void doAI(unsigned i)
Person::players[i]->losupdatedelay < 0 &&
!editorenabled &&
Person::players[i]->occluded < 2 &&
- ((tutoriallevel != 1 || cananger) && hostile)) {
+ ((!Tutorial::active || cananger) && hostile)) {
Person::players[i]->losupdatedelay = .2;
if (distsq(&Person::players[i]->coords, &Person::players[0]->coords) < 4 && Animation::animations[Person::players[i]->animTarget].height != lowheight) {
Person::players[i]->aitype = attacktypecutoff;
@@ -3921,7 +3306,7 @@ void doAI(unsigned i)
//TODO: factor out canSeePlayer()
if (distsq(&Person::players[i]->coords, &Person::players[0]->coords) < 400)
if (normaldotproduct(Person::players[i]->facing, Person::players[0]->coords - Person::players[i]->coords) > 0)
- if ((checkcollide(
+ if ((Object::checkcollide(
DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*
Person::players[i]->scale + Person::players[i]->coords,
DoRotation(Person::players[0]->jointPos(head), 0, Person::players[0]->yaw, 0)*
@@ -3995,7 +3380,7 @@ void doAI(unsigned i)
XYZ flatfacing = Person::players[Person::players[i]->ally]->coords;
facing.y += Person::players[i]->jointPos(head).y * Person::players[i]->scale;
flatfacing.y += Person::players[Person::players[i]->ally]->jointPos(head).y * Person::players[Person::players[i]->ally]->scale;
- if (-1 != checkcollide(facing, flatfacing))
+ if (-1 != Object::checkcollide(facing, flatfacing))
Person::players[i]->lastseentime -= .1;
//no available ally, run back to player
@@ -4084,7 +3469,7 @@ void doAI(unsigned i)
Person::players[i]->lastseentime = 12;
- if (!Person::players[0]->dead && ((tutoriallevel != 1 || cananger) && hostile))
+ if (!Person::players[0]->dead && ((!Tutorial::active || cananger) && hostile))
if (Person::players[i]->ally < 0 || Person::players[i]->weaponactive != -1 || Person::players[i]->lastchecktime <= 0) {
Person::players[i]->aitype = attacktypecutoff;
Person::players[i]->lastseentime = 1;
@@ -4212,9 +3597,9 @@ void doAI(unsigned i)
test2.y += 5;
XYZ test = Person::players[i]->coords + Person::players[i]->facing;
test.y -= 10;
- j = checkcollide(test2, test, Person::players[i]->laststanding);
+ j = Object::checkcollide(test2, test, Person::players[i]->laststanding);
if (j == -1)
- j = checkcollide(test2, test);
+ j = Object::checkcollide(test2, test);
if (j == -1) {
Person::players[i]->velocity = 0;
Person::players[i]->setAnimation(Person::players[i]->getStop());
@@ -4319,7 +3704,7 @@ void doAI(unsigned i)
for (unsigned j = 0; j < Person::players.size(); j++)
if (j != i && !Person::players[j]->skeleton.free &&
Person::players[j]->hasvictim &&
- (tutoriallevel == 1 && reversaltrain ||
+ (Tutorial::active && reversaltrain ||
Random() % 2 == 0 && difficulty == 2 ||
Random() % 4 == 0 && difficulty == 1 ||
Random() % 8 == 0 && difficulty == 0 ||
@@ -4370,7 +3755,7 @@ void doAI(unsigned i)
if (Person::players[i]->jumpkeydown)
Person::players[i]->attackkeydown = 0;
- if (tutoriallevel == 1)
+ if (Tutorial::active)
if (!canattack)
Person::players[i]->attackkeydown = 0;
@@ -4380,7 +3765,7 @@ void doAI(unsigned i)
facing.y += Person::players[i]->jointPos(head).y * Person::players[i]->scale;
flatfacing.y += Person::players[0]->jointPos(head).y * Person::players[0]->scale;
if (Person::players[i]->occluded >= 2)
- if (-1 != checkcollide(facing, flatfacing)) {
+ if (-1 != Object::checkcollide(facing, flatfacing)) {
if (!Person::players[i]->pause)
Person::players[i]->lastseentime -= .2;
if (Person::players[i]->lastseentime <= 0 &&
@@ -4401,7 +3786,7 @@ void doAI(unsigned i)
if (Person::players[0]->coords.y > terrain.getHeight(Person::players[0]->coords.x, Person::players[0]->coords.z) + 10) {
XYZ test = Person::players[0]->coords;
test.y -= 40;
- if (-1 == checkcollide(Person::players[0]->coords, test))
+ if (-1 == Object::checkcollide(Person::players[0]->coords, test))
Person::players[i]->stunned = 1;
}
//stunned
@@ -4486,9 +3871,10 @@ void Game::Tick()
}
- if (Input::isKeyPressed(SDL_SCANCODE_TAB) && tutoriallevel) {
- if (tutorialstage != 51)
- tutorialstagetime = tutorialmaxtime;
+ if (Input::isKeyPressed(SDL_SCANCODE_TAB) && Tutorial::active) {
+ if (Tutorial::stage != 51) {
+ Tutorial::stagetime = Tutorial::maxtime;
+ }
emit_sound_np(consolefailsound, 128.);
}
@@ -4643,7 +4029,7 @@ void Game::Tick()
windvar += multiplier;
smoketex += multiplier;
- tutorialstagetime += multiplier;
+ Tutorial::stagetime += multiplier;
//hotspots
static float hotspotvisual[40];
@@ -4675,12 +4061,12 @@ void Game::Tick()
}
//Tutorial
- if (tutoriallevel) {
- doTutorial();
+ if (Tutorial::active) {
+ Tutorial::Do(multiplier);
}
//bonuses
- if (tutoriallevel != 1) {
+ if (!Tutorial::active) {
if (bonustime == 0 &&
bonus != solidhit &&
bonus != spinecrusher &&
@@ -4701,7 +4087,7 @@ void Game::Tick()
bonusnum[bonus]++;
else
bonusnum[bonus] += 0.15;
- if (tutoriallevel)
+ if (Tutorial::active)
bonusvalue = 0;
bonusvalue /= bonusnum[bonus];
bonustotal += bonusvalue;
@@ -5323,13 +4709,13 @@ void Game::Tick()
if (Person::players.size() > 1)
for (unsigned j = 0; j < Person::players.size(); j++) {
if (i != j)
- if (tutoriallevel != 1 || tutorialstage == 49)
+ if (!Tutorial::active || Tutorial::stage == 49)
if (hostile)
if (normaldotproduct(Person::players[i]->facing, Person::players[i]->coords - Person::players[j]->coords) < 0 &&
distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 100 &&
distsq(&Person::players[i]->coords, &Person::players[j]->coords) > 1.5 &&
!Person::players[j]->skeleton.free &&
- -1 == checkcollide(DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*Person::players[j]->scale + Person::players[j]->coords, DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*Person::players[i]->scale + Person::players[i]->coords)) {
+ -1 == Object::checkcollide(DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*Person::players[j]->scale + Person::players[j]->coords, DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*Person::players[i]->scale + Person::players[i]->coords)) {
if (!Person::players[i]->isFlip()) {
Person::players[i]->throwtogglekeydown = 1;
Person::players[i]->victim = Person::players[j];
@@ -5853,79 +5239,8 @@ void Game::Tick()
}
OPENAL_SetFrequency(OPENAL_ALL, slomo);
- if (tutoriallevel == 1) {
- XYZ temp;
- XYZ temp2;
- XYZ temp3;
- XYZ oldtemp;
- XYZ oldtemp2;
- temp.x = 1011;
- temp.y = 84;
- temp.z = 491;
- temp2.x = 1025;
- temp2.y = 75;
- temp2.z = 447;
- temp3.x = 1038;
- temp3.y = 76;
- temp3.z = 453;
- oldtemp = temp;
- oldtemp2 = temp2;
- if (tutorialstage >= 51)
- if (distsq(&temp, &Person::players[0]->coords) >= distsq(&temp, &temp2) - 1 || distsq(&temp3, &Person::players[0]->coords) < 4) {
- OPENAL_StopSound(OPENAL_ALL); // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
- OPENAL_SetFrequency(OPENAL_ALL);
-
- emit_stream_np(stream_menutheme);
-
- gameon = 0;
- mainmenu = 5;
-
- fireSound();
-
- flash();
- }
- if (tutorialstage < 51)
- if (distsq(&temp, &Person::players[0]->coords) >= distsq(&temp, &temp2) - 1 || distsq(&temp3, &Person::players[0]->coords) < 4) {
- emit_sound_at(fireendsound, Person::players[0]->coords);
-
- Person::players[0]->coords = (oldtemp + oldtemp2) / 2;
-
- flash();
- }
- if (tutorialstage >= 14 && tutorialstage < 50)
- if (distsq(&temp, &Person::players[1]->coords) >= distsq(&temp, &temp2) - 1 || distsq(&temp3, &Person::players[1]->coords) < 4) {
- emit_sound_at(fireendsound, Person::players[1]->coords);
-
- for (unsigned i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
- if (Random() % 2 == 0) {
- if (!Person::players[1]->skeleton.free)
- temp2 = (Person::players[1]->coords - Person::players[1]->oldcoords) / multiplier / 2; //velocity/2;
- if (Person::players[1]->skeleton.free)
- temp2 = Person::players[1]->skeleton.joints[i].velocity * Person::players[1]->scale / 2;
- if (!Person::players[1]->skeleton.free)
- temp = DoRotation(DoRotation(DoRotation(Person::players[1]->skeleton.joints[i].position, 0, 0, Person::players[1]->tilt), Person::players[1]->tilt2, 0, 0), 0, Person::players[1]->yaw, 0) * Person::players[1]->scale + Person::players[1]->coords;
- if (Person::players[1]->skeleton.free)
- temp = Person::players[1]->skeleton.joints[i].position * Person::players[1]->scale + Person::players[1]->coords;
- Sprite::MakeSprite(breathsprite, temp, temp2, 1, 1, 1, .6 + (float)abs(Random() % 100) / 200 - .25, 1);
- }
- }
-
- Person::players[1]->coords = (oldtemp + oldtemp2) / 2;
- for (unsigned i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
- Person::players[1]->skeleton.joints[i].velocity = 0;
- if (Random() % 2 == 0) {
- if (!Person::players[1]->skeleton.free)
- temp2 = (Person::players[1]->coords - Person::players[1]->oldcoords) / multiplier / 2; //velocity/2;
- if (Person::players[1]->skeleton.free)
- temp2 = Person::players[1]->skeleton.joints[i].velocity * Person::players[1]->scale / 2;
- if (!Person::players[1]->skeleton.free)
- temp = DoRotation(DoRotation(DoRotation(Person::players[1]->skeleton.joints[i].position, 0, 0, Person::players[1]->tilt), Person::players[1]->tilt2, 0, 0), 0, Person::players[1]->yaw, 0) * Person::players[1]->scale + Person::players[1]->coords;
- if (Person::players[1]->skeleton.free)
- temp = Person::players[1]->skeleton.joints[i].position * Person::players[1]->scale + Person::players[1]->coords;
- Sprite::MakeSprite(breathsprite, temp, temp2, 1, 1, 1, .6 + (float)abs(Random() % 100) / 200 - .25, 1);
- }
- }
- }
+ if (Tutorial::active) {
+ Tutorial::DoStuff(multiplier);
}
@@ -6145,7 +5460,7 @@ void Game::TickOnceAfter()
maxalarmed = numalarmed;
}
- if (changedelay <= 0 && !loading && !editorenabled && gameon && !tutoriallevel && changedelay != -999 && !won) {
+ if (changedelay <= 0 && !loading && !editorenabled && gameon && !Tutorial::active && changedelay != -999 && !won) {
if (Person::players[0]->dead && changedelay <= 0) {
changedelay = 1;
targetlevel = whichlevel;
@@ -6288,7 +5603,7 @@ void Game::TickOnceAfter()
LoadStuff();
whichchoice = 0;
actuallevel = campaignlevels[actuallevel].nextlevel.front();
- visibleloading = 1;
+ visibleloading = true;
stillloading = 1;
Loadlevel(campaignlevels[actuallevel].mapname.c_str());
campaign = 1;