Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trade between players in canary 13.40 #965

Merged
merged 3 commits into from
Nov 13, 2024
Merged

fix: trade between players in canary 13.40 #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58ed9fd
fix: trade
kokekanon Nov 13, 2024
75cb3cd
prevent warning
kokekanon Nov 13, 2024
15742b1
fix: key sensitive
kokekanon Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/client/protocolcodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ namespace Proto
GameServerMissleEffect = 133, // Anthem on 13.x
GameServerItemClasses = 134,
GameServerTrappers = 135,
GameServerCloseForgeWindow = 137,
GameServerCreatureData = 139,
GameServerCreatureHealth = 140,
GameServerCreatureLight = 141,
Expand Down
1 change: 1 addition & 0 deletions src/client/protocolgame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ class ProtocolGame : public Protocol
void parseCreatureMark(const InputMessagePtr& msg);
void parseTrappers(const InputMessagePtr& msg);
void addCreatureIcon(const InputMessagePtr& msg);
void parseCloseForgeWindow(const InputMessagePtr& msg);
void parseCreatureData(const InputMessagePtr& msg);
void parseCreatureHealth(const InputMessagePtr& msg);
void parseCreatureLight(const InputMessagePtr& msg);
Expand Down
8 changes: 8 additions & 0 deletions src/client/protocolgameparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
case Proto::GameServerTrappers:
parseTrappers(msg);
break;
case Proto::GameServerCloseForgeWindow:
parseCloseForgeWindow(msg);
break;
case Proto::GameServerCreatureData:
parseCreatureData(msg);
break;
Expand Down Expand Up @@ -1844,6 +1847,11 @@ void ProtocolGame::addCreatureIcon(const InputMessagePtr& msg)
// TODO: implement creature icons usage
}

void ProtocolGame::parseCloseForgeWindow(const InputMessagePtr& /*msg*/)
{
g_lua.callGlobalField("g_game", "onCloseForgeCloseWindows");
}

void ProtocolGame::parseCreatureData(const InputMessagePtr& msg)
{
const uint32_t creatureId = msg->getU32();
Expand Down
Loading