TalkBuilder::RegisterSystem()
@@ -389,7 +389,7 @@ | ||
389 | 389 | $talk->scene = DB::$ROOM->scene; |
390 | 390 | $talk->location = TalkLocation::SYSTEM; |
391 | 391 | $talk->time_stamp = Time::ConvertTimeStamp($time, false); |
392 | - $this->Generate($talk); | |
392 | + return $this->Generate($talk); | |
393 | 393 | } |
394 | 394 | |
395 | 395 | //発言登録 |
@@ -604,17 +604,11 @@ | ||
604 | 604 | return $this->Register($stack); |
605 | 605 | } |
606 | 606 | |
607 | - //システムユーザ発言 | |
608 | - private function AddSystem($str, $talk_id, $class = 'system-user') { | |
609 | - $this->cache .= TalkHTML::GenerateSystem(Text::Line($str), $talk_id, $class); | |
610 | - return true; | |
611 | - } | |
612 | - | |
613 | 607 | //システムメッセージ |
614 | 608 | private function TalkSystem(TalkParser $talk, User $user, $name) { |
615 | 609 | $str = $talk->sentence . $this->AddTime($talk); |
616 | 610 | if (! isset($talk->action)) { //標準処理 |
617 | - return $this->AddSystem($str, $this->GetTalkID($talk)); | |
611 | + return $this->RegisterSystem($str, $this->GetTalkID($talk)); | |
618 | 612 | } |
619 | 613 | |
620 | 614 | switch ($talk->action) { //投票情報 |
@@ -625,7 +619,7 @@ | ||
625 | 619 | |
626 | 620 | case TalkAction::MORNING: |
627 | 621 | case TalkAction::NIGHT: |
628 | - return $this->AddSystem($str, $this->GetTalkID($talk)); | |
622 | + return $this->RegisterSystem($str, $this->GetTalkID($talk)); | |
629 | 623 | |
630 | 624 | default: //ゲーム開始前の投票 (例:KICK) は常時表示 |
631 | 625 | if ($this->flag->open_talk || DB::$ROOM->IsBeforeGame()) { |
@@ -639,7 +633,7 @@ | ||
639 | 633 | private function TalkDummyBoy(TalkParser $talk, User $user) { |
640 | 634 | $str = Message::SYMBOL . $user->handle_name . Message::SPACER . $talk->sentence; |
641 | 635 | $str = $this->QuoteTalk($str) . $this->AddTime($talk); |
642 | - return $this->AddSystem($str, $this->GetTalkID($talk), 'dummy-boy'); | |
636 | + return $this->RegisterSystem($str, $this->GetTalkID($talk), 'dummy-boy'); | |
643 | 637 | } |
644 | 638 | |
645 | 639 | //昼発言 |
@@ -785,7 +779,13 @@ | ||
785 | 779 | return $this->Register($stack); |
786 | 780 | } |
787 | 781 | |
788 | - //システムメッセージ登録 | |
782 | + //発言登録 (システムユーザ) | |
783 | + private function RegisterSystem($str, $talk_id, $class = 'system-user') { | |
784 | + $this->cache .= TalkHTML::GenerateSystem(Text::Line($str), $talk_id, $class); | |
785 | + return true; | |
786 | + } | |
787 | + | |
788 | + //発言登録 (システムメッセージ) | |
789 | 789 | private function RegisterSystemMessage($str, $talk_id, $class) { |
790 | 790 | $this->cache .= TalkHTML::GenerateSystemMessage($str, $talk_id, $class); |
791 | 791 | return true; |