Page MenuHomePhabricator (Chris)
Files F125941

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/PnjEntity.cpp b/src/PnjEntity.cpp
index 814a926..f85dfab 100644
--- a/src/PnjEntity.cpp
+++ b/src/PnjEntity.cpp
@@ -1,102 +1,107 @@
#include "PnjEntity.h"
#include "Constants.h"
//#include "StaticTextEntity.h"
#include "WitchBlastGame.h"
#include "sfml_game/ImageManager.h"
PnjEntity::PnjEntity(float x, float y, int pnjType) : SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_PNJ), x, y, 64, 96)
{
this->x = x;
this->y = y;
x0 = x;
y0 = y;
pnjVelocity = 140.0f;
xGoal = x0 + 180.0f;
direction = 6;
velocity.x = pnjVelocity;
isSpeaking = false;
speechTimer = 2.5f + 0.1f * (rand() % 50);
headFrame = 2;
type = ENTITY_PNJ;
}
void PnjEntity::animate(float delay)
{
if (direction == 6 && x >= xGoal)
{
direction = 4;
velocity.x = -pnjVelocity;
xGoal = x0 - 180.0f;
}
else if (direction == 4 && x <= xGoal)
{
direction = 6;
velocity.x = pnjVelocity;
xGoal = x0 + 180.0f;
}
speechTimer -= delay;
if (speechTimer <= 0.0f)
{
if (isSpeaking)
{
isSpeaking = false;
speechTimer = 3.0f + 0.1f * (rand() % 65);
velocity.x = (direction == 6) ? pnjVelocity : -pnjVelocity;
}
else
{
isSpeaking = true;
speechTimer = 5.0f;
velocity.x = 0.0f;
int r = rand() % 3;
switch (r)
{
- case 0: speech = "Best price in entire dungeon !"; break;
- case 1: speech = "Welcome in deep deep stores !"; break;
- case 2: speech = "Have look to our merchandise !"; break;
+ case 0: speech = "Best price in entire dungeon!"; break;
+ case 1: speech = "Welcome to Deep Deep Stores!"; break;
+ case 2: speech = "Have a look at our merchandise!"; break;
}
}
}
if (isSpeaking)
{
headFrame = 2 + (int)(4 * age) % 2;
}
else
{
frame = 0 + (int)(4 * age) % 2;
headFrame = 2;
}
- z = y + height / 2;
+ z = y + height / 2 - 3;
SpriteEntity::animate(delay);
}
void PnjEntity::render(sf::RenderTarget* app)
{
sprite.setPosition(x, y);
// shadow
sprite.setTextureRect(sf::IntRect(4 * width, 0, width, height));
app->draw(sprite);
// body
sprite.setTextureRect(sf::IntRect(frame * width, 0, width, height));
app->draw(sprite);
// head
sprite.setTextureRect(sf::IntRect(headFrame * width, 0, width, height));
app->draw(sprite);
if (isSpeaking)
{
game().write(speech, 20, x0, y0 - 72.0f, ALIGN_CENTER, sf::Color(255, 255, 255), app, 0 , 0);
}
+
+ if (game().getShowLogical())
+ {
+ displayCenterAndZ(app);
+ }
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 10:11 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
68313
Default Alt Text
(2 KB)

Event Timeline