OSDN > ソフトウェアを探す > 人狼式～汝は人狼なりや？式神研究同好会版 > SCM > SVN > コミット

人狼式～汝は人狼なりや？式神研究同好会版

R/O
SSH
HTTPS

jinrousiki: コミット

コミットメタ情報

リビジョン	2727 (tree)
日時	2021-06-11 17:23:11
作者	umethyl

ログメッセージ

RoomOptionManager::IsChange()

変更サマリ

modified: trunk/include/controller/room_manager_class.php (diff)
modified: trunk/include/html/controller/room_manager_html_class.php (diff)
modified: trunk/include/html/option/option_form_html_class.php (diff)
modified: trunk/include/option/chaos_open_cast.php (diff)
modified: trunk/include/option/close_room.php (diff)
modified: trunk/include/option/dummy_boy.php (diff)
modified: trunk/include/option/dummy_boy_selector.php (diff)
modified: trunk/include/option/gm_login.php (diff)
modified: trunk/include/option/gm_logout.php (diff)
modified: trunk/include/option/gm_password.php (diff)
modified: trunk/include/option/max_user.php (diff)
modified: trunk/include/option/no_dummy_boy.php (diff)
modified: trunk/include/option/not_open_cast_selector.php (diff)
modified: trunk/include/option/option_class.php (diff)
modified: trunk/include/option/option_form_class.php (diff)
modified: trunk/include/option/replace_human_selector.php (diff)
modified: trunk/include/option/room_option_manager_class.php (diff)
modified: trunk/include/option/special_role.php (diff)
modified: trunk/include/option/sub_role_limit.php (diff)
modified: trunk/include/option/topping.php (diff)

差分

--- trunk/include/controller/room_manager_class.php (revision 2726)

+++ trunk/include/controller/room_manager_class.php (revision 2727)

		@@ -39,13 +39,13 @@
39	39
40	40	//村作成画面出力
41	41	public static function OutputCreate() {
42		- if (ServerConfig::DISABLE_ESTABLISH \|\| DatabaseConfig::DISABLE) {
	42	+ if (ServerConfig::DISABLE_ESTABLISH \|\| DatabaseConfig::DISABLE) { //無効判定
43	43	Text::Output(RoomManagerMessage::NOT_ESTABLISH);
44	44	return;
45	45	}
46	46
47		- OptionManager::Stack()->Set('change', RQ::Get()->room_no > 0);
48		- if (OptionManager::IsChange()) {
	47	+ RoomOptionManager::Stack()->Set('change', RQ::Get()->room_no > 0);
	48	+ if (RoomOptionManager::IsChange()) {
49	49	self::LoadOutputCreateInChange();
50	50	HTML::OutputHeader(RoomManagerMessage::TITLE_CHANGE, 'room_manager');
51	51	HTML::OutputHeaderTitle(RoomManagerMessage::TITLE_CHANGE);

		@@ -74,7 +74,7 @@
74	74	}
75	75
76	76	if (true === RQ::Get()->change_room) {
77		- OptionManager::Stack()->Set('change', true);
	77	+ RoomOptionManager::Stack()->Set('change', true);
78	78	self::LoadCreateInChange();
79	79	} else {
80	80	self::ValidateEstablishLimit();

--- trunk/include/html/controller/room_manager_html_class.php (revision 2726)

+++ trunk/include/html/controller/room_manager_html_class.php (revision 2727)

		@@ -4,7 +4,7 @@
4	4	//村作成画面表示
5	5	public static function OutputCreate() {
6	6	//パラメータセット
7		- if (OptionManager::IsChange()) {
	7	+ if (RoomOptionManager::IsChange()) {
8	8	$url = sprintf('?room_no=%d', RQ::Get()->room_no);
9	9	$command = 'change_room';
10	10	$submit = RoomManagerMessage::SUBMIT_CHANGE;

		@@ -29,7 +29,7 @@
29	29	Text::Printf(self::GetCreateHeader(), $url, $command);
30	30	OptionForm::Output();
31	31	Text::Printf(self::GetCreateFooter(), $password, $submit);
32		- if (OptionManager::IsChange()) {
	32	+ if (RoomOptionManager::IsChange()) {
33	33	HTML::OutputFooter();
34	34	}
35	35	}

--- trunk/include/html/option/option_form_html_class.php (revision 2726)

+++ trunk/include/html/option/option_form_html_class.php (revision 2727)

		@@ -50,7 +50,7 @@
50	50	public static function GenerateTextbox(OptionText $filter) {
51	51	$size = sprintf('%s_input', $filter->name);
52	52	$str = $filter->GetExplain();
53		- if (OptionManager::IsChange()) {
	53	+ if (RoomOptionManager::IsChange()) {
54	54	$name = Text::CutPop($filter->name);
55	55	$value = DB::$ROOM->$name;
56	56	} else {

--- trunk/include/option/chaos_open_cast.php (revision 2726)

+++ trunk/include/option/chaos_open_cast.php (revision 2727)

		@@ -16,7 +16,7 @@
16	16	}
17	17
18	18	protected function LoadValue() {
19		- if (OptionManager::IsChange()) {
	19	+ if (RoomOptionManager::IsChange()) {
20	20	$this->SetFormValue('key');
21	21	}
22	22	}

--- trunk/include/option/close_room.php (revision 2726)

+++ trunk/include/option/close_room.php (revision 2727)

		@@ -4,7 +4,7 @@
4	4	*/
5	5	class Option_close_room extends OptionCheckbox {
6	6	protected function Ingore() {
7		- return false === OptionManager::IsChange();
	7	+ return false === RoomOptionManager::IsChange();
8	8	}
9	9
10	10	protected function LoadValue() {

--- trunk/include/option/dummy_boy.php (revision 2726)

+++ trunk/include/option/dummy_boy.php (revision 2727)

		@@ -7,7 +7,7 @@
7	7	public $type = OptionFormType::RADIO;
8	8
9	9	protected function FilterEnable() {
10		- if (true === $this->enable && OptionManager::IsChange()) {
	10	+ if (true === $this->enable && RoomOptionManager::IsChange()) {
11	11	$this->enable = (false === DB::$ROOM->IsOption('gm_login'));
12	12	}
13	13	}

--- trunk/include/option/dummy_boy_selector.php (revision 2726)

+++ trunk/include/option/dummy_boy_selector.php (revision 2727)

		@@ -57,7 +57,7 @@
57	57	}
58	58
59	59	//-- チェック位置判定 --//
60		- if (OptionManager::IsChange() && DB::$ROOM->IsOption('gm_login')) {
	60	+ if (RoomOptionManager::IsChange() && DB::$ROOM->IsOption('gm_login')) {
61	61	$stack['gm_login']->value = true;
62	62	} elseif (isset($stack[$this->value])) {
63	63	$stack[$this->value]->value = true;

--- trunk/include/option/gm_login.php (revision 2726)

+++ trunk/include/option/gm_login.php (revision 2727)

		@@ -7,13 +7,13 @@
7	7	public $type = OptionFormType::RADIO;
8	8
9	9	protected function FilterEnable() {
10		- if (true === $this->enable && OptionManager::IsChange()) {
	10	+ if (true === $this->enable && RoomOptionManager::IsChange()) {
11	11	$this->enable = DB::$ROOM->IsOption($this->name);
12	12	}
13	13	}
14	14
15	15	public function LoadPost() {
16		- if (OptionManager::IsChange()) { //GM ログアウト判定 (クイズ村は無効)
	16	+ if (RoomOptionManager::IsChange()) { //GM ログアウト判定 (クイズ村は無効)
17	17	if (RQ::Get()->dummy_boy_selector == 'gm_logout' && false === DB::$ROOM->IsQuiz()) {
18	18	RQ::Get()->gm_logout = true;
19	19	return;

--- trunk/include/option/gm_logout.php (revision 2726)

+++ trunk/include/option/gm_logout.php (revision 2727)

		@@ -7,8 +7,8 @@
7	7	public $type = OptionFormType::RADIO;
8	8
9	9	protected function FilterEnable() {
10		- if (true === $this->enable && OptionManager::IsChange()) {
11		- $this->enable = DB::$ROOM->IsOption('gm_login') && false === DB::$ROOM->IsQuiz();
	10	+ if (true === $this->enable && RoomOptionManager::IsChange()) {
	11	+ $this->enable = (DB::$ROOM->IsOption('gm_login') && false === DB::$ROOM->IsQuiz());
12	12	} else {
13	13	$this->enable = false;
14	14	}

--- trunk/include/option/gm_password.php (revision 2726)

+++ trunk/include/option/gm_password.php (revision 2727)

		@@ -6,7 +6,7 @@
6	6	public $type = OptionFormType::PASSWORD;
7	7
8	8	protected function FilterEnable() {
9		- if (OptionManager::IsChange()) {
	9	+ if (RoomOptionManager::IsChange()) {
10	10	$this->enable = false;
11	11	} else {
12	12	$this->enable = GameOptionConfig::$gm_login_enable;

--- trunk/include/option/max_user.php (revision 2726)

+++ trunk/include/option/max_user.php (revision 2727)

		@@ -6,7 +6,7 @@
6	6	public $group = OptionGroup::NONE;
7	7
8	8	protected function LoadValue() {
9		- if (OptionManager::IsChange()) {
	9	+ if (RoomOptionManager::IsChange()) {
10	10	$this->value = DB::$ROOM->max_user;
11	11	} else {
12	12	$this->value = RoomConfig::$default_max_user;

--- trunk/include/option/no_dummy_boy.php (revision 2726)

+++ trunk/include/option/no_dummy_boy.php (revision 2727)

		@@ -7,7 +7,7 @@
7	7	public $type = OptionFormType::RADIO;
8	8
9	9	protected function FilterEnable() {
10		- if (OptionManager::IsChange()) {
	10	+ if (RoomOptionManager::IsChange()) {
11	11	$this->enable = false;
12	12	}
13	13	}

--- trunk/include/option/not_open_cast_selector.php (revision 2726)

+++ trunk/include/option/not_open_cast_selector.php (revision 2727)

		@@ -9,7 +9,7 @@
9	9
10	10	protected function LoadValue() {
11	11	$this->value = GameOptionConfig::$default_not_open_cast;
12		- if (OptionManager::IsChange()) {
	12	+ if (RoomOptionManager::IsChange()) {
13	13	$this->SetFormValue('value');
14	14	}
15	15	}

--- trunk/include/option/option_class.php (revision 2726)

+++ trunk/include/option/option_class.php (revision 2727)

		@@ -9,24 +9,6 @@
9	9
10	10	//-- オプションマネージャ --//
11	11	class OptionManager {
12		- //スタック取得
13		- public static function Stack() {
14		- static $stack;
15		-
16		- if (is_null($stack)) {
17		- $stack = new Stack();
18		- }
19		- return $stack;
20		- }
21		-
22		- //村オプション変更判定
23		- public static function IsChange() {
24		- if (self::Stack()->IsEmpty('change')) {
25		- self::Stack()->Set('change', false);
26		- }
27		- return self::Stack()->Get('change');
28		- }
29		-
30	12	//オプション存在判定
31	13	public static function Exists($type) {
32	14	foreach (OptionFilterData::$$type as $option) {

		@@ -249,7 +231,7 @@
249	231	$this->form_value = $this->value;
250	232	}
251	233
252		- if (OptionManager::IsChange()) {
	234	+ if (RoomOptionManager::IsChange()) {
253	235	switch ($this->type) {
254	236	case OptionFormType::CHECKBOX:
255	237	case OptionFormType::LIMITED_CHECKBOX:

		@@ -463,7 +445,7 @@
463	445
464	446	//制限設定値取得
465	447	final public function GetLimitedCount() {
466		- if (OptionManager::IsChange() && DB::$ROOM->IsOption($this->name)) {
	448	+ if (RoomOptionManager::IsChange() && DB::$ROOM->IsOption($this->name)) {
467	449	switch ($this->group) {
468	450	case OptionGroup::GAME:
469	451	$list = DB::$ROOM->game_option->list;

--- trunk/include/option/option_form_class.php (revision 2726)

+++ trunk/include/option/option_form_class.php (revision 2727)

		@@ -84,7 +84,7 @@
84	84	//境界線出力
85	85	private static function OutputSeparator($group) {
86	86	OptionFormHTML::OutputSeparator();
87		- if (OptionManager::IsChange()) {
	87	+ if (RoomOptionManager::IsChange()) {
88	88	return;
89	89	}
90	90

		@@ -122,7 +122,7 @@
122	122
123	123	//チェックボックス生成 (リアルタイム制専用)
124	124	private static function GenerateRealtime(Option_real_time $filter) {
125		- if (OptionManager::IsChange()) {
	125	+ if (RoomOptionManager::IsChange()) {
126	126	$day = DB::$ROOM->game_option->list[$filter->name][0];
127	127	$night = DB::$ROOM->game_option->list[$filter->name][1];
128	128	} else {

		@@ -151,7 +151,7 @@
151	151	$str .= OptionFormHTML::GenerateSelectorOption($code, $selected, $label);
152	152	}
153	153
154		- if (! OptionManager::IsChange() && isset($filter->javascript)) {
	154	+ if (false === RoomOptionManager::IsChange() && isset($filter->javascript)) {
155	155	self::$javascript[] = $filter->javascript;
156	156	}
157	157

--- trunk/include/option/replace_human_selector.php (revision 2726)

+++ trunk/include/option/replace_human_selector.php (revision 2727)

		@@ -10,7 +10,7 @@
10	10	}
11	11
12	12	protected function LoadValue() {
13		- if (OptionManager::IsChange()) {
	13	+ if (RoomOptionManager::IsChange()) {
14	14	$this->SetFormValue('int');
15	15	}
16	16	}

--- trunk/include/option/room_option_manager_class.php (revision 2726)

+++ trunk/include/option/room_option_manager_class.php (revision 2727)

		@@ -12,6 +12,14 @@
12	12	return $stack;
13	13	}
14	14
	15	+ //村オプション変更判定
	16	+ public static function IsChange() {
	17	+ if (self::Stack()->IsEmpty('change')) {
	18	+ self::Stack()->Set('change', false);
	19	+ }
	20	+ return self::Stack()->Get('change');
	21	+ }
	22	+
15	23	//村作成オプション入力情報ロード
16	24	public static function LoadPost() {
17	25	self::LoadPostBase();

--- trunk/include/option/special_role.php (revision 2726)

+++ trunk/include/option/special_role.php (revision 2727)

		@@ -14,7 +14,7 @@
14	14	}
15	15
16	16	protected function LoadValue() {
17		- if (OptionManager::IsChange()) {
	17	+ if (RoomOptionManager::IsChange()) {
18	18	$this->SetFormValue('int');
19	19	}
20	20	}

--- trunk/include/option/sub_role_limit.php (revision 2726)

+++ trunk/include/option/sub_role_limit.php (revision 2727)

		@@ -20,7 +20,7 @@
20	20	}
21	21
22	22	protected function LoadValue() {
23		- if (OptionManager::IsChange()) {
	23	+ if (RoomOptionManager::IsChange()) {
24	24	$this->SetFormValue('key');
25	25	}
26	26	}

--- trunk/include/option/topping.php (revision 2726)

+++ trunk/include/option/topping.php (revision 2727)

		@@ -8,7 +8,7 @@
8	8	}
9	9
10	10	protected function LoadValue() {
11		- if (OptionManager::IsChange() && DB::$ROOM->IsOption($this->name)) {
	11	+ if (RoomOptionManager::IsChange() && DB::$ROOM->IsOption($this->name)) {
12	12	$this->value = DB::$ROOM->option_role->list[$this->name][0];
13	13	}
14	14	}

旧リポジトリブラウザで表示

人狼式 ～汝は人狼なりや？ 式神研究同好会版

jinrousiki: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

人狼式～汝は人狼なりや？式神研究同好会版