• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2675 (tree)
Time2020-06-27 23:12:19
Authorumethyl

Log Message

Loader::AutoLoad() 不要 Load 削除2

Change Summary

Incremental Difference

--- trunk/include/controller/game_view_class.php (revision 2674)
+++ trunk/include/controller/game_view_class.php (revision 2675)
@@ -11,14 +11,9 @@
1111 DB::$ROOM->SetFlag(RoomMode::VIEW);
1212 DB::$ROOM->system_time = Time::Get();
1313
14- //シーンに応じた追加クラスをロード
15- if (DB::$ROOM->IsFinished()) { //勝敗結果表示
16- Loader::LoadFile('winner_message');
17- } else { //ゲームオプション表示
18- Loader::LoadFile('cast_config', 'image_class', 'room_option_class');
19- if (DB::$ROOM->IsBeforeGame()) {
20- RQ::Set('retrieve_type', DB::$ROOM->scene);
21- }
14+ //シーン別調整
15+ if (DB::$ROOM->IsBeforeGame()) {
16+ RQ::Set('retrieve_type', DB::$ROOM->scene); //投票済み情報
2217 }
2318
2419 //ユーザ情報ロード
--- trunk/include/controller/game_vote_class.php (revision 2674)
+++ trunk/include/controller/game_vote_class.php (revision 2675)
@@ -28,7 +28,6 @@
2828 if (DB::$ROOM->IsBeforeGame()) { //ゲーム開始 or Kick 投票処理
2929 switch (RQ::Get()->situation) {
3030 case VoteAction::GAME_START:
31- Loader::LoadFile('cast_class'); //配役情報をロード
3231 return VoteGameStart::Execute();
3332
3433 case VoteAction::KICK:
@@ -55,7 +54,6 @@
5554 }
5655
5756 protected static function Output() {
58- Loader::LoadFile('vote_message');
5957 if (DB::$SELF->IsDead()) { //死者は専用ページ
6058 return DB::$SELF->IsDummyBoy() ? VoteHTML::OutputDummyBoy() : VoteHTML::OutputHeaven();
6159 }
--- trunk/include/controller/info/search_role_info_class.php (revision 2674)
+++ trunk/include/controller/info/search_role_info_class.php (revision 2675)
@@ -23,7 +23,6 @@
2323
2424 //検索実行
2525 private static function RunSearch() {
26- Loader::LoadFile('role_data_manager_class');
2726 $stack = [];
2827 $search_list = RoleDataManager::Search(RQ::Get()->role);
2928 foreach ($search_list as $category => $list) {
--- trunk/include/controller/old_log_class.php (revision 2674)
+++ trunk/include/controller/old_log_class.php (revision 2675)
@@ -9,13 +9,11 @@
99
1010 protected static function Output() {
1111 if (RQ::Get()->is_room) {
12- Loader::LoadFile('icon_class', 'image_class', 'talk_class');
1312 self::LoadRoom();
1413 self::LoadUser();
1514 self::LoadSelf();
1615 OldLogHTML::Output();
1716 } else {
18- Loader::LoadFile('room_config');
1917 OldLogHTML::OutputList(RQ::Get()->page);
2018 }
2119 HTML::OutputFooter();
--- trunk/include/controller/room_manager_class.php (revision 2674)
+++ trunk/include/controller/room_manager_class.php (revision 2675)
@@ -18,15 +18,12 @@
1818
1919 protected static function RunCommand() {
2020 if (RQ::Get()->create_room) {
21- Loader::LoadFile('user_class', 'cache_class');
2221 self::Create();
2322 } elseif (RQ::Get()->change_room) {
24- Loader::LoadFile('session_class', 'user_class', 'cache_class');
2523 self::Create();
2624 } elseif (RQ::Get()->describe_room) {
2725 self::OutputDescribe();
2826 } elseif (RQ::Get()->room_no > 0) {
29- Loader::LoadFile('session_class', 'user_class', 'option_form_class');
3027 self::OutputCreate();
3128 } else {
3229 self::OutputList();
--- trunk/include/controller/test/objection_test_class.php (revision 2674)
+++ trunk/include/controller/test/objection_test_class.php (revision 2675)
@@ -16,7 +16,6 @@
1616
1717 //テスト実行
1818 private static function RunTest() {
19- Loader::LoadFile('sound_class');
2019 $id = RequestDataTalk::OBJECTION;
2120 RQ::Get()->ParsePostData($id);
2221 $key = RQ::Get()->$id;
--- trunk/include/game_vote_functions.php (revision 2674)
+++ trunk/include/game_vote_functions.php (revision 2675)
@@ -30,7 +30,6 @@
3030 //音声用データセット
3131 protected static function FilterSound() {
3232 if (RQ::Get()->play_sound) {
33- Loader::LoadFile('cookie_class');
3433 JinrouCookie::SetVote(DB::$ROOM->scene);
3534 }
3635 }
--- trunk/include/loader_class.php (revision 2674)
+++ trunk/include/loader_class.php (revision 2675)
@@ -377,6 +377,8 @@
377377 'RoomOption' => 'room_option_class',
378378 //talk
379379 'Talk' => 'talk_class',
380+ 'TalkParser' => 'talk_class',
381+ 'TalkBuilder' => 'talk_class',
380382 'GamePlayTalk' => 'game_play_talk_class',
381383 'AutoPlayTalk' => 'auto_play_talk_class',
382384 //media
@@ -477,6 +479,9 @@
477479 'ObjectionTestHTML' => 'objection_test_html_class',
478480 'TripTestHTML' => 'trip_test_html_class',
479481 'TwitterTestHTML' => 'twitter_test_html_class',
482+ //info
483+ 'Info' => 'info_functions',
484+ 'InfoTime' => 'info_functions',
480485 //module
481486 'OAuthException' => 'twitter',
482487 //test
--- trunk/include/media/image_class.php (revision 2674)
+++ trunk/include/media/image_class.php (revision 2675)
@@ -73,7 +73,7 @@
7373 }
7474
7575 //-- 村のオプション画像 --//
76-class RoomImage extends Image {
76+final class RoomImage extends Image {
7777 /*
7878 max[NN].gif という画像が該当パス内にあった場合は村の最大参加人数の表示に使用される。
7979 例) max8.gif (8人村用)
@@ -95,7 +95,7 @@
9595 }
9696
9797 //-- 役職の画像 --//
98-class RoleImage extends Image {
98+final class RoleImage extends Image {
9999 public $path = 'role';
100100 public $extension = 'gif';
101101 public $class = '';
@@ -102,7 +102,7 @@
102102 }
103103
104104 //-- 勝利陣営の画像 --//
105-class WinnerImage extends Image {
105+final class WinnerImage extends Image {
106106 public $path = 'winner';
107107 public $extension = 'gif';
108108 public $class = 'winner';
--- trunk/include/test/test_functions.php (revision 2674)
+++ trunk/include/test/test_functions.php (revision 2675)
@@ -247,7 +247,6 @@
247247
248248 //ロード
249249 private static function Load($url) {
250- Loader::LoadFile('vote_message');
251250 RQ::LoadFile('game_vote');
252251
253252 $stack = new Request_game_vote();
--- trunk/info/develop/init.php (revision 2674)
+++ trunk/info/develop/init.php (revision 2675)
@@ -1,4 +1,3 @@
11 <?php
22 define('JINROU_ROOT', '../..');
33 require_once(JINROU_ROOT . '/include/init.php');
4-Loader::LoadFile('info_functions');
--- trunk/info/history/init.php (revision 2674)
+++ trunk/info/history/init.php (revision 2675)
@@ -1,4 +1,3 @@
11 <?php
22 define('JINROU_ROOT', '../..');
33 require_once(JINROU_ROOT . '/include/init.php');
4-Loader::LoadFile('info_functions');
--- trunk/info/init.php (revision 2674)
+++ trunk/info/init.php (revision 2675)
@@ -1,4 +1,3 @@
11 <?php
22 define('JINROU_ROOT', '..');
33 require_once(JINROU_ROOT . '/include/init.php');
4-Loader::LoadFile('info_functions');
Show on old repository browser