Changeset 929

Timestamp:

05/17/08 11:20:24 (6 months ago)

Author:

takkaria

Message:

Got bored of all the warnings in cmd4.c so I cleaned them up.

Files:

• trunk/src/cmd4.c (modified) (26 diffs)

trunk/src/cmd4.c

@@ -322 +322 @@
-        byte attr = curs_attrs[CURS_KNOWN][cursor == oid];
-
+        (void)wid;
+
-        /* Print the interesting part */
-        o_funcs->display_member(col, row, cursor, oid);
@@ -341 +343 @@
-static const char *recall_prompt(int oid)
-{
+        (void)oid;
-        return ", 'r' to recall";
-}
@@ -1032 +1035 @@
-static int m_cmp_race(const void *a, const void *b)
-{
-monster_race *r_a = &r_info[default_join[*(int
-monster_race *r_b = &r_info[default_join[*(int
-int
+const monster_race *r_a = &r_info[default_join[*(const int 
+const monster_race *r_b = &r_info[default_join[*(const int 
+const int 
-
-        /* Group by */
-int
+const int 
-        if (c) return c;
-
@@ -1059 +1062 @@
-static const char *race_name(int gid) { return monster_group[gid].name; }
-
- 
- 
+
+
-        /* Save the screen */
-        screen_save();
@@ -1085 +1088 @@
-
-        /* Access the race */
-        
-        for (i = 0; i < n; i++)
-        {
@@ -1143 +1145 @@
-        member_funcs m_funcs = {display_monster, mon_lore, m_xchar, m_xattr, recall_prompt, 0, 0};
-
-        
-        int *monsters;
-        int m_count = 0;
-        int i;
-        size_t j;
+
+        (void)obj;
+        (void)name;
-
-        for (i = 0; i < z_info->r_max; i++)
@@ -1264 +1268 @@
-static int a_cmp_tval(const void *a, const void *b)
-{
-
-
+
+
+
-        /*group by */
-        int ta = obj_group_order[a_a->tval];
@@ -1360 +1365 @@
-        int a_count = 0;
-
+        (void)obj;
+        (void)name;
+
-        artifacts = C_ZNEW(z_info->a_max, int);
-
@@ -1450 +1458 @@
-static int e_cmp_tval(const void *a, const void *b)
-{
-ego_item_type *ea = &e_info[default_join[*(int
-ego_item_type *eb = &e_info[default_join[*(int
+const ego_item_type *ea = &e_info[default_join[*(const int 
+const ego_item_type *eb = &e_info[default_join[*(const int 
-
-        /* Group by */
-int*)a].gid - default_join[*(int
+const int *)a].gid - default_join[*(const int 
-        if (c) return c;
-
@@ -1474 +1482 @@
-        int e_count = 0;
-        int i, j;
+
+        (void)obj;
+        (void)name;
-
-        /* HACK: currently no more than 3 tvals for one ego type */
@@ -1537 +1548 @@
-{
-        int k_idx = oid;
-
+
-        object_kind *k_ptr = &k_info[k_idx];
-        const char *inscrip = get_autoinscription(oid);
@@ -1632 +1643 @@
-static int o_cmp_tval(const void *a, const void *b)
-{
-object_kind *k_a = &k_info[*(int
-object_kind *k_b = &k_info[*(int
+const object_kind *k_a = &k_info[*(const int 
+const object_kind *k_b = &k_info[*(const int 
-
-        /* Group by */
@@ -1770 +1781 @@
-        int i;
-
+        (void)obj;
+        (void)name;
+
-        objects = C_ZNEW(z_info->k_max, int);
-
@@ -1820 +1834 @@
-static int f_cmp_fkind(const void *a, const void *b)
-{
-
-
+
+
+
-        /* group by */
-int*)a) - feat_order(*(int
+const int *)a) - feat_order(*(const int 
-        if (c) return c;
+
-        /* order by feature name */
-        return strcmp(f_name + fa->name, f_name + fb->name);
@@ -1832 +1848 @@
-static byte *f_xattr(int oid) { return &f_info[oid].x_attr; }
-static char *f_xchar(int oid) { return &f_info[oid].x_char; }
-
+(void)oid; 
-
-/*
@@ -1847 +1863 @@
-        int f_count = 0;
-        int i;
+
+        (void)obj;
+        (void)name;
-
-        features = C_ZNEW(z_info->f_max, int);
@@ -2288 +2307 @@
-{
-        byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
+        (void)menu;
+        (void)width;
-
-        c_prt(attr, format("%-45s: %s  (%s)", option_desc(oid),
@@ -2299 +2320 @@
-static bool update_option(char key, void *pgdb, int oid)
-{
+        (void)pgdb;
+
-        /* Ignore arrow events */
-        if (key == ARROW_LEFT || key == ARROW_RIGHT)
@@ -3024 +3047 @@
- * CLEANUP
- */
-
-static menu_action macro_actions[] =
-{
-LOAD_PREF, "Load a user pref file", 0
+ LOAD_PREF,  "Load a user pref file",    0, 0 
-#ifdef ALLOW_MACROS
-APP_MACRO, "Append macros to a file", 0
-ASK_MACRO, "Query a macro", 0
-NEW_MACRO, "Create a macro", 0
-DEL_MACRO, "Remove a macro", 0
-APP_KEYMAP, "Append keymaps to a file", 0
-ASK_KEYMAP, "Query a keymap", 0
-NEW_KEYMAP, "Create a keymap", 0
-DEL_KEYMAP, "Remove a keymap", 0
-ENTER_ACT, "Enter a new action", 0}
+ APP_MACRO,  "Append macros to a file",  0, 0 
+ ASK_MACRO,  "Query a macro",            0, 0 
+ NEW_MACRO,  "Create a macro",           0, 0 
+ DEL_MACRO,  "Remove a macro",           0, 0 
+ APP_KEYMAP, "Append keymaps to a file", 0, 0 
+ ASK_KEYMAP, "Query a keymap",           0, 0 
+ NEW_KEYMAP, "Create a keymap",          0, 0 
+ DEL_KEYMAP, "Remove a keymap",          0, 0 
+ ENTER_ACT,  "Enter a new action",       0, 0 },
-#endif /* ALLOW_MACROS */
-};
@@ -4029 +4051 @@
-static void do_dump_options(void *unused, const char *title)
-{
+        (void)unused;
-        dump_pref_file(option_dump, title, 20);
-}
@@ -4067 +4090 @@
-static char tag_opt_main(menu_type *menu, int oid)
-{
+        (void)menu;
-        if (option_actions[oid].id)
-                return option_actions[oid].id;
@@ -4075 +4099 @@
-static int valid_opt_main(menu_type *menu, int oid)
-{
+        (void)menu;
-        if (option_actions[oid].name)
-                return 1;
@@ -4085 +4110 @@
-        byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
-
+        (void)menu;
+        (void)width;
-        if (option_actions[oid].name)
-                c_prt(attr, option_actions[oid].name, row, col);
@@ -4129 +4156 @@
-static void do_cmd_self_knowledge(void *obj, const char *name)
-{
+        (void)obj;
+        (void)name;
+
-        /* display self knowledge we already know about. */
-        self_knowledge(FALSE);
@@ -4135 +4165 @@
-static void do_cmd_knowledge_scores(void *obj, const char *name)
-{
+        (void)obj;
+        (void)name;
-        show_scores();
-}
@@ -4140 +4172 @@
-static void do_cmd_knowledge_history(void *obj, const char *name)
-{
+        (void)obj;
+        (void)name;
-        history_display();
-}