Changeset 59

Timestamp:

04/22/07 11:24:42 (2 years ago)

Author:

pmac

Message:

• Added ego lite support
  
• Added 'selections' to store menus
  
• Fixed stupid bogus selection on '=' and '?' in birth.c
  

Files:

• trunk/src/birth.c (modified) (2 diffs)
• trunk/src/cmd3.c (modified) (7 diffs)
• trunk/src/dungeon.c (modified) (4 diffs)
• trunk/src/load.c (modified) (1 diff)
• trunk/src/object1.c (modified) (2 diffs)
• trunk/src/object2.c (modified) (1 diff)
• trunk/src/store.c (modified) (5 diffs)
• trunk/src/ui.c (modified) (1 diff)
• trunk/src/ui.h (modified) (1 diff)
• trunk/src/xtra1.c (modified) (2 diffs)

trunk/src/birth.c

@@ -589 +589 @@
-        object_prep(i_ptr, lookup_kind(TV_LITE, SV_LITE_TORCH));
-        i_ptr->number = (byte)rand_range(3, 7);
-pval
+timeout
-        object_aware(i_ptr);
-        object_known(i_ptr);
@@ -829 +829 @@
-                }
-
-
+
+
+
-        }
-

trunk/src/cmd3.c

@@ -786 +786 @@
-        if ((o_ptr->tval == TV_LITE) &&
-            (o_ptr->sval == SV_LITE_LANTERN) &&
-pval
+timeout
-        {
-                return (TRUE);
@@ -837 +837 @@
-
-        /* Refuel */
-pval +=
+timeout += o_ptr->timeout ? o_ptr->timeout :
-
-        /* Message */
@@ -843 +843 @@
-
-        /* Comment */
-pval
-
-pval
+timeout
+
+timeout
-                msg_print("Your lamp is full.");
-        }
-
-
+n
-        if (o_ptr->sval == SV_LITE_LANTERN)
-        {
@@ -868 +868 @@
-
-                        /* Remove fuel */
-pval
+timeout
-
-                        /* Unstack the used item */
@@ -881 +881 @@
-                }
-
-
+n
-                else
-                {
-                        /* No more fuel */
-pval
+timeout
-                }
-
@@ -979 +979 @@
-
-        /* Refuel */
-pval += o_ptr->pval
+timeout += o_ptr->timeout
-
-        /* Message */
@@ -985 +985 @@
-
-        /* Over-fuel message */
-pval
-
-pval
+timeout
+
+timeout
-                msg_print("Your torch is fully fueled.");
-        }

trunk/src/dungeon.c

@@ -456 +456 @@
-
-                /* Recharge activatable objects */
-
+ && !(o_ptr->tval == TV_LITE && !artifact_p(o_ptr))
-                {
-                        /* Recharge */
@@ -1026 +1026 @@
-        {
-                /* Hack -- Use some fuel (except on artifacts) */
-pval
+timeout
-                {
-                        /* Decrease life-span */
-pval
+timeout
-
-                        /* Hack -- notice interesting fuel steps */
-pval < 100) || (!(o_ptr->pval
+timeout < 100) || (!(o_ptr->timeout
-                        {
-                                /* Window stuff */
@@ -1042 +1042 @@
-                        {
-                                /* Hack -- save some light for later */
-pval == 0) o_ptr->pval
+timeout == 0) o_ptr->timeout
-                        }
-
-                        /* The light is now out */
-pval
+timeout
-                        {
-                                disturb(0, 0);
@@ -1053 +1053 @@
-
-                        /* The light is getting dim */
-pval < 100) && (!(o_ptr->pval
+timeout < 100) && (!(o_ptr->timeout
-                        {
-                                if (disturb_minor) disturb(0, 0);

trunk/src/load.c

@@ -478 +478 @@
-                }
-        }
+
+        if(older_than(3, 0, 9) && o_ptr->tval == TV_LITE && !artifact_p(o_ptr) && !ego_item_p(o_ptr) && o_ptr->pval)
+        {
+                o_ptr->timeout = o_ptr->pval;
+                o_ptr->pval = 0;
+        }
+
-
-        /* Success */

trunk/src/object1.c

@@ -1318 +1318 @@
-                /* Hack -- Turns of light for normal lites */
-                object_desc_str_macro(t, " (with ");
-pval
+timeout
-                object_desc_str_macro(t, " turns of light)");
-        }
@@ -1467 +1467 @@
-
-        /* Indicate "charging" artifacts */
-
+ && !(o_ptr->tval == TV_LITE && !artifact_p(o_ptr))
-        {
-                /* Hack -- Dump " (charging)" if relevant */

trunk/src/object2.c

@@ -2450 +2450 @@
-                case TV_LITE:
-                {
--- random fuel
+& lanterns -- random fuel at 1/2 max
-                        if (o_ptr->sval == SV_LITE_TORCH)
-                        {
-if (o_ptr->pval > 0) o_ptr->pval = randint(o_ptr->pval
+o_ptr->timeout = randint(FUEL_TORCH/2
-                        }
-
-                        /* Hack -- Lanterns -- random fuel */
-                        else if (o_ptr->sval == SV_LITE_LANTERN)
-                        {
-if (o_ptr->pval > 0) o_ptr->pval = randint(o_ptr->pval
+o_ptr->timeout = randint(FUEL_LAMP/2
-                        }
-

trunk/src/store.c

@@ -1169 +1169 @@
-        if (object.tval == TV_LITE)
-        {
-pval
-pval
+timeout
+timeout
-        }
-
@@ -1302 +1302 @@
-                if (i_ptr->tval == TV_LITE)
-                {
-pval
-pval
+timeout
+timeout
-                }
-
@@ -2633 +2633 @@
-                {
-                        store_sell(oid);
-
-                        break;
-                }
@@ -2873 +2872 @@
-
-                        /* These two can't intersect! */
-r\t?=C
+p\r\t?=Cd
-                        menu.selections = "abcfghjkmnopqrtuvxyz";
-                }
@@ -2882 +2881 @@
-
-                        /* These two can't intersect! */
-r{}Id
-g
+p\r{}gI
+
-                }
-                if(cursor >= menu.count) cursor = menu.count -1;

trunk/src/ui.c

@@ -42 +42 @@
-
-const char lower_case[] = "abcdefghijklmnopqrstuvwxyz";
+const char upper_case[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-int jumpscroll = 0;

trunk/src/ui.h

@@ -30 +30 @@
-extern const char default_choice[];             /* 1234567890A-Za-z */
-extern const char lower_case[];                 /* abc..z */
+extern const char upper_case[];                 /* ABC..Z */
-
-

trunk/src/xtra1.c

@@ -1793 +1793 @@
-                        
-                        /* Lanterns (with fuel) provide more lite */
-pval
+timeout
-                        {
-                                p_ptr->cur_lite += 2;
@@ -1800 +1800 @@
-                        
-                        /* Torches (with fuel) provide some lite */
-pval
+timeout
-                        {
-                                p_ptr->cur_lite += 1;