gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update tools/tfs_extendedopcode.patch 

Fixed issue with sending Player ptr in dispatcher (apparently causes issues in TFS)
This commit is contained in:
Ben Dol 2013-02-21 04:51:10 +13:00
parent cb3f06358c
commit a84d0bbf11
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tfs_extendedopcode.patch
View File

@ -168,13 +168,15 @@ index 2e4dc2c..7508591 100644
Scheduler::getInstance().addEvent(createSchedulerTask(checkExpiredMarketOffersEachMinutes * 60 * 1000, boost::bind(&Game::checkExpiredMarketOffers, this))); Scheduler::getInstance().addEvent(createSchedulerTask(checkExpiredMarketOffersEachMinutes * 60 * 1000, boost::bind(&Game::checkExpiredMarketOffers, this)));
} }
+ +
+void Game::parsePlayerExtendedOpcode(Player *player, uint8_t opcode, const std::string& buffer) +void Game::parsePlayerExtendedOpcode(uint32_t playerId, uint8_t opcode, const std::string& buffer)
+{ +{
+ if(player) { + Player* player = getPlayerByID(playerId);
+ CreatureEventList extendedOpcodeEvents = player->getCreatureEvents(CREATURE_EVENT_EXTENDED_OPCODE); + if(!player || player->isRemoved())
+ for(CreatureEventList::iterator it = extendedOpcodeEvents.begin(); it != extendedOpcodeEvents.end(); ++it) + return;
+ (*it)->executeExtendedOpcode(player, opcode, buffer); +
+ } + CreatureEventList extendedOpcodeEvents = player->getCreatureEvents(CREATURE_EVENT_EXTENDED_OPCODE);
+ for(CreatureEventList::iterator it = extendedOpcodeEvents.begin(); it != extendedOpcodeEvents.end(); ++it)
+ (*it)->executeExtendedOpcode(player, opcode, buffer);
+} +}
diff --git a/game.h b/game.h diff --git a/game.h b/game.h
index 51fa397..7192549 100644 index 51fa397..7192549 100644
@ -184,7 +186,7 @@ index 51fa397..7192549 100644
std::map<Item*, int32_t> grounds; std::map<Item*, int32_t> grounds;
#endif #endif
+ void parsePlayerExtendedOpcode(Player *player, uint8_t opcode, const std::string& buffer); + void parsePlayerExtendedOpcode(uint32_t playerId, uint8_t opcode, const std::string& buffer);
+ +
protected: protected:
bool playerWhisper(Player* player, const std::string& text, uint32_t statementId); bool playerWhisper(Player* player, const std::string& text, uint32_t statementId);
@ -363,7 +365,7 @@ index b980be0..7a84f61 100644
+ std::string buffer = msg.getString(); + std::string buffer = msg.getString();
+ +
+ // process additional opcodes via lua script event + // process additional opcodes via lua script event
+ addGameTask(&Game::parsePlayerExtendedOpcode, player, opcode, buffer); + addGameTask(&Game::parsePlayerExtendedOpcode, player->getId(), opcode, buffer);
+} +}
+ +
+void ProtocolGame::sendExtendedOpcode(uint8_t opcode, const std::string& buffer) +void ProtocolGame::sendExtendedOpcode(uint8_t opcode, const std::string& buffer)