From c81199bab9f943e187ce8b1347bd06d2395674e6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 12 Jan 2014 16:54:55 +0300
Subject: in pethandler add pet id parameter.
---
src/net/pethandler.h | 4 +++-
src/net/tmwa/pethandler.cpp | 4 +++-
src/net/tmwa/pethandler.h | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)
(limited to 'src/net')
diff --git a/src/net/pethandler.h b/src/net/pethandler.h
index 05816acc4..7b5666396 100644
--- a/src/net/pethandler.h
+++ b/src/net/pethandler.h
@@ -33,13 +33,15 @@ class PetHandler
{ }
virtual void move(const Being *const being,
+ const int petId,
const int x1, const int y1,
const int x2, const int y2) const = 0;
virtual void spawn(const Being *const being,
+ const int petId,
const int x, const int y) const = 0;
- virtual void emote(const uint8_t emoteId) const = 0;
+ virtual void emote(const uint8_t emoteId, const int petId) const = 0;
};
} // namespace Net
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 2a3e56e0e..6b9e5adb7 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -52,17 +52,19 @@ void PetHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
}
void PetHandler::move(const Being *const being A_UNUSED,
+ const int petId A_UNUSED,
const int x1 A_UNUSED, const int y1 A_UNUSED,
const int x2 A_UNUSED, const int y2 A_UNUSED) const
{
}
void PetHandler::spawn(const Being *const being A_UNUSED,
+ const int petId A_UNUSED,
const int x A_UNUSED, const int y A_UNUSED) const
{
}
-void PetHandler::emote(const uint8_t emoteId) const
+void PetHandler::emote(const uint8_t emoteId, const int petId A_UNUSED) const
{
Net::getChatHandler()->talk("\302\202\302e" + toString(
static_cast<int>(emoteId)), GENERAL_CHANNEL);
diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h
index 81536e0b1..30eff59b8 100644
--- a/src/net/tmwa/pethandler.h
+++ b/src/net/tmwa/pethandler.h
@@ -38,13 +38,16 @@ class PetHandler final : public MessageHandler, public Net::PetHandler
void handleMessage(Net::MessageIn &msg) override final;
void move(const Being *const being,
+ const int petId,
const int x1, const int y1,
const int x2, const int y2) const override final;
void spawn(const Being *const being,
+ const int petId,
const int x, const int y) const override final;
- void emote(const uint8_t emoteId) const override final;
+ void emote(const uint8_t emoteId,
+ const int petId) const override final;
};
} // namespace TmwAthena
--
cgit v1.2.3-70-g09d2