mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity

Merge pull request #757 from dude22072/ArcCleanup

Browse source 
ARC clang cleanup
This commit is contained in:
Mordred 2022-01-21 01:03:09 +01:00 • committed by GitHub
commit 0d73f42bcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 380 additions and 379 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripts/quest/classquest/ARC/ClsArc000.cpp
View file

@ -65,6 +65,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
break; break;
} }

2
src/scripts/quest/classquest/ARC/ClsArc001.cpp
View file

@ -67,7 +67,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
if( quest.getSeq() == Seq2 ) if( quest.getSeq() == Seq2 )
Scene00025( quest, player ); Scene00025( quest, player );

2
src/scripts/quest/classquest/ARC/ClsArc002.cpp
View file

@ -75,7 +75,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
Scene00030( quest, player ); Scene00030( quest, player );

2
src/scripts/quest/classquest/ARC/ClsArc003.cpp
View file

@ -77,7 +77,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
{ {

2
src/scripts/quest/classquest/ARC/ClsArc005.cpp
View file

@ -72,7 +72,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
Scene00010( quest, player ); Scene00010( quest, player );

4
src/scripts/quest/classquest/ARC/ClsArc006.cpp
View file

@ -76,7 +76,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
Scene00013( quest, player ); Scene00013( quest, player );
@ -301,7 +301,7 @@ private:
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." ); playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 3, 0 ); eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish ); quest.setSeq( SeqFinish );
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); /*auto pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
eventMgr().eventFinish(player, result.eventId, 0); eventMgr().eventFinish(player, result.eventId, 0);
pTeriMgr.createAndJoinQuestBattle(player, Questbattle1);*/ pTeriMgr.createAndJoinQuestBattle(player, Questbattle1);*/