Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge branch 'fixes'

Browse Source
feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent d88b549dbc
commit ca042995c0
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File

7
ryzom/server/src/entities_game_service/modules/easter_egg.cpp
Unescape Escape View File

@ -76,7 +76,8 @@ void CR2EasterEgg::dropMissionItem(std::vector< CGameItemPtr > items, TSessionId
if( c != 0 ) if( c != 0 )
{ {
CEntityState &pos = c->getState(); CEntityState &pos = c->getState();
_SpawnEasterEgg( egg.EasterEggId, CSheetId(EaterEggBagSheet), aiInstanceId, pos.X, pos.Y, pos.Z, pos.Heading ); CSheetId bagSheet = CSheetId(EaterEggBagSheet.get());
_SpawnEasterEgg( egg.EasterEggId, bagSheet, aiInstanceId, pos.X, pos.Y, pos.Z, pos.Heading );
} }
} }
@ -203,7 +204,7 @@ void CR2EasterEgg::activateEasterEgg(uint32 easterEggId, TSessionId scenarioId,
_EasterEgg.insert( make_pair( egg.EasterEggId, egg ) ); _EasterEgg.insert( make_pair( egg.EasterEggId, egg ) );
// send message to AIS for spawn the easter egg // send message to AIS for spawn the easter egg
_SpawnEasterEgg( egg.EasterEggId, CSheetId(EasterEggChestSheet), aiInstanceId, pos.PosState.X, pos.PosState.Y, pos.PosState.Z, pos.PosState.Heading, name, look ); _SpawnEasterEgg( egg.EasterEggId, CSheetId(EasterEggChestSheet.get()), aiInstanceId, pos.PosState.X, pos.PosState.Y, pos.PosState.Z, pos.PosState.Heading, name, look );
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -275,7 +276,7 @@ void CR2EasterEgg::easterEggTPActChange(const NLMISC::CEntityId &characterId, co
{ {
_UnspawnEasterEgg( easterEggToTP[i].EasterEggId, easterEggToTP[i].InstanceId ); _UnspawnEasterEgg( easterEggToTP[i].EasterEggId, easterEggToTP[i].InstanceId );
_RemoveEntityEasterAssociation( easterEggToTP[i].CreatureId, easterEggToTP[i].EasterEggId ); _RemoveEntityEasterAssociation( easterEggToTP[i].CreatureId, easterEggToTP[i].EasterEggId );
_SpawnEasterEgg(easterEggToTP[i].EasterEggId, CSheetId(EaterEggBagSheet), easterEggToTP[i].InstanceId, pos.PosState.X, pos.PosState.Y,pos.PosState.Z, pos.PosState.Heading, easterEggToTP[i].Name, easterEggToTP[i].Look ); _SpawnEasterEgg(easterEggToTP[i].EasterEggId, CSheetId(EaterEggBagSheet.get()), easterEggToTP[i].InstanceId, pos.PosState.X, pos.PosState.Y,pos.PosState.Z, pos.PosState.Heading, easterEggToTP[i].Name, easterEggToTP[i].Look );
} }
easterEggToTP.clear(); easterEggToTP.clear();
} }

Write Preview
Loading…
Cancel
Save