• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision4c151c069562fc169adedf709242d4e9583dc0e5 (tree)
Time2019-01-12 22:51:10
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 コメント整理。 / Refactor comments.

Change Summary

Incremental Difference

--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -376,7 +376,6 @@ void do_cmd_wield(void)
376376 /* Player touches it */
377377 o_ptr->marked |= OM_TOUCHED;
378378
379- /* Increase the weight */
380379 p_ptr->total_weight += q_ptr->weight;
381380
382381 /* Increment the equip counter by hand */
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3701,7 +3701,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
37013701 /* Wear the new stuff */
37023702 object_copy(o_ptr, q_ptr);
37033703
3704- /* Increase the weight */
37053704 p_ptr->total_weight += q_ptr->weight;
37063705
37073706 /* Increment the equip counter by hand */
--- a/src/object2.c
+++ b/src/object2.c
@@ -126,7 +126,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
126126 POSITION y = j_ptr->iy;
127127 POSITION x = j_ptr->ix;
128128
129- /* Grid */
130129 c_ptr = &cave[y][x];
131130
132131 /* Scan all objects in the grid */
@@ -222,7 +221,6 @@ void delete_object(POSITION y, POSITION x)
222221 /* Refuse "illegal" locations */
223222 if (!in_bounds(y, x)) return;
224223
225- /* Grid */
226224 c_ptr = &cave[y][x];
227225
228226 /* Scan all objects in the grid */
@@ -5291,7 +5289,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
52915289 }
52925290
52935291
5294- /* Grid */
52955292 c_ptr = &cave[by][bx];
52965293
52975294 /* Scan objects in that grid for combination */
@@ -5306,7 +5303,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
53065303 /* Check for combination */
53075304 if (object_similar(o_ptr, j_ptr))
53085305 {
5309- /* Combine the items */
53105306 object_absorb(o_ptr, j_ptr);
53115307
53125308 /* Success */
@@ -6004,13 +6000,10 @@ s16b inven_carry(object_type *o_ptr)
60046000 /* Check if the two items can be combined */
60056001 if (object_similar(j_ptr, o_ptr))
60066002 {
6007- /* Combine the items */
60086003 object_absorb(j_ptr, o_ptr);
60096004
6010- /* Increase the weight */
60116005 p_ptr->total_weight += (o_ptr->number * o_ptr->weight);
60126006 p_ptr->update |= (PU_BONUS);
6013-
60146007 p_ptr->window |= (PW_INVEN);
60156008
60166009 /* Success */
@@ -6080,16 +6073,11 @@ s16b inven_carry(object_type *o_ptr)
60806073 /* Player touches it, and no longer marked */
60816074 j_ptr->marked = OM_TOUCHED;
60826075
6083- /* Increase the weight */
60846076 p_ptr->total_weight += (j_ptr->number * j_ptr->weight);
60856077
60866078 /* Count the items */
60876079 inven_cnt++;
6088- p_ptr->update |= (PU_BONUS);
6089-
6090- /* Combine and Reorder pack */
6091- p_ptr->update |= (PU_COMBINE | PU_REORDER);
6092-
6080+ p_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER);
60936081 p_ptr->window |= (PW_INVEN);
60946082
60956083 /* Return the slot */
Show on old repository browser