Changeset 985

Timestamp:

07/12/08 02:11:37 (2 months ago)

Author:

shanoah

Message:

Break up some of the statusbar code in xtra3.c so that ports can easily grab the correct colors for hp, sp, & m. hp, and take advantage of this in the gtk port.

Files:

• trunk/src/gtk/main-gtk.c (modified) (6 diffs)
• trunk/src/gtk/main-gtk.h (modified) (3 diffs)
• trunk/src/xtra3.c (modified) (10 diffs)

trunk/src/gtk/main-gtk.c

@@ -656 +656 @@
-                
-                /* Save the game */
-                #ifdef ZANGBAND
-                do_cmd_save_game(FALSE);
-                #else
-                do_cmd_save_game();
-                #endif 
-        }
-        
@@ -2416 +2412 @@
-        FREE(race_count);
-}
-static byte monst_color(const monster_type *m_ptr)
-{
-        byte attr = TERM_WHITE;
-        int pct = 0;
-
-        if (m_ptr->maxhp)
-                pct = (m_ptr->hp * 100) / m_ptr->maxhp;
-
-
-        /* Badly wounded */
-        if (pct >= 10) attr = TERM_L_RED;
-
-        /* Wounded */
-        if (pct >= 25) attr = TERM_ORANGE;
-
-        /* Somewhat Wounded */
-        if (pct >= 60) attr = TERM_YELLOW;
-
-        /* Healthy */
-        if (pct >= 100) attr = TERM_L_GREEN;
-
-
-        /* Afraid */
-        if (m_ptr->monfear) attr = TERM_VIOLET;
-
-        /* Confused */
-        if (m_ptr->confused) attr = TERM_UMBER;
-
-        /* Stunned */
-        if (m_ptr->stunned) attr = TERM_L_BLUE;
-
-        /* Asleep */
-        if (m_ptr->csleep) attr = TERM_BLUE;
-                
-        return attr;
-}
-
-static void draw_xtra_cr_text(xtra_win_data *xd, int x, int y, byte color, cptr str)
@@ -2541 +2501 @@
-static void handle_sidebar(game_event_type type, game_event_data *data, void *user)
-{
-
-
+
-        cairo_rectangle_t r;
-        
@@ -2548 +2507 @@
-        long xp = (long)p_ptr->exp;
-        monster_type *m_ptr = &mon_list[p_ptr->health_who];
-
+i = 0, 
-
-        /* Calculate XP for next level */
@@ -2577 +2536 @@
-
-                /* Char Level */
-
-
-
+
+
-                
-                /* Char xp */
-                if (p_ptr->lev != 50) 
-tr
+idebar_text[5]
-                else                     
-tr
-2, sizeof(str2
-tr, TERM_WHITE, str2
+idebar_text[5]
+, sizeof(str
+idebar_text[5], TERM_WHITE, str
-        
-                /* Char Gold */
-
-
-
+
+
-                
-                /* Equippy chars is 0,7 */
@@ -2598 +2555 @@
-                
-                /* Char Stats */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                
-                /* 14 is a blank row */
-                
-                /* Char AC */
-
-
-
+
+
-        
-                /* Char HP */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        
-                /* Char MP */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        
-                /* 20 is blank */
-        
-_color(m_ptr
+er_health_attr(
-
-                /* Print the level */
-                strnfmt(str, sizeof(str), "%d' (L%d)", p_ptr->depth * 50, p_ptr->depth); 
-tr2, sizeof(str2
-tr2
+idebar_text[22], sizeof(sidebar_text[22]
+idebar_text[22]
-                
-                invalidate_drawing_area(xd->drawing_area, r);

trunk/src/gtk/main-gtk.h

@@ -126 +126 @@
-char xtra_font_button_names[MAX_XTRA_WIN_DATA][20] =
-{ "message_font", "inv_font", "equip_font", "monst_list_font", "debug_font", "status_font" };
+
+char sidebar_text[24][20] =
+{
+        "","","","","Level:", "XP: ", "Gold:", "", "STR:", "INT:", "WIS:", "DEX:", "CON:", "CHR:", "", "AC:", "HP:", "", "SP:", "", "","", "", "" 
+};
-/*
- * An array of "term_data" structures, one for each "sub-window"
@@ -400 +405 @@
-static void handle_mons_list(game_event_type type, game_event_data *data, void *user);
-
-/* Return the color of the monster bar */
-static byte monst_color(const monster_type *m_ptr);
-
-/* Print the sidebar */
-static void handle_sidebar(game_event_type type, game_event_data *data, void *user);
@@ -429 +431 @@
-
-static void force_redraw();
+
+/* From xtra3.h */
+extern byte monster_health_attr();
+extern byte player_sp_attr();
+extern byte player_hp_attr();
-#endif /* INCLUDED_MAIN_GTK_H */ 

trunk/src/xtra3.c

@@ -275 +275 @@
-}
-
+/*
+ * Calculate the hp color separately, for ports.
+ */
+byte player_hp_attr()
+{
+        byte attr;
+        
+        if (p_ptr->chp >= p_ptr->mhp)
+                attr = TERM_L_GREEN;
+        else if (p_ptr->chp > (p_ptr->mhp * op_ptr->hitpoint_warn) / 10)
+                attr = TERM_YELLOW;
+        else
+                attr = TERM_RED;
+        
+        return attr;
+}
-
-/*
@@ -282 +298 @@
-{
-        char cur_hp[32], max_hp[32];
-
+ = player_hp_attr()
-
-        put_str("HP ", row, col);
@@ -288 +304 @@
-        strnfmt(max_hp, sizeof(max_hp), "%4d", p_ptr->mhp);
-        strnfmt(cur_hp, sizeof(cur_hp), "%4d", p_ptr->chp);
-
-
-
-
-
-
-
-
+
-        c_put_str(color, cur_hp, row, col + 3);
-        c_put_str(TERM_WHITE, "/", row, col + 7);
@@ -301 +310 @@
-}
-
+/*
+ * Calculate the sp color separately, for ports.
+ */
+byte player_sp_attr()
+{
+        byte attr;
+        
+        if (p_ptr->csp >= p_ptr->msp)
+                attr = TERM_L_GREEN;
+        else if (p_ptr->csp > (p_ptr->msp * op_ptr->hitpoint_warn) / 10)
+                attr = TERM_YELLOW;
+        else
+                attr = TERM_RED;
+        
+        return attr;
+}
-
-/*
@@ -308 +333 @@
-{
-        char cur_sp[32], max_sp[32];
-
+ = player_sp_attr()
-
-        /* Do not show mana unless it matters */
@@ -317 +342 @@
-        strnfmt(max_sp, sizeof(max_sp), "%4d", p_ptr->msp);
-        strnfmt(cur_sp, sizeof(cur_sp), "%4d", p_ptr->csp);
-
-        if (p_ptr->csp >= p_ptr->msp)
-                color = TERM_L_GREEN;
-        else if (p_ptr->csp > (p_ptr->msp * op_ptr->hitpoint_warn) / 10)
-                color = TERM_YELLOW;
-        else
-                color = TERM_RED;
-
-        /* Show mana */
@@ -331 +349 @@
-}
-
+/*
+ * Calculate the monster bar color separately, for ports.
+ */
+byte monster_health_attr()
+{
+        byte attr = TERM_WHITE;
+        
+        /* Not tracking */
+        if (!p_ptr->health_who)
+                attr = TERM_DARK;
+        
+        /* Tracking an unseen, hallucinatory, or dead monster */
+        else if ((!mon_list[p_ptr->health_who].ml) ||
+                    (p_ptr->timed[TMD_IMAGE]) ||
+                    (!mon_list[p_ptr->health_who].hp < 0))
+        {
+                /* The monster health is "unknown" */
+                attr = TERM_WHITE;
+        }
+        
+        else
+        {
+                int pct;
+
+                monster_type *m_ptr = &mon_list[p_ptr->health_who];
+
+                /* Default to almost dead */
+                attr = TERM_RED;
+
+                /* Extract the "percent" of health */
+                pct = 100L * m_ptr->hp / m_ptr->maxhp;
+
+                /* Badly wounded */
+                if (pct >= 10) attr = TERM_L_RED;
+
+                /* Wounded */
+                if (pct >= 25) attr = TERM_ORANGE;
+
+                /* Somewhat Wounded */
+                if (pct >= 60) attr = TERM_YELLOW;
+
+                /* Healthy */
+                if (pct >= 100) attr = TERM_L_GREEN;
+
+                /* Afraid */
+                if (m_ptr->monfear) attr = TERM_VIOLET;
+
+                /* Confused */
+                if (m_ptr->confused) attr = TERM_UMBER;
+
+                /* Stunned */
+                if (m_ptr->stunned) attr = TERM_L_BLUE;
+
+                /* Asleep */
+                if (m_ptr->csleep) attr = TERM_BLUE;
+        }
+        
+        return attr;
+}
-
-/*
@@ -344 +421 @@
-static void prt_health(int row, int col)
-{
+        byte attr = monster_health_attr();
+        
-        /* Not tracking */
-        if (!p_ptr->health_who)
@@ -351 +430 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -379 +446 @@
-                monster_type *m_ptr = &mon_list[p_ptr->health_who];
-
-                /* Default to almost dead */
-                byte attr = TERM_RED;
-
-                /* Extract the "percent" of health */
-                pct = 100L * m_ptr->hp / m_ptr->maxhp;
-
-                /* Badly wounded */
-                if (pct >= 10) attr = TERM_L_RED;
-
-                /* Wounded */
-                if (pct >= 25) attr = TERM_ORANGE;
-
-                /* Somewhat Wounded */
-                if (pct >= 60) attr = TERM_YELLOW;
-
-                /* Healthy */
-                if (pct >= 100) attr = TERM_L_GREEN;
-
-                /* Afraid */
-                if (m_ptr->monfear) attr = TERM_VIOLET;
-
-                /* Confused */
-                if (m_ptr->confused) attr = TERM_UMBER;
-
-                /* Stunned */
-                if (m_ptr->stunned) attr = TERM_L_BLUE;
-
-                /* Asleep */
-                if (m_ptr->csleep) attr = TERM_BLUE;
-
-                /* Convert percent into "health" */