X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=216a81c3fd11d1c25ab5879688d0bfb8dee851ef;hb=4c3e64bc1763c8dc59320d23e613863308aa9e26;hp=5dfc3939ad2e53ba4de9a94110983babb76dbbba;hpb=704718ac5394f88b2019b2f118fd26204594690d;p=lugaru.git
diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 5dfc393..216a81c 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -21,6 +21,20 @@ along with Lugaru. If not, see .
// Enable full math definitions
#define _USE_MATH_DEFINES
+#include "Game.hpp"
+
+#include "Animation/Animation.hpp"
+#include "Audio/openal_wrapper.hpp"
+#include "Devtools/ConsoleCmds.hpp"
+#include "Level/Awards.hpp"
+#include "Level/Campaign.hpp"
+#include "Level/Dialog.hpp"
+#include "Level/Hotspot.hpp"
+#include "Menu/Menu.hpp"
+#include "User/Settings.hpp"
+#include "Utils/Folders.hpp"
+#include "Utils/Input.hpp"
+
#if PLATFORM_UNIX
#include
#include
@@ -29,25 +43,11 @@ along with Lugaru. If not, see .
#include
#endif
-
-#include
-#include
+#include
#include
+#include
#include
-#include "Game.h"
-#include "openal_wrapper.h"
-#include "Settings.h"
-#include "Input.h"
-#include "Animation/Animation.h"
-#include "Awards.h"
-#include "Menu.h"
-#include "ConsoleCmds.h"
-#include "Dialog.h"
-#include "Utils/Folders.h"
-#include "Hotspot.h"
-#include "Campaign.h"
-
-#include
+#include
#include
using namespace std;
@@ -90,7 +90,7 @@ extern bool mousejump;
extern float viewdistance;
extern bool freeze;
extern XYZ windvector;
-extern bool debugmode;
+extern bool devtools;
int leveltheme;
extern int mainmenu;
extern int oldmainmenu;
@@ -692,8 +692,9 @@ void Game::Loadlevel(const std::string& name)
damagedealt = 0;
damagetaken = 0;
- if (accountactive)
- difficulty = accountactive->getDifficulty();
+ if (Account::hasActive()) {
+ difficulty = Account::active().getDifficulty();
+ }
Hotspot::hotspots.clear();
Hotspot::current = -1;
@@ -862,7 +863,7 @@ void Game::Loadlevel(const std::string& name)
numhotspots = 0;
}
Hotspot::hotspots.resize(numhotspots);
- for (int i = 0; i < Hotspot::hotspots.size(); i++) {
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
funpackf(tfile, "Bi Bf Bf Bf Bf", &Hotspot::hotspots[i].type, &Hotspot::hotspots[i].size, &Hotspot::hotspots[i].position.x, &Hotspot::hotspots[i].position.y, &Hotspot::hotspots[i].position.z);
funpackf(tfile, "Bi", &templength);
if (templength)
@@ -1176,7 +1177,7 @@ void doTutorial()
emit_sound_at(fireendsound, Person::players[1]->coords);
- for (int i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
+ 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;
@@ -1446,7 +1447,7 @@ void doTutorial()
XYZ temp, temp2;
emit_sound_at(fireendsound, Person::players[1]->coords);
- for (int i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
+ 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;
@@ -1639,10 +1640,10 @@ void doTutorial()
}
}
-void doDebugKeys()
+void doDevKeys()
{
float headprop, bodyprop, armprop, legprop;
- if (!debugmode) {
+ if (!devtools) {
return;
}
@@ -1775,9 +1776,8 @@ void doDebugKeys()
bodyprop = Person::players[closest]->proportionbody.x / 1.1;
armprop = Person::players[closest]->proportionarms.x / 1.1;
legprop = Person::players[closest]->proportionlegs.x / 1.1;
- }
-
- if (Person::players[closest]->creature == rabbittype) {
+ } else {
+ // rabbittype
headprop = Person::players[closest]->proportionhead.x / 1.2;
bodyprop = Person::players[closest]->proportionbody.x / 1.05;
armprop = Person::players[closest]->proportionarms.x / 1.00;
@@ -1852,7 +1852,7 @@ void doDebugKeys()
XYZ headspurtdirection;
//int i = Person::players[closest]->skeleton.jointlabels[head];
Joint& headjoint = Person::players[closest]->joint(head);
- for (int k = 0; k < Person::players[closest]->skeleton.joints.size(); k++) {
+ for (unsigned k = 0; k < Person::players[closest]->skeleton.joints.size(); k++) {
if (!Person::players[closest]->skeleton.free)
flatvelocity2 = Person::players[closest]->velocity;
if (Person::players[closest]->skeleton.free)
@@ -1896,7 +1896,7 @@ void doDebugKeys()
emit_sound_at(splattersound, blah);
emit_sound_at(breaksound2, blah);
- for (int i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
if (!Person::players[closest]->skeleton.free)
flatvelocity2 = Person::players[closest]->velocity;
if (Person::players[closest]->skeleton.free)
@@ -1913,7 +1913,7 @@ void doDebugKeys()
Sprite::MakeSprite(cloudsprite, flatfacing2, flatvelocity2 * 0, .6, 0, 0, 1, .5);
}
- for (int i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
if (!Person::players[closest]->skeleton.free)
flatvelocity2 = Person::players[closest]->velocity;
if (Person::players[closest]->skeleton.free)
@@ -1929,7 +1929,7 @@ void doDebugKeys()
Sprite::MakeSprite(bloodsprite, flatfacing2, flatvelocity2, 1, 1, 1, .4, 1);
}
- for (int i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
if (!Person::players[closest]->skeleton.free)
flatvelocity2 = Person::players[closest]->velocity;
if (Person::players[closest]->skeleton.free)
@@ -1945,7 +1945,7 @@ void doDebugKeys()
Sprite::MakeSprite(bloodsprite, flatfacing2, flatvelocity2 * 2, 1, 1, 1, .4, 1);
}
- for (int i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[closest]->skeleton.joints.size(); i++) {
if (!Person::players[closest]->skeleton.free)
flatvelocity2 = Person::players[closest]->velocity;
if (Person::players[closest]->skeleton.free)
@@ -1970,7 +1970,7 @@ void doDebugKeys()
Person::players[j]->skeleton.free = 1;
Person::players[j]->skeleton.longdead = 0;
Person::players[j]->RagDoll(0);
- for (int i = 0; i < Person::players[j]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[j]->skeleton.joints.size(); i++) {
temppos = Person::players[j]->skeleton.joints[i].position + Person::players[j]->coords;
if (distsq(&temppos, &Person::players[closest]->coords) < 25) {
flatvelocity2 = temppos - Person::players[closest]->coords;
@@ -2092,9 +2092,8 @@ void doDebugKeys()
bodyprop = Person::players[0]->proportionbody.x / 1.1;
armprop = Person::players[0]->proportionarms.x / 1.1;
legprop = Person::players[0]->proportionlegs.x / 1.1;
- }
-
- if (Person::players[0]->creature == rabbittype) {
+ } else {
+ // rabbittype
headprop = Person::players[0]->proportionhead.x / 1.2;
bodyprop = Person::players[0]->proportionbody.x / 1.05;
armprop = Person::players[0]->proportionarms.x / 1.00;
@@ -3427,10 +3426,10 @@ void doPlayerCollisions()
}
Person::players[k]->DoDamage(findLengthfast(&rotatetarget) / 4);
- for (int j = 0; j < Person::players[i]->skeleton.joints.size(); j++) {
+ for (unsigned j = 0; j < Person::players[i]->skeleton.joints.size(); j++) {
Person::players[i]->skeleton.joints[j].velocity = Person::players[i]->skeleton.joints[j].velocity / 5 + Person::players[k]->velocity;
}
- for (int j = 0; j < Person::players[k]->skeleton.joints.size(); j++) {
+ for (unsigned j = 0; j < Person::players[k]->skeleton.joints.size(); j++) {
Person::players[k]->skeleton.joints[j].velocity = Person::players[k]->skeleton.joints[j].velocity / 5 + Person::players[i]->velocity;
}
@@ -3535,16 +3534,17 @@ void doAI(unsigned i)
XYZ colpoint;
closest = -1;
closestdistance = -1;
- for (int j = 0; j < numpathpoints; j++)
+ for (int j = 0; j < numpathpoints; j++) {
if (closest == -1 || distsq(&Person::players[i]->finalfinaltarget, &pathpoint[j]) < closestdistance) {
closestdistance = distsq(&Person::players[i]->finalfinaltarget, &pathpoint[j]);
closest = j;
Person::players[i]->finaltarget = pathpoint[j];
}
+ }
Person::players[i]->finalpathfindpoint = closest;
- for (int j = 0; j < numpathpoints; j++)
+ for (int j = 0; j < numpathpoints; j++) {
for (int k = 0; k < numpathpointconnect[j]; k++) {
- DistancePointLine(&Person::players[i]->finalfinaltarget, &pathpoint[j], &pathpoint[pathpointconnect[j][k]], &tempdist, &colpoint );
+ DistancePointLine(&Person::players[i]->finalfinaltarget, &pathpoint[j], &pathpoint[pathpointconnect[j][k]], &tempdist, &colpoint);
if (sq(tempdist) < closestdistance)
if (findDistance(&colpoint, &pathpoint[j]) + findDistance(&colpoint, &pathpoint[pathpointconnect[j][k]]) <
findDistance(&pathpoint[j], &pathpoint[pathpointconnect[j][k]]) + .1) {
@@ -3553,6 +3553,7 @@ void doAI(unsigned i)
Person::players[i]->finaltarget = colpoint;
}
}
+ }
Person::players[i]->finalpathfindpoint = closest;
}
@@ -4604,14 +4605,14 @@ void Game::Tick()
leveltime += multiplier;
//keys
- if (Input::isKeyDown(SDL_SCANCODE_LALT) && Input::isKeyPressed(SDL_SCANCODE_V) && debugmode) {
+ if (Input::isKeyDown(SDL_SCANCODE_LALT) && Input::isKeyPressed(SDL_SCANCODE_V) && devtools) {
freeze = !freeze;
if (freeze) {
OPENAL_SetFrequency(OPENAL_ALL);
}
}
- if (Input::isKeyPressed(consolekey) && debugmode) {
+ if (Input::isKeyPressed(consolekey) && devtools) {
console = !console;
if (console) {
OPENAL_SetFrequency(OPENAL_ALL);
@@ -4678,7 +4679,7 @@ void Game::Tick()
talkdelay -= multiplier;
if (talkdelay <= 0 && !Dialog::inDialog() && Animation::animations[Person::players[0]->animTarget].height != highheight) {
- for (int i = 0; i < Dialog::dialogs.size(); i++) {
+ for (unsigned i = 0; i < Dialog::dialogs.size(); i++) {
Dialog::dialogs[i].tick(i);
}
}
@@ -4691,11 +4692,13 @@ void Game::Tick()
static float hotspotvisual[40];
if (Hotspot::hotspots.size()) {
XYZ hotspotsprite;
- if (editorenabled)
- for (int i = 0; i < Hotspot::hotspots.size(); i++)
+ if (editorenabled) {
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
hotspotvisual[i] -= multiplier / 320;
+ }
+ }
- for (int i = 0; i < Hotspot::hotspots.size(); i++) {
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
while (hotspotvisual[i] < 0) {
hotspotsprite = 0;
hotspotsprite.x = float(abs(Random() % 100000)) / 100000 * Hotspot::hotspots[i].size;
@@ -4707,7 +4710,7 @@ void Game::Tick()
}
}
- for (int i = 0; i < Hotspot::hotspots.size(); i++) {
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
if (Hotspot::hotspots[i].type <= 10 && Hotspot::hotspots[i].type > 0) {
Hotspot::hotspots[i].position = Person::players[Hotspot::hotspots[i].type]->coords;
}
@@ -4865,7 +4868,7 @@ void Game::Tick()
Dialog::currentScene().camerayaw = yaw;
Dialog::currentScene().camerapitch = pitch;
Dialog::indialogue++;
- if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) {
+ if (Dialog::indialogue < int(Dialog::currentDialog().scenes.size())) {
if (Dialog::currentScene().sound != 0) {
playdialoguescenesound();
}
@@ -4899,7 +4902,7 @@ void Game::Tick()
if (Input::isKeyDown(SDL_SCANCODE_KP_0)) whichend = 0;
Dialog::currentScene().participantfacing[whichend] = facing;
}
- if (Dialog::indialogue >= Dialog::currentDialog().scenes.size()) {
+ if (Dialog::indialogue >= int(Dialog::currentDialog().scenes.size())) {
Dialog::indialogue = -1;
Dialog::directing = false;
cameramode = 0;
@@ -4914,7 +4917,7 @@ void Game::Tick()
if (Dialog::dialoguetime > 0.5) {
if (Input::isKeyPressed(attackkey)) {
Dialog::indialogue++;
- if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) {
+ if (Dialog::indialogue < int(Dialog::currentDialog().scenes.size())) {
if (Dialog::currentScene().sound != 0) {
playdialoguescenesound();
if (Dialog::currentScene().sound == -5) {
@@ -4933,7 +4936,7 @@ void Game::Tick()
}
}
}
- if (Dialog::indialogue >= Dialog::currentDialog().scenes.size()) {
+ if (Dialog::indialogue >= int(Dialog::currentDialog().scenes.size())) {
Dialog::indialogue = -1;
Dialog::directing = false;
cameramode = 0;
@@ -4976,7 +4979,7 @@ void Game::Tick()
hawkcalldelay = 16 + abs(Random() % 8);
}
- doDebugKeys();
+ doDevKeys();
doAttacks();
@@ -5002,7 +5005,7 @@ void Game::Tick()
(whichlevel != -2 &&
(Input::isKeyDown(SDL_SCANCODE_Z) &&
Input::isKeyDown(SDL_SCANCODE_LGUI) &&
- debugmode) ||
+ devtools) ||
(Input::isKeyDown(jumpkey) &&
!respawnkeydown &&
!oldattackkey &&
@@ -5309,7 +5312,7 @@ void Game::Tick()
Person::players[i]->victim->skeleton.free = 1;
Person::players[i]->victim->skeleton.broken = 0;
- for (int l = 0; l < Person::players[i]->victim->skeleton.joints.size(); l++) {
+ for (unsigned l = 0; l < Person::players[i]->victim->skeleton.joints.size(); l++) {
Person::players[i]->victim->skeleton.joints[l].velchange = 0;
Person::players[i]->victim->skeleton.joints[l].locked = 0;
}
@@ -5772,7 +5775,7 @@ void Game::Tick()
Person::players[i]->crouchtogglekeydown = 1;
} else Person::players[i]->velocity.y = 5;
- if (mousejump && i == 0 && debugmode) {
+ if (mousejump && i == 0 && devtools) {
if (!Person::players[i]->isLanding())
Person::players[i]->tempdeltav = deltav;
if (Person::players[i]->tempdeltav < 0)
@@ -5797,7 +5800,7 @@ void Game::Tick()
if (Person::players[i]->animTarget == jumpupanim &&
(((!floatjump &&
!editorenabled) ||
- !debugmode) ||
+ !devtools) ||
Person::players[i]->aitype != playercontrolled)) {
if (Person::players[i]->jumppower > multiplier * 6) {
Person::players[i]->velocity.y += multiplier * 6;
@@ -5808,7 +5811,7 @@ void Game::Tick()
Person::players[i]->jumppower = 0;
}
}
- if (((floatjump || editorenabled) && debugmode) && i == 0)
+ if (((floatjump || editorenabled) && devtools) && i == 0)
Person::players[i]->velocity.y += multiplier * 30;
}
@@ -5936,7 +5939,7 @@ void Game::Tick()
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 (int i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
+ 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;
@@ -5951,7 +5954,7 @@ void Game::Tick()
}
Person::players[1]->coords = (oldtemp + oldtemp2) / 2;
- for (int i = 0; i < Person::players[1]->skeleton.joints.size(); i++) {
+ 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)
@@ -6154,7 +6157,7 @@ void Game::TickOnceAfter()
}
Hotspot::killhotspot = 2;
- for (int i = 0; i < Hotspot::hotspots.size(); i++) {
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
if (Hotspot::hotspots[i].type > 10 && Hotspot::hotspots[i].type < 20) {
if (Person::players[Hotspot::hotspots[i].type - 10]->dead == 0)
Hotspot::killhotspot = 0;
@@ -6167,17 +6170,23 @@ void Game::TickOnceAfter()
winhotspot = false;
- for (int i = 0; i < Hotspot::hotspots.size(); i++)
- if (Hotspot::hotspots[i].type == -1)
- if (distsq(&Person::players[0]->coords, &Hotspot::hotspots[i].position) < Hotspot::hotspots[i].size)
+ for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
+ if (Hotspot::hotspots[i].type == -1) {
+ if (distsq(&Person::players[0]->coords, &Hotspot::hotspots[i].position) < Hotspot::hotspots[i].size) {
winhotspot = true;
+ }
+ }
+ }
int numalarmed = 0;
- for (unsigned i = 1; i < Person::players.size(); i++)
- if (!Person::players[i]->dead && Person::players[i]->aitype == attacktypecutoff && Person::players[i]->surprised <= 0)
+ for (unsigned i = 1; i < Person::players.size(); i++) {
+ if (!Person::players[i]->dead && Person::players[i]->aitype == attacktypecutoff && Person::players[i]->surprised <= 0) {
numalarmed++;
- if (numalarmed > maxalarmed)
+ }
+ }
+ if (numalarmed > maxalarmed) {
maxalarmed = numalarmed;
+ }
if (changedelay <= 0 && !loading && !editorenabled && gameon && !tutoriallevel && changedelay != -999 && !won) {
if (Person::players[0]->dead && changedelay <= 0) {
@@ -6217,13 +6226,14 @@ void Game::TickOnceAfter()
if (changedelay > 0 && !Person::players[0]->dead && !won) {
//high scores, awards, win
if (campaign) {
- accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime);
+ Account::active().winCampaignLevel(whichchoice, bonustotal, leveltime);
scoreadded = 1;
} else {
wonleveltime = leveltime;
- accountactive->winLevel(whichlevel, bonustotal - startbonustotal, leveltime);
+ Account::active().winLevel(whichlevel, bonustotal - startbonustotal, leveltime);
}
won = 1;
+ Account::active().saveFile(Folders::getUserSavePath());
}
}
@@ -6264,7 +6274,7 @@ void Game::TickOnceAfter()
fireSound(firestartsound);
- Loadlevel(campaignlevels[accountactive->getCampaignChoicesMade()].mapname.c_str());
+ Loadlevel(campaignlevels[Account::active().getCampaignChoicesMade()].mapname.c_str());
fireSound();
@@ -6355,7 +6365,7 @@ void Game::TickOnceAfter()
target = Person::players[0]->oldcoords + Person::players[0]->currentoffset * (1 - Person::players[0]->target) * Person::players[0]->scale + Person::players[0]->targetoffset * Person::players[0]->target * Person::players[0]->scale - Person::players[0]->facing * .05;
target.y += .1;
if (Person::players[0]->skeleton.free) {
- for (int i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
if (Person::players[0]->skeleton.joints[i].position.y * Person::players[0]->scale + Person::players[0]->coords.y > target.y)
target.y = Person::players[0]->skeleton.joints[i].position.y * Person::players[0]->scale + Person::players[0]->coords.y;
}