Changeset 125

Timestamp:

05/08/07 21:04:38 (1 year ago)

Author:

pmac

Message:

Code cleanup.

Files:

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

trunk/src/cmd4.c

@@ -29 +29 @@
-#define MISSING -17
-
-#define LOAD_PREF       100
-#define APP_MACRO       101
-#define ASK_MACRO       103
@@ -39 +38 @@
-#define NEW_KEYMAP      109
-#define ENTER_ACT       110
+#define LOAD_PREF       111
+#define DUMP_MON        112
+#define DUMP_OBJ        113
+#define DUMP_FEAT       114
+#define DUMP_FLAV       115
+#define MOD_MON         116
+#define MOD_OBJ         117
+#define MOD_FEAT        118
+#define MOD_FLAV        119
+#define DUMP_COL        120
+#define MOD_COL         121
+#define RESET_VIS       122
+
+#define OPTION_MENU 140
+#define VISUAL_MENU 141
+#define COLOR_MENU      142
+#define KNOWLEDGE_MENU 143
+#define MACRO_MENU      144
-
-
@@ -45 +62 @@
-
-
-
+
+
-                int maxnum; /* Maximum possible item count for this class */
-                bool easy_know; /* Items don't need to be IDed to recognize membership */
@@ -61 +79 @@
-} group_funcs;
-
-
+
+
-
-                /* Print a tabular-formatted description for an oid */
@@ -89 +108 @@
-
-/* Helper class for generating joins */
-
+
+
-                int oid;
-                int gid;
@@ -111 +131 @@
- * Description of each monster group.
- */
-
+
+
-                cptr chars;
-                cptr name;
@@ -235 +256 @@
-{
-        Term_putch(col, row, a, c);
-
+ 
-        if (a &0x80) Term_putch(col+1, row, 255, -1);
-        else Term_putch(col+1, row, 1, ' ');
@@ -242 +263 @@
-static int actual_width(int width) {
-        if (use_trptile) width = width * 3;
-
-
+ 
+ 
-                return width;
-}
-
-static int actual_height(int height) {
-
+ 
-        if (use_trptile) height = height * 3 / 2;
-
+ 
-        return height;
-}
@@ -257 +278 @@
-{
-        int div = 1;
-
-
-
+ 
+ 
+ 
-        return width / div;
-}
@@ -266 +287 @@
-{
-        int div = 1;
-
+
+
-                height *= 2;
-                div = 3;
-        }
-
-
+ 
+ 
-        return height / div;
-}
@@ -341 +363 @@
-
-        /* Show inscription, if applicable, aware and existing */
-
+
+
-                c_put_str(TERM_YELLOW,quark_str(*o_funcs->note(oid)), row, 65);
-        }
@@ -350 +373 @@
-
-        /* Do visual mode */
-
+
+
-                char c = *o_funcs->xchar(oid);
-                byte a = *o_funcs->xattr(oid);
@@ -385 +409 @@
-        int oid = -1;                           /* object identifiers */
-
-0, 0, 0, 4
-0, 6, MISSING, -2
-MISSING, 6, 0, -2
+ 0, 0, 0, 4 
+ 0, 6, MISSING, -2 
+ MISSING, 6, 0, -2 
-
-        /* display state variables */
@@ -427 +451 @@
-        /* Do the group by. ang_sort only works on (void **) */
-        /* Maybe should make this a precondition? */
-
+ 
-                        qsort(obj_list, o_count, sizeof(*obj_list), g_funcs.gcomp);
-
@@ -433 +457 @@
-        C_MAKE(g_offset, max_group+1, int);
-
-
-
+
+
+
+
-                        prev_g = g_funcs.group(obj_list[i]);
-                        g_offset[grp_cnt] = i;
@@ -443 +469 @@
-        g_list[grp_cnt] = -1;
-
-
-
-        /* The compact set of group names, in display order */
-        C_MAKE(g_names, grp_cnt, const char **);
-
+
+
-                int len;
-                g_names[i] = g_funcs.name(g_list[i]);
-                len = strlen(g_names[i]);
-
-
-
+
+
+
+
-
-        object_region.col = g_name_len+3;
@@ -462 +488 @@
-
-        /* Leave room for the group summary information */
-
+ 
-
-        WIPE(&group_menu, menu_type);
@@ -483 +509 @@
-        /* Panels are -- text panels, two menus, and visual browser */
-        /* with "pop-up menu" for lore */
-
+
+
-                event_type ke, ke0;
-
+
+
-                        region_erase(&title_area);
-                        prt(format("Knowledge - %s", title), 2, 0);
@@ -491 +519 @@
-                        prt("Name", 4, g_name_len + 3);
-                        Term_gotoxy(65, 4);
-
+ 
-                                Term_addstr(-1, TERM_WHITE, "Inscribed ");
-
+ 
-                                Term_addstr(-1, TERM_WHITE, otherfields);
-                        for (i = 0; i < 78; i++)
@@ -503 +531 @@
-                }
-
-
+
+
-                        grp_old = g_cur;
-                        o_cur = 0;
@@ -512 +541 @@
-                }
-                /* HACK ... */
-
+
+
-                        /* ... The object menu may be browsing the entire group... */
-                        o_funcs.is_visual = FALSE;
@@ -518 +548 @@
-                        object_menu.cursor = o_cur;
-                }
-
+
+
-                        /* ... or just a single element in the group. */
-                        o_funcs.is_visual = TRUE;
@@ -538 +569 @@
-                        const char *pvs = (!o_funcs.xattr) ? "" : ", 'v' for visuals";
-
-
+ 
-                                prt(format("<dir>, 'r' to recall, ENTER to accept%s, ESC", pedit), hgt-1, 0);
-                        else 
@@ -544 +575 @@
-                                                                                pvs, pedit, pnote, pnote1), hgt-1, 0);
-                }
-
+
+
-                        do_swap = FALSE;
-                        swap(active_menu, inactive_menu);
@@ -551 +583 @@
-                }
-
-
+ 
-                        g_funcs.summary(g_cur, obj_list, g_o_count, g_offset[g_cur],
-                        object_menu.boundary.row + object_menu.boundary.page_rows, object_region.col);
@@ -590 +622 @@
-                }
-
-
+
+
-                        /* Change active panels */
-
+
+
-                                swap(active_menu, inactive_menu);
-                                swap(active_cursor, inactive_cursor);
@@ -599 +633 @@
-                }
-                ke0 = run_event_loop(&active_menu->target, 0, &ke);
-
+ 
-                switch(ke.type) {
-                        case EVT_KBRD:
@@ -607 +641 @@
-                                continue;
-                        case EVT_SELECT:
-
+
+
-                                        o_funcs.lore(oid);
-                                        redraw = TRUE;
@@ -615 +650 @@
-                                continue;
-                        case EVT_BACK:
-
+ 
-                                        do_swap = TRUE;
-                        default:
@@ -633 +668 @@
-                        {
-                                /* Recall on screen */
-
+ 
-                                        o_funcs.lore(oid);
-
@@ -694 +729 @@
-                                        /* Auto-inscribe */
-                                        if (g_funcs.aware(i_ptr) || cheat_peek)
-
+       
-                                }
-
@@ -704 +739 @@
-                                int d = target_dir(ke.key);
-                                /* Handle key-driven motion between panels */
-
+
+
-                                        /* Silly hack -- diagonal arithmetic */
-                                        *inactive_cursor += ddy[d];
-
-
-
+ 
+ 
+ 
-                                        do_swap = TRUE;
-                                }
-
+
+
-                                        note_idx = auto_note_modify(*o_funcs.note(oid), ke.key);
-                                        *o_funcs.note(oid) = note_idx;
@@ -1021 +1058 @@
-        /* group by */
-        int c = gid - default_join[*(int*)b].gid;
-
+ 
-        /* order results */
-        c = r_a->d_char - r_b->d_char;
-
+
+
-                /* UNIQUE group is ordered by level & name only */
-                /* Others by order they appear in the group symbols */
@@ -1031 +1069 @@
-        }
-        c = r_a->level - r_b->level;
-
+ 
-        return strcmp(r_name + r_a->name, r_name + r_b->name);
-}
-
-
-
-
-
+
+
-static const char *race_name(int gid) { return monster_group[gid].name; }
-static void mon_lore(int oid) { screen_roff(default_join[oid].oid); inkey_ex(); }
@@ -1047 +1083 @@
-        int kills = 0;
-
-
+
+
-                int oid = default_join[object_list[i+top]].oid;
-                kills += l_list[oid].pkills;
-        }
-
+
+
-                c_prt(TERM_L_BLUE, format("Known Uniques: %d, Slain Uniques: %d.", n, kills),
-                                        row, col);
-        }
-
+
+
-                int tkills = 0;
-
+ 
-                        tkills += l_list[i].pkills;
-                c_prt(TERM_L_BLUE, format("Creatures Slain: %d/%d (in group/in total)", kills, tkills), row, col);
@@ -1079 +1118 @@
-        size_t j;
-
-
+
+
-                monster_race *r_ptr = &r_info[i];
-
-
-
-
-
+
+
+
+
+
+
-                        const char *pat = monster_group[j].chars;
-
+ 
-                }
-        }
@@ -1095 +1136 @@
-
-        m_count = 0;
-
+
+
-                monster_race *r_ptr = &r_info[i];
-
-
+ 
+ 
-        
-
+
+
-                        const char *pat = monster_group[j].chars;
-
+ 
-                                continue;
-
+ 
-                                continue;
-
@@ -1168 +1211 @@
-        make_fake_artifact(o_ptr, a_idx);
-        o_ptr->ident |= IDENT_STORE | IDENT_KNOWN;
-
+ 
-
-        /* Hack -- Handle stuff */
@@ -1190 +1233 @@
-        int tb = obj_group_order[a_b->tval];
-        int c = ta - tb;
-
+ 
-
-        /* order by */
-        c = a_a->sval - a_b->sval;
-
+ 
-        return strcmp(a_name+a_a->name, a_name+a_b->name);
-}
@@ -1219 +1262 @@
-        
-        /* Collect valid artifacts */
-
-
+
+
+
-                        artifacts[a_count++] = i;
-        }
-
+
+
-                int a = o_list[i].name1;
-
-
+
+
+
-                        a_count -= 1;
-
+ 
-                                artifacts[j] = artifacts[j+1];
-                }
@@ -1283 +1329 @@
-        /* Begin recall */
-        Term_gotoxy(0, 1);
-
+
+
-                int x, y;
-                text_out(e_text + e_ptr->text);
@@ -1295 +1342 @@
-        object_info_out(&dummy);
-
-
+
+
-                text_out(format("It provides one random %s.", xtra[e_ptr->xtra - 1]));
-        }
-
-
-
+
+
+
+
-                        text_out_c(TERM_RED, format("It is %s.", cursed[i]));
-                        break;
@@ -1320 +1370 @@
-        /*group by */
-        int c = default_join[*(int*)a].gid - default_join[*(int*)b].gid;
-
+ 
-        /* order by */
-        return strcmp(e_name + ea->name, e_name + eb->name);
@@ -1342 +1392 @@
-        C_MAKE(egoitems, z_info->e_max*EGO_TVALS_MAX, int);
-        C_MAKE(default_join, z_info->e_max*EGO_TVALS_MAX, join_t);
-
-
-
+
+
+
+
+
-                        {
-                                int gid = obj_group_order[e_info[i].tval[j]];
-                                /* Ignore duplicate gids */
-
+ 
-                                        continue;
-                                egoitems[e_count] = e_count;
@@ -1450 +1502 @@
-        int tb = obj_group_order[k_b->tval];
-        int c = ta - tb;
-
+ 
-        /* order by */
-        c = k_a->aware - k_b->aware;
-
-
+
+
+
-                return strcmp(flavor_text + flavor_info[k_a->flavor].text,
-                                                                        flavor_text +flavor_info[k_b->flavor].text);
-        }
-        c = k_a->cost - k_b->cost;
-
+ 
-        return strcmp(k_name + k_a->name, k_name + k_b->name);
-}
@@ -1465 +1518 @@
-static char *o_xchar(int oid) {
-        object_kind *k_ptr = &k_info[oid];
-
+ 
-        else return &flavor_info[k_ptr->flavor].x_char;
-}
-static byte *o_xattr(int oid) {
-        object_kind *k_ptr = &k_info[oid];
-
+ 
-        else return &flavor_info[k_ptr->flavor].x_attr;
-}
@@ -1477 +1530 @@
-        object_kind *k_ptr = &k_info[oid];
-        int ind = get_autoinscription_index(oid);
-
+ 
-        else return 0;
-}
@@ -1495 +1548 @@
-        C_MAKE(objects, z_info->k_max, int);
-
-
-
+
+
+
+
-                        int c = obj_group_order[k_info[i].tval];
-
+ 
-                }
-        }
@@ -1541 +1596 @@
-        /* group by */
-        int c = feat_order(*(int*)a) - feat_order(*(int*)b);
-
+ 
-        /* order by feature name */
-        return strcmp(f_name + fa->name, f_name + fb->name);
@@ -1566 +1621 @@
-        C_MAKE(features, z_info->f_max, int);
-
-
-
+
+
+
-                features[f_count++] = i; /* Currently no filter for features */
-        }
@@ -2134 +2190 @@
-        menu_layout(menu, &SCREEN_REGION);
-
-
+ 
-        {
-                event_type cx;
-                cx = menu_select(menu, &cursor_pos, EVT_MOVE);
-                if (cx.type == EVT_BACK || ESCAPE == cx.key) break;
-
-
+ 
+ 
-                        cursor_pos++;
-                cursor_pos = (cursor_pos+n)%n;
@@ -2521 +2577 @@
-
-        /* Failure */
-
+
+
-                msg_print("Failed");
-                return;
@@ -2915 +2972 @@
-                c = menu_select(&macro_menu, &cursor, EVT_CMD);
-
-
+ 
-                        break;
-                evt = macro_actions[cursor].id;
@@ -3354 +3411 @@
-event_action visual_menu_items [] =
-{
-'lupf'
-'vdmx'
-'vdox'
-'vdfx'
-'vdxx'
-'vemx'
-'veox'
-'vefx'
-'vexx'
-'vrst'
+LOAD_PREF
+DUMP_MON
+DUMP_OBJ
+DUMP_FEAT
+DUMP_FLAV
+MOD_MON
+MOD_OBJ
+MOD_FEAT
+MOD_FLAV
+RESET_VIS
-};
-
@@ -3388 +3445 @@
-                Term_clear();
-                key = menu_select(&visual_menu, &cursor, EVT_CMD);
-
+ 
-                        break;
-
@@ -3395 +3452 @@
-                evt = visual_menu_items[cursor].id;
-
-'lupf'
+LOAD_PREF
-                {
-                        /* Ask for and load a user pref file */
@@ -3403 +3460 @@
-#ifdef ALLOW_VISUALS
-
-'vdmx'
+DUMP_MON
-                {
-                        dump_pref_file(dump_monsters, "Dump Monster attr/chars");
-                }
-
-'vdox'
+DUMP_OBJ
-                {
-                        dump_pref_file(dump_objects, "Dump Object attr/chars");
-                }
-
-'vdfx'
+DUMP_FEAT
-                {
-                        dump_pref_file(dump_features, "Dump Feature attr/chars");
@@ -3419 +3476 @@
-
-                /* Dump flavor attr/chars */
-'vdxx')
+DUMP_FLAV) 
-                {
-                        dump_pref_file(dump_flavors, "Dump Flavor attr/chars");
@@ -3425 +3482 @@
-
-                /* Modify monster attr/chars */
-'vemx'
+MOD_MON
-                {
-                        static int r = 0;
@@ -3450 +3507 @@
-
-                /* Modify object attr/chars */
-'veox'
+MOD_OBJ
-                {
-                        static int k = 0;
@@ -3470 +3527 @@
-
-                /* Modify feature attr/chars */
-'vefx'
+MOD_FEAT
-                {
-                        static int f = 0;
@@ -3488 +3545 @@
-                }
-                /* Modify flavor attr/chars */
-'vexx'
+MOD_FLAV
-                {
-                        static int f = 0;
@@ -3509 +3566 @@
-
-                /* Reset visuals */
-'vrst'
+RESET_VIS
-                {
-                        /* Reset */
@@ -3526 +3583 @@
-static event_action color_events [] =
-{
-'lupf'
+LOAD_PREF
-#ifdef ALLOW_COLORS
-'vdco'
-'veco'
+DUMP_COL
+MOD_COL
-#endif
-};
@@ -3565 +3622 @@
-
-                /* Load a user pref file */
-'lupf'
+LOAD_PREF
-                {
-                        /* Ask for and load a user pref file */
@@ -3582 +3639 @@
-
-                /* Dump colors */
-'vdco'
+DUMP_COL
-                {
-                        dump_pref_file(dump_colors, "Dump Colors");
@@ -3588 +3645 @@
-
-                /* Edit colors */
-'veco'
+MOD_COL
-                {
-                        static byte a = 0;
@@ -3955 +4012 @@
-
-        /* Ask for a file */
-
+ 
-        else my_strcpy(tmp_val, "dump.txt", sizeof(tmp_val));
-        if (!get_string("File: ", tmp_val, sizeof(tmp_val))) return;
@@ -3997 +4054 @@
-{
-        msg_print("Dump type [(t)ext; (h)tml; (f)orum embedded html]:");
-
+
+
-                int c = inkey();
-                switch(c) {
@@ -4116 +4174 @@
-        menu = &option_menu;
-        WIPE(menu, menu_type);
-'opti'
+OPTION_MENU
-        menu->title = "Options Menu";
-        menu->count = N_ELEMENTS(option_actions);
@@ -4125 +4183 @@
-        menu = &macro_menu;
-        WIPE(menu, menu_type);
-'macr'
+MACRO_MENU
-        menu->count = N_ELEMENTS(macro_actions);
-        menu->menu_data = macro_actions;
@@ -4134 +4192 @@
-        menu = &knowledge_menu;
-        WIPE(menu, menu_type);
-'know'
+KNOWLEDGE_MENU
-        menu->title = "Display current knowledge";
-        menu->count = N_ELEMENTS(knowledge_actions),
@@ -4143 +4201 @@
-        menu = &visual_menu;
-        WIPE(menu, menu_type);
-'visu'
+VISUAL_MENU
-        menu->title = "Interact with visuals";
-        menu->selections = default_choice;
@@ -4153 +4211 @@
-        menu = &color_menu;
-        WIPE(menu, menu_type);
-'colr'
+COLOR_MENU
-        menu->title = "Interact with colors";
-        menu->selections = default_choice;
@@ -4175 +4233 @@
-                for (i = 0; 0 != object_text_order[i].tval; i++)
-                {
-
+ 
-                        obj_group_order[object_text_order[i].tval] = gid;
-                }