mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 12:17:46 +00:00
Code Activity

Merge branch 'money_sound_effect' into develop_c

Browse source
This commit is contained in:
collett 2020-01-08 20:32:06 +09:00
commit 6eaa4c407f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/world/Actor/Player.h
View file

@ -67,7 +67,7 @@ namespace Sapphire::Entity
/*! play a subevent */ /*! play a subevent */
void playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 ); void playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
void playGilShop( uint32_t eventId, uint32_t flags, uint32_t param, void playGilShop( uint32_t eventId, uint32_t flags, uint32_t param1,
Event::EventHandler::SceneReturnCallback eventCallback ); Event::EventHandler::SceneReturnCallback eventCallback );
void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3,

4
src/world/Actor/PlayerEvent.cpp
View file

@ -130,7 +130,7 @@ void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene,
playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback ); playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback );
} }
void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, uint32_t param, void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, uint32_t param1,
Event::EventHandler::SceneReturnCallback eventCallback ) Event::EventHandler::SceneReturnCallback eventCallback )
{ {
auto pEvent = bootstrapSceneEvent( eventId, flags ); auto pEvent = bootstrapSceneEvent( eventId, flags );
@ -145,7 +145,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, ui
openGilShopPacket->data().eventId = eventId; openGilShopPacket->data().eventId = eventId;
openGilShopPacket->data().sceneFlags = flags; openGilShopPacket->data().sceneFlags = flags;
openGilShopPacket->data().actorId = getId(); openGilShopPacket->data().actorId = getId();
switch( param ) switch( param1 )
{ {
case 1: case 1:
{ {