OSDN > Find Software > Games/Entertainment > hengbandforosx > SCM > git > hengbandosx > Commit

hengbandforosx
Fork
hengbandosx
web

R/O
HTTP
SSH
HTTPS

hengbandosx: Commit

The master and develop branches track hengband.

OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.

Commit MetaInfo

Revision	426c72f9454329fe9f28ee75d8e3658c48ade777 (tree)
Time	2021-10-05 01:21:17
Author	Eric Branlund <ebranlund@fast...>
Commiter	Eric Branlund

Log Message

Merge branch 'develop' into macos-develop

Change Summary

modified: src/dungeon/quest-completion-checker.cpp (diff)
modified: src/floor/floor-object.cpp (diff)
modified: src/floor/floor-object.h (diff)
modified: src/grid/object-placer.cpp (diff)
modified: src/monster-floor/monster-death.cpp (diff)
modified: src/monster-floor/special-death-switcher.cpp (diff)
modified: src/specific-object/chest.cpp (diff)
modified: src/spell/spells-object.cpp (diff)
modified: src/wizard/wizard-item-modifier.cpp (diff)

Incremental Difference

--- a/src/dungeon/quest-completion-checker.cpp

+++ b/src/dungeon/quest-completion-checker.cpp

		@@ -253,7 +253,7 @@ void QuestCompletionChecker::make_reward(const Pos2D pos)
253	253	while (true) {
254	254	item.wipe();
255	255	auto &r_ref = r_info[this->m_ptr->r_idx];
256		- make_object(this->player_ptr, &item, AM_GOOD \| AM_GREAT, r_ref.level);
	256	+ (void)make_object(this->player_ptr, &item, AM_GOOD \| AM_GREAT, r_ref.level);
257	257	if (!this->check_quality(item)) {
258	258	continue;
259	259	}

--- a/src/floor/floor-object.cpp

+++ b/src/floor/floor-object.cpp

		@@ -81,11 +81,11 @@ static void object_mention(player_type player_ptr, object_type o_ptr)
81	81	msg_format_wizard(player_ptr, CHEAT_OBJECT, _("%sを生成しました。", "%s was generated."), o_name);
82	82	}
83	83
84		-static int get_base_floor(floor_type *floor_ptr, BIT_FLAGS mode, int rq_level)
	84	+static int get_base_floor(floor_type *floor_ptr, BIT_FLAGS mode, std::optional<int> rq_mon_level)
85	85	{
86	86	if (any_bits(mode, AM_GREAT)) {
87		- if (rq_level > 0) {
88		- return rq_level + 10 + randint1(10);
	87	+ if (rq_mon_level.has_value()) {
	88	+ return rq_mon_level.value() + 10 + randint1(10);
89	89	} else {
90	90	return floor_ptr->object_level + 15;
91	91	}

		@@ -115,17 +115,14 @@ static void set_ammo_quantity(object_type *j_ptr)
115	115	* @param player_ptr プレイヤーへの参照ポインタ
116	116	* @param j_ptr 生成結果を収めたいオブジェクト構造体の参照ポインタ
117	117	* @param mode オプションフラグ
118		- * @param rq_floor ランダムクエスト討伐対象のレベル
	118	+ * @param rq_mon_level ランダムクエスト討伐対象のレベル。ランダムクエスト以外の生成であれば無効値
119	119	* @return アイテムの生成成功可否
120		- * @details
121		- * rq_levelは、ユニークのレベルであってランダムクエストの階層ではない
122		- * ランダムクエストではない場合、-1が入る
123	120	*/
124		-bool make_object(player_type player_ptr, object_type j_ptr, BIT_FLAGS mode, int rq_level)
	121	+bool make_object(player_type player_ptr, object_type j_ptr, BIT_FLAGS mode, std::optional<int> rq_mon_level)
125	122	{
126		- floor_type *floor_ptr = player_ptr->current_floor_ptr;
127		- PERCENTAGE prob = ((mode & AM_GOOD) ? 10 : 1000);
128		- auto base = get_base_floor(floor_ptr, mode, rq_level);
	123	+ auto *floor_ptr = player_ptr->current_floor_ptr;
	124	+ auto prob = any_bits(mode, AM_GOOD) ? 10 : 1000;
	125	+ auto base = get_base_floor(floor_ptr, mode, rq_mon_level);
129	126	if (!one_in_(prob) \|\| !make_artifact_special(player_ptr, j_ptr)) {
130	127	if (any_bits(mode, AM_GOOD) && !get_obj_num_hook) {
131	128	get_obj_num_hook = kind_is_good;

--- a/src/floor/floor-object.h

+++ b/src/floor/floor-object.h

		@@ -2,6 +2,7 @@
2	2
3	3	#include "object/item-tester-hooker.h"
4	4	#include "system/angband.h"
	5	+#include <optional>
5	6
6	7	class ObjectIndexList;
7	8

		@@ -9,7 +10,7 @@ struct floor_type;
9	10	struct object_type;;
10	11	struct player_type;
11	12	class ItemTester;
12		-bool make_object(player_type player_ptr, object_type j_ptr, BIT_FLAGS mode, int rq_level);
	13	+bool make_object(player_type player_ptr, object_type j_ptr, BIT_FLAGS mode, std::optional<int> rq_mon_level = std::nullopt);
13	14	bool make_gold(player_type player_ptr, object_type j_ptr);
14	15	void delete_all_items_from_floor(player_type *player_ptr, POSITION y, POSITION x);
15	16	void floor_item_increase(player_type *player_ptr, INVENTORY_IDX item, ITEM_NUMBER num);

--- a/src/grid/object-placer.cpp

+++ b/src/grid/object-placer.cpp

		@@ -77,7 +77,7 @@ void place_object(player_type *player_ptr, POSITION y, POSITION x, BIT_FLAGS mod
77	77
78	78	q_ptr = &forge;
79	79	q_ptr->wipe();
80		- if (!make_object(player_ptr, q_ptr, mode, -1))
	80	+ if (!make_object(player_ptr, q_ptr, mode))
81	81	return;
82	82
83	83	OBJECT_IDX o_idx = o_pop(floor_ptr);

--- a/src/monster-floor/monster-death.cpp

+++ b/src/monster-floor/monster-death.cpp

		@@ -289,7 +289,7 @@ static void drop_items_golds(player_type player_ptr, monster_death_type md_ptr
289	289
290	290	dump_gold++;
291	291	} else {
292		- if (!make_object(player_ptr, q_ptr, md_ptr->mo_mode, -1))
	292	+ if (!make_object(player_ptr, q_ptr, md_ptr->mo_mode))
293	293	continue;
294	294
295	295	dump_item++;

--- a/src/monster-floor/special-death-switcher.cpp

+++ b/src/monster-floor/special-death-switcher.cpp

		@@ -122,7 +122,7 @@ static void on_dead_raal(player_type player_ptr, monster_death_type md_ptr)
122	122	else
123	123	get_obj_num_hook = kind_is_book;
124	124
125		- make_object(player_ptr, q_ptr, md_ptr->mo_mode, -1);
	125	+ (void)make_object(player_ptr, q_ptr, md_ptr->mo_mode);
126	126	(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
127	127	}
128	128

		@@ -342,7 +342,7 @@ static void on_dead_big_raven(player_type player_ptr, monster_death_type md_pt
342	342	static bool make_equipment(player_type player_ptr, object_type q_ptr, const BIT_FLAGS drop_mode, const bool is_object_hook_null)
343	343	{
344	344	q_ptr->wipe();
345		- (void)make_object(player_ptr, q_ptr, drop_mode, -1);
	345	+ (void)make_object(player_ptr, q_ptr, drop_mode);
346	346	if (!is_object_hook_null) {
347	347	return true;
348	348	}

		@@ -436,7 +436,7 @@ static void drop_specific_item_on_dead(player_type *player_ptr, monster_death_ty
436	436	object_type *q_ptr = &forge;
437	437	q_ptr->wipe();
438	438	get_obj_num_hook = object_hook_pf;
439		- (void)make_object(player_ptr, q_ptr, md_ptr->mo_mode, -1);
	439	+ (void)make_object(player_ptr, q_ptr, md_ptr->mo_mode);
440	440	(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
441	441	}
442	442

--- a/src/specific-object/chest.cpp

+++ b/src/specific-object/chest.cpp

		@@ -102,7 +102,7 @@ void Chest::chest_death(bool scatter, POSITION y, POSITION x, OBJECT_IDX o_idx)
102	102	/* Otherwise drop an item */
103	103	else {
104	104	/* Make a good object */
105		- if (!make_object(this->player_ptr, q_ptr, mode, -1))
	105	+ if (!make_object(this->player_ptr, q_ptr, mode))
106	106	continue;
107	107	}
108	108

--- a/src/spell/spells-object.cpp

+++ b/src/spell/spells-object.cpp

		@@ -192,7 +192,7 @@ void acquirement(player_type *player_ptr, POSITION y1, POSITION x1, int num, boo
192	192	i_ptr->wipe();
193	193
194	194	/* Make a good (or great) object (if possible) */
195		- if (!make_object(player_ptr, i_ptr, mode, -1))
	195	+ if (!make_object(player_ptr, i_ptr, mode))
196	196	continue;
197	197
198	198	if (known) {

--- a/src/wizard/wizard-item-modifier.cpp

+++ b/src/wizard/wizard-item-modifier.cpp

		@@ -447,7 +447,7 @@ static void wiz_statistics(player_type player_ptr, object_type o_ptr)
447	447	object_type forge;
448	448	object_type *q_ptr = &forge;
449	449	q_ptr->wipe();
450		- make_object(player_ptr, q_ptr, mode, -1);
	450	+ make_object(player_ptr, q_ptr, mode);
451	451	if (q_ptr->is_fixed_artifact())
452	452	a_info[q_ptr->name1].cur_num = 0;
453	453

Show on old repository browser