Changeset 443

Timestamp:

08/05/07 00:39:21 (1 year ago)

Author:

ctate

Message:

* Fix subtle copy/paste bug in the object-origin code from [404]
* Decouple make_gold() and make_object() from the object_level global var
* Pin chest contents to their origin depth, not depth where opened [TODO: sale price for an unopened chest as a function of origin depth]
* Minor renaming in monster_death() for (my) comprehension

Files:

• trunk/src/cmd2.c (modified) (2 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/object2.c (modified) (9 diffs)
• trunk/src/wizard2.c (modified) (1 diff)
• trunk/src/xtra2.c (modified) (3 diffs)

trunk/src/cmd2.c

@@ -223 +223 @@
-                {
-                        /* Make some gold */
-
+, o_ptr->origin_depth
-                }
-
@@ -230 +230 @@
-                {
-                        /* Make an object */
-
+o_ptr->origin_depth, 
-                }
-

trunk/src/externs.h

@@ -444 +444 @@
-extern void object_prep(object_type *o_ptr, int k_idx);
-extern void apply_magic(object_type *o_ptr, int lev, bool okay, bool good, bool great);
-
-
+int lev, 
+, int lev
-extern s16b floor_carry(int y, int x, object_type *j_ptr);
-extern void drop_near(object_type *j_ptr, int chance, int y, int x);

trunk/src/object2.c

@@ -1343 +1343 @@
-
-                        bool r_uniq = (r_ptr->flags1 & RF1_UNIQUE) ? TRUE : FALSE;
-r
+s
-
-                        if (r_uniq && !s_uniq) act = 0;
@@ -2868 +2868 @@
- * This routine plays nasty games to generate the "special artifacts".
- *
- * This routine uses "object_level" for the "generation level".
- *
- * We assume that the given object has been "wiped".
- */
-
+int lev, 
-{
-        int prob, base;
@@ -2882 +2880 @@
-
-        /* Base level for the object */
-object_level + 10) : object_level
+lev + 10) : lev
-
-
@@ -2925 +2923 @@
-
-        /* Apply magic (allow artifacts) */
-object_level
+lev
-
-
@@ -2967 +2965 @@
- * The location must be a legal, clean, floor grid.
- */
-
+, int lev
-{
-        int sval;
@@ -2975 +2973 @@
-
-        /* Hack -- Pick a Treasure variety */
-object_level
+lev
-
-        /* Apply "extra" magic */
-        if (rand_int(GREAT_OBJ) == 0)
-        {
-object_level
+lev
-        }
-
@@ -3327 +3325 @@
-
-                /* Make a good (or great) object (if possible) */
-
+object_level, 
-                i_ptr->origin = ORIGIN_ACQUIRE;
-                i_ptr->origin_depth = p_ptr->depth;
@@ -3358 +3356 @@
-
-        /* Make an object (if possible) */
-
+object_level, 
-        {
-                i_ptr->origin = ORIGIN_FLOOR;
@@ -3394 +3392 @@
-
-        /* Make some gold */
-
+, object_level
-        {
-                /* Give it to the floor */

trunk/src/wizard2.c

@@ -762 +762 @@
-
-                        /* Create an object */
-
+object_level, 
-
-

trunk/src/xtra2.c

@@ -1176 +1176 @@
-        bool great = (r_ptr->flags1 & (RF1_DROP_GREAT)) ? TRUE : FALSE;
-
-do_gold
-do_item
+gold_ok
+item_ok
-
-        int force_coin = get_coin_type(r_ptr);
@@ -1287 +1287 @@
-
-                /* Make Gold */
-do_gold && (!do_item
+gold_ok && (!item_ok
-                {
-                        /* Make some gold */
-
+, object_level
-
-                        /* Assume seen XXX XXX XXX */
@@ -1300 +1300 @@
-                {
-                        /* Make an object */
-
+object_level, 
-
-                        /* Assume seen XXX XXX XXX */