#include "Game.hpp"
#include "Objects/Person.hpp"
-#include "Utils/binio.h"
#include "Utils/Folders.hpp"
#include "Utils/Input.hpp"
+#include "Utils/binio.h"
extern int hostile;
}
}
-Dialog::Dialog(FILE* tfile) : gonethrough(0)
+Dialog::Dialog(FILE* tfile)
+ : gonethrough(0)
{
int numdialogscenes;
funpackf(tfile, "Bi", &numdialogscenes);
void fpackf_string(FILE* tfile, std::string text)
{
fpackf(tfile, "Bi", text.size());
- for (int m = 0; m < text.size(); m++) {
- fpackf(tfile, "Bb", text[m]);
- if (text[m] == '\0')
+ for (unsigned i = 0; i < text.size(); i++) {
+ fpackf(tfile, "Bb", text[i]);
+ if (text[i] == '\0') {
break;
+ }
}
}
}
/* Load dialog from txt file, used by console */
-Dialog::Dialog(int type, std::string filename) : type(type)
+Dialog::Dialog(int type, std::string filename)
+ : type(type)
{
ifstream ipstream(Folders::getResourcePath(filename));
ipstream.ignore(256, ':');
ipstream.close();
}
-DialogScene::DialogScene(ifstream &ipstream)
+DialogScene::DialogScene(ifstream& ipstream)
{
ipstream.ignore(256, ':');
ipstream.ignore(256, ':');
bool special = (type > 9);
if ((!hostile || (type > 40) && (type < 50)) &&
- (playerId < Person::players.size()) &&
- (playerId > 0) &&
- ((gonethrough == 0) || !special) &&
- (special || Input::isKeyPressed(Game::attackkey))) {
+ (playerId < Person::players.size()) &&
+ (playerId > 0) &&
+ ((gonethrough == 0) || !special) &&
+ (special || Input::isKeyPressed(Game::attackkey))) {
if ((distsq(&Person::players[0]->coords, &Person::players[playerId]->coords) < 6) ||
- (Person::players[playerId]->howactive >= typedead1) ||
- (type > 40) && (type < 50)) {
+ (Person::players[playerId]->howactive >= typedead1) ||
+ (type > 40) && (type < 50)) {
whichdialogue = id;
play();
dialoguetime = 0;
void Dialog::play()
{
- for (int i = 0; i < scenes.size(); i++) {
+ for (unsigned i = 0; i < scenes.size(); i++) {
int playerId = scenes[i].participantfocus;
- Person::players[playerId]->coords = participantlocation[playerId];
+ Person::players.at(playerId)->coords = participantlocation[playerId];
Person::players[playerId]->yaw = participantyaw[playerId];
Person::players[playerId]->targetyaw = participantyaw[playerId];
Person::players[playerId]->velocity = 0;
{
fpackf(tfile, "Bi", dialogs.size());
- for (int k = 0; k < dialogs.size(); k++) {
- dialogs[k].save(tfile);
+ for (unsigned i = 0; i < dialogs.size(); i++) {
+ dialogs[i].save(tfile);
}
}
fpackf(tfile, "Bf Bf Bf", participantlocation[l].x, participantlocation[l].y, participantlocation[l].z);
fpackf(tfile, "Bf", participantyaw[l]);
}
- for (int l = 0; l < scenes.size(); l++) {
+ for (unsigned l = 0; l < scenes.size(); l++) {
scenes[l].save(tfile);
}
}