Gnome updates (from <Someone> <Someone> Simon)
- fix destruction of primary game windows - One, it makes the color of the cursor box dynamic (these are the gnmap.c changes), based on hp/hpmax (continuous colors white -> yellow -> red -> magenta rather than discrete like in Qt). - Two, it adds a new window, NHW_WORN (all the other changes and new files gnworn.[ch]), placed at the end of the first row, to the right of the status, with tiles of all the items currently equiped. I had to change the spacing of the first row (no longer homogeneous) to accomodate this, but I think it still looks okay. It's mostly like the Qt version but the equiped items are in slightly different places, and a bit more compactly (added quiver, ball/chain, monster skin armor; see the definition in gnworn.c for the layout).
This commit is contained in:
+11
-3
@@ -750,7 +750,7 @@ void ghack_init_main_window( int argc, char** argv)
|
||||
|
||||
/* Put some stuff into our main window */
|
||||
vBoxMain = gtk_vbox_new (FALSE, 0);
|
||||
hBoxFirstRow = gtk_hbox_new (TRUE, 0);
|
||||
hBoxFirstRow = gtk_hbox_new (FALSE, 0);
|
||||
|
||||
/* pack Boxes into other boxes to produce the right structure */
|
||||
gtk_box_pack_start (GTK_BOX (vBoxMain), hBoxFirstRow, FALSE, TRUE, 0);
|
||||
@@ -793,7 +793,14 @@ ghack_main_window_add_message_window(GtkWidget* win)
|
||||
void
|
||||
ghack_main_window_add_status_window(GtkWidget* win)
|
||||
{
|
||||
gtk_box_pack_start (GTK_BOX (hBoxFirstRow), win, TRUE, TRUE, 2);
|
||||
gtk_box_pack_start (GTK_BOX (hBoxFirstRow), win, FALSE, TRUE, 2);
|
||||
gtk_widget_show_all(win);
|
||||
}
|
||||
|
||||
void
|
||||
ghack_main_window_add_worn_window(GtkWidget* win)
|
||||
{
|
||||
gtk_box_pack_end (GTK_BOX (hBoxFirstRow), win, FALSE, TRUE, 2);
|
||||
gtk_widget_show_all(win);
|
||||
}
|
||||
|
||||
@@ -812,10 +819,11 @@ ghack_main_window_remove_window(GtkWidget *win)
|
||||
void
|
||||
ghack_main_window_update_inventory()
|
||||
{
|
||||
/* For now, do nothing. Eventually we may allow the inv. window
|
||||
/* For now, do very little. Eventually we may allow the inv. window
|
||||
to stay active. When we do this, we'll need to implement this...
|
||||
g_warning("Fixme!!! updateInventory is not yet implemented");
|
||||
*/
|
||||
gnome_display_nhwindow(WIN_WORN, FALSE);
|
||||
}
|
||||
|
||||
GtkWidget*
|
||||
|
||||
Reference in New Issue
Block a user