• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2674 (tree)
Time2020-06-27 22:24:25
Authorumethyl

Log Message

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

Change Summary

Incremental Difference

--- trunk/admin/generate_html_log.php (revision 2673)
+++ trunk/admin/generate_html_log.php (revision 2674)
@@ -5,7 +5,6 @@
55 $disable = true; //使用時には false に変更する
66 if ($disable) HTML::OutputUnusableError();
77
8-Loader::LoadFile('room_config', 'old_log_functions');
98 Loader::LoadRequest('RequestOldLog'); //引数を取得
109
1110 RQ::Set('prefix', ''); //各ページの先頭につける文字列 (テスト / 上書き回避用)
@@ -22,5 +21,4 @@
2221 //OldLogHTML::GenerateIndex(); //インデックスページ生成
2322 //HTML::OutputFooter(true);
2423
25-Loader::LoadFile('winner_message', 'icon_class', 'image_class', 'talk_class');
2624 JinrouAdmin::GenerateLog();
--- trunk/admin/icon_delete.php (revision 2673)
+++ trunk/admin/icon_delete.php (revision 2674)
@@ -1,4 +1,4 @@
11 <?php
22 require_once('init.php');
3-Loader::LoadFile('icon_message', 'admin_class');
3+Loader::LoadFile('admin_class');
44 JinrouAdmin::DeleteIcon();
--- trunk/dev/test/init.php (revision 2673)
+++ trunk/dev/test/init.php (revision 2674)
@@ -1,4 +1,3 @@
11 <?php
22 define('JINROU_ROOT', '../..');
33 require_once(JINROU_ROOT . '/include/init.php');
4-Loader::LoadFile('test_functions');
--- trunk/include/controller/admin_class.php (revision 2673)
+++ trunk/include/controller/admin_class.php (revision 2674)
@@ -36,7 +36,6 @@
3636 HTML::OutputResult($title, sprintf(IconMessage::NOT_EXISTS, $icon_no));
3737 }
3838
39- Loader::LoadFile('icon_html_class');
4039 DB::Connect();
4140 if (false === DB::Lock('icon')) {
4241 HTML::OutputResult($title, Message::DB_ERROR_LOAD);
--- trunk/include/controller/game_log_class.php (revision 2673)
+++ trunk/include/controller/game_log_class.php (revision 2674)
@@ -101,7 +101,6 @@
101101 private static function OutputAbility() {
102102 if (RQ::Get()->user_no > 0 && DB::$SELF->IsDummyBoy() &&
103103 false === DB::$ROOM->IsOption('gm_login')) {
104- Loader::LoadFile('image_class');
105104 DB::LoadSelf(RQ::Get()->user_no);
106105 DB::$SELF->live = UserLive::LIVE;
107106 RoleHTML::OutputAbility();
--- trunk/include/controller/game_play_class.php (revision 2673)
+++ trunk/include/controller/game_play_class.php (revision 2674)
@@ -38,7 +38,6 @@
3838 //-- 音声情報 --//
3939 Objection::Set(); //「異議」ありセット判定
4040 if (RQ::Get()->play_sound) { //音でお知らせ
41- Loader::LoadFile('cookie_class');
4241 JinrouCookie::Set(); //クッキー情報セット
4342 }
4443
@@ -249,7 +248,6 @@
249248 return;
250249 }
251250
252- Loader::LoadFile('game_vote_functions');
253251 RQ::Set(RequestDataVote::SITUATION, VoteAction::VOTE_KILL); //仮想的に処刑投票コマンドをセット
254252 /*
255253 Vote は初期化時点で ROOM/USER をロックをかけて生成している
@@ -262,13 +260,8 @@
262260
263261 //-- GamePlay 出力基礎クラス --//
264262 abstract class GamePlayView {
265- public function __construct() {
266- $this->Load();
267- }
263+ public function __construct() {}
268264
269- //追加ライブラリロード
270- protected function Load() {}
271-
272265 //リンク情報取得 (差分型)
273266 protected function GetURL(array $except, $header = null) {
274267 $url = isset($header) ? $header : GamePlayHTML::GetURLHeader();
@@ -607,10 +600,6 @@
607600
608601 //-- GamePlay 出力クラス (ゲーム開始前) --//
609602 class GamePlayView_Before extends GamePlayView {
610- protected function Load() {
611- Loader::LoadFile('cast_config', 'image_class', 'room_option_class');
612- }
613-
614603 protected function OutputHeaderLinkFooter() {
615604 $url = sprintf('%s&user_no=%s', $this->SelectURL([]), DB::$SELF->id);
616605 GamePlayHTML::OutputHeaderLink('user_manager', $url); //登録情報変更
@@ -688,10 +677,6 @@
688677
689678 //-- GamePlay 出力クラス (ゲーム終了後) --//
690679 class GamePlayView_After extends GamePlayView {
691- protected function Load() {
692- Loader::LoadFile('winner_message');
693- }
694-
695680 protected function OutputHeaderLogLink() {
696681 $this->OutputLogLinkList();
697682 }
--- trunk/include/loader_class.php (revision 2673)
+++ trunk/include/loader_class.php (revision 2674)
@@ -398,6 +398,7 @@
398398 'WeatherManager' => 'weather_class',
399399 //vote
400400 'VoteKick' => 'game_vote_functions',
401+ 'VoteGameStart' => 'game_vote_functions',
401402 'VoteDay' => 'game_vote_functions',
402403 'VoteNight' => 'game_vote_functions',
403404 'VoteHeaven' => 'game_vote_functions',
Show on old repository browser