summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/windows/killstats.cpp117
-rw-r--r--src/gui/windows/killstats.h18
-rw-r--r--src/net/ea/beinghandler.cpp2
-rw-r--r--src/net/tmwa/beinghandler.cpp6
4 files changed, 9 insertions, 134 deletions
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 55e2c3cbd..8f655bbca 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -92,9 +92,6 @@ KillStats::KillStats() :
"Time for next level per %d min: %s", 15), 15, "?"))),
// TRANSLATORS: kill stats window label
mLastKillExpLabel(new Label(this, strprintf("%s ?", _("Last kill exp:")))),
- mTimeBeforeJackoLabel(new Label(this, strprintf(
- // TRANSLATORS: kill stats window label
- "%s ?", _("Time before jacko spawn:")))),
mKillCounter(0),
mExpCounter(0),
mKillTCounter(0),
@@ -107,12 +104,7 @@ KillStats::KillStats() :
m5minSpeed(0),
m15minExpTime(0),
m15minExpNum(0),
- m15minSpeed(0),
- mJackoSpawnTime(0),
- mJackoId(0),
- mIsJackoAlive(false),
- mIsJackoMustSpawn(true),
- mIsJackoSpawnTimeUnknown(true)
+ m15minSpeed(0)
{
setWindowName("Kill stats");
setCloseButton(true);
@@ -152,16 +144,15 @@ KillStats::KillStats() :
place(0, 6, mLine7, 6).setPadding(0);
place(0, 7, mLastKillExpLabel, 6).setPadding(0);
- place(0, 8, mTimeBeforeJackoLabel, 6).setPadding(0);
- place(0, 9, mExpSpeed1Label, 6).setPadding(0);
- place(0, 10, mExpTime1Label, 6).setPadding(0);
- place(0, 11, mExpSpeed5Label, 6).setPadding(0);
- place(0, 12, mExpTime5Label, 6).setPadding(0);
- place(0, 13, mExpSpeed15Label, 6).setPadding(0);
- place(0, 14, mExpTime15Label, 6).setPadding(0);
+ place(0, 8, mExpSpeed1Label, 6).setPadding(0);
+ place(0, 9, mExpTime1Label, 6).setPadding(0);
+ place(0, 10, mExpSpeed5Label, 6).setPadding(0);
+ place(0, 11, mExpTime5Label, 6).setPadding(0);
+ place(0, 12, mExpSpeed15Label, 6).setPadding(0);
+ place(0, 13, mExpTime15Label, 6).setPadding(0);
- place(5, 13, mTimerButton).setPadding(0);
- place(5, 14, mResetButton).setPadding(0);
+ place(5, 12, mTimerButton).setPadding(0);
+ place(5, 13, mResetButton).setPadding(0);
loadWindowState();
enableVisibleSound(true);
@@ -344,7 +335,6 @@ void KillStats::recalcStats()
m15minExpTime = curTime;
m15minExpNum = newExp;
}
- validateJacko();
BLOCK_END("KillStats::recalcStats")
}
@@ -412,98 +402,9 @@ void KillStats::update()
_(" Time for next level: %s"), "?"));
}
- validateJacko();
- updateJackoLabel();
BLOCK_END("KillStats::update")
}
-void KillStats::updateJackoLabel()
-{
- if (mIsJackoAlive)
- {
- mTimeBeforeJackoLabel->setCaption(strprintf("%s jacko alive",
- // TRANSLATORS: kill stats window label
- _("Time before jacko spawn:")));
- }
- else if (mIsJackoSpawnTimeUnknown && mJackoSpawnTime != 0)
- {
- // TRANSLATORS: kill stats window label
- mTimeBeforeJackoLabel->setCaption(strprintf(
- // TRANSLATORS: kill stats window label
- _("%s %d?"), _("Time before jacko spawn:"),
- mJackoSpawnTime - cur_time));
- }
- else if (mIsJackoMustSpawn)
- {
- mTimeBeforeJackoLabel->setCaption(strprintf("%s %s",
- // TRANSLATORS: kill stats window label
- _("Time before jacko spawn:"), _("jacko spawning")));
- }
- else
- {
- mTimeBeforeJackoLabel->setCaption(strprintf("%s %d",
- // TRANSLATORS: kill stats window label
- _("Time before jacko spawn:"), mJackoSpawnTime - cur_time));
- }
-}
-
-void KillStats::jackoDead(const int id)
-{
- if (id == mJackoId && mIsJackoAlive)
- {
- mIsJackoAlive = false;
- mJackoSpawnTime = cur_time + 60*4;
- mIsJackoSpawnTimeUnknown = false;
- updateJackoLabel();
- }
-}
-
-void KillStats::jackoAlive(const int id)
-{
- if (!mIsJackoAlive)
- {
- mJackoId = id;
- mIsJackoAlive = true;
- mIsJackoMustSpawn = false;
- mJackoSpawnTime = 0;
- mIsJackoSpawnTimeUnknown = false;
- updateJackoLabel();
- }
-}
-
-void KillStats::validateJacko()
-{
- if (!actorManager || !localPlayer)
- return;
-
- const Map *const currentMap = Game::instance()->getCurrentMap();
- if (currentMap)
- {
- if (currentMap->getProperty("_realfilename") == "018-1"
- || currentMap->getProperty("_realfilename") == "maps/018-1.tmx")
- {
- if (localPlayer->getTileX() >= 167
- && localPlayer->getTileX() <= 175
- && localPlayer->getTileY() >= 21
- && localPlayer->getTileY() <= 46)
- {
- const Being *const dstBeing
- = actorManager->findBeingByName(
- "Jack O", ActorType::Monster);
- if (mIsJackoAlive && !dstBeing)
- {
- mIsJackoAlive = false;
- mJackoSpawnTime = cur_time + 60*4;
- mIsJackoSpawnTimeUnknown = true;
- }
- }
- }
-
- if (!mIsJackoAlive && cur_time > mJackoSpawnTime + 15)
- mIsJackoMustSpawn = true;
- }
-}
-
void KillStats::attributeChanged(const int id,
const int oldVal,
const int newVal)
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index 0ef16609a..a3e047553 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -66,15 +66,6 @@ class KillStats final : public Window,
*/
void update();
- /**
- * Updates jacko info
- */
- void updateJackoLabel();
-
- void jackoDead(const int id);
-
- void jackoAlive(const int id);
-
void resetTimes();
void attributeChanged(const int id,
@@ -82,8 +73,6 @@ class KillStats final : public Window,
const int newVal) override final;
private:
- void validateJacko();
-
int mKillTimer; /**< Timer for kill stats. */
Button *mResetButton;
Button *mTimerButton;
@@ -103,7 +92,6 @@ class KillStats final : public Window,
Label *mExpTime15Label;
Label *mLastKillExpLabel;
- Label *mTimeBeforeJackoLabel;
int mKillCounter; /**< Session Kill counter. */
int mExpCounter; /**< Session Exp counter. */
@@ -121,12 +109,6 @@ class KillStats final : public Window,
int m15minExpTime;
int m15minExpNum;
int m15minSpeed;
-
- int mJackoSpawnTime;
- int mJackoId;
- bool mIsJackoAlive;
- bool mIsJackoMustSpawn;
- bool mIsJackoSpawnTimeUnknown;
};
extern KillStats *killStats;
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ec8ce3673..78e95be55 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -119,8 +119,6 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg)
dstBeing->setAction(BeingAction::DEAD, 0);
dstBeing->recalcSpritesOrder();
}
- if (dstBeing->getName() == "Jack O" && killStats)
- killStats->jackoDead(id);
}
else
{
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index e6bb54f53..5b91c4839 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -954,9 +954,6 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processBeingVisibleOrMove")
return;
}
-
- if (job == 1022 && killStats)
- killStats->jackoAlive(dstBeing->getId());
}
else
{
@@ -1164,9 +1161,6 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg)
BLOCK_END("BeingHandler::processBeingVisibleOrMove")
return;
}
-
- if (job == 1022 && killStats)
- killStats->jackoAlive(dstBeing->getId());
}
else
{
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 07:52:11 +0000