Enhance the "Qt Settings" dialog box to provide control over the paper doll subset of inventory displayed between the message and status windows (above the map). A ton of flailing about for a fairly small but useful change in functionality. Old dialog (no title): | [ ] Zoomed -- check box | "Width:" [ ] -- number entry spinner | "Height:" [ ] -- ditto | "Font:" [ ] -- Huge:18pt, Large:14, Medium:12, Small:10, Tiny:8 | [ Dismiss ] -- button New dialog: | "Qt NetHack Settings" | | "Map:" [ ] "Zoomed" -- check box | "Tile Width" [ ] -- number entry spinner | "Tile Height" [ ] -- ditto | "Invent:" [ ] "Shown" -- check box | "Doll Width" [ ] -- number entry spinner | "Doll Height" [ ] -- ditto | "Font:" [ ] -- Huge:18pt, Large:14, Medium:12, Small:10, Tiny:8 | [ Dismiss ] -- button The inventory subset can now be suppressed. When shown (the default), its size can be set independently of the map tiles' size. I've set the default to be 32x32 tiles instead of 16x16 used for the map. The settings are saved and restored automatically by Qt, and persist not just across save/restore cycles but into new games. (That's not a change, just a reminder.)
152 lines
4.7 KiB
C++
152 lines
4.7 KiB
C++
// Copyright (c) Warwick Allison, 1999.
|
|
// Qt4 conversion copyright (c) Ray Chason, 2012-2014.
|
|
// NetHack may be freely redistributed. See license for details.
|
|
|
|
// qt_inv.cpp -- inventory usage window
|
|
//
|
|
// Essentially a "paper doll" style display. [grep fodder]
|
|
//
|
|
// This is at the top center of the main window
|
|
|
|
extern "C" {
|
|
#include "hack.h"
|
|
}
|
|
|
|
#include "qt_pre.h"
|
|
#include <QtGui/QtGui>
|
|
#if QT_VERSION >= 0x050000
|
|
#include <QtWidgets/QtWidgets>
|
|
#endif
|
|
#include "qt_post.h"
|
|
#include "qt_inv.h"
|
|
#include "qt_glyph.h"
|
|
#include "qt_set.h"
|
|
|
|
namespace nethack_qt_ {
|
|
|
|
static struct obj *
|
|
find_tool(int tooltyp)
|
|
{
|
|
struct obj *o;
|
|
|
|
for (o = g.invent; o; o = o->nobj) {
|
|
if ((tooltyp == LEASH && o->otyp == LEASH && o->leashmon)
|
|
// OIL_LAMP is used for candles, lamps, lantern, candelabrum too
|
|
|| (tooltyp == OIL_LAMP && o->lamplit))
|
|
break;
|
|
}
|
|
return o;
|
|
}
|
|
|
|
NetHackQtInvUsageWindow::NetHackQtInvUsageWindow(QWidget* parent) :
|
|
QWidget(parent)
|
|
{
|
|
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
}
|
|
|
|
void NetHackQtInvUsageWindow::drawWorn(QPainter& painter, obj* nhobj,
|
|
int x, int y, bool canbe)
|
|
{
|
|
short int glyph;
|
|
if (nhobj)
|
|
glyph = obj_to_glyph(nhobj, rn2_on_display_rng);
|
|
else if (canbe)
|
|
glyph = cmap_to_glyph(S_room);
|
|
else
|
|
glyph = GLYPH_UNEXPLORED; // was cmap_to_glyph(S_stone)
|
|
|
|
qt_settings->glyphs().drawCell(painter, glyph, x, y);
|
|
}
|
|
|
|
void NetHackQtInvUsageWindow::paintEvent(QPaintEvent*)
|
|
{
|
|
// 0 1 2 two dual
|
|
// hander wielding
|
|
// 0 x H b x H b . H b
|
|
// 1 S " w W " W X " w
|
|
// 2 G C q G C q G C q
|
|
// 3 = A = = A = = A =
|
|
// 4 l U L l U L l U L
|
|
// 5 . F . . F . . F .
|
|
//
|
|
// 3.7: use a different legend for the layout
|
|
// show quiver instead of repeating gloves on both sides;
|
|
// show secondary weapon in shield slot when two-weapon is active;
|
|
// show two-handed primary weapon in both shield and uwep slots;
|
|
// show lit lamp/lantern/candle/candelabrum on lower right side;
|
|
// show leash-in-use on lower left side
|
|
|
|
#ifdef ENHANCED_PAPERDOLL
|
|
if (!qt_settings->doll_is_shown)
|
|
return;
|
|
qt_settings->glyphs().setSize(qt_settings->dollWidth,
|
|
qt_settings->dollHeight);
|
|
#endif
|
|
|
|
QPainter painter;
|
|
painter.begin(this);
|
|
|
|
// Blanks
|
|
drawWorn(painter, 0, 0, 5, false);
|
|
drawWorn(painter, 0, 2, 5, false);
|
|
if (u.twoweap) // empty alt weapon slot, show uswapwep in shield slot
|
|
drawWorn(painter, 0, 0, 0, false);
|
|
|
|
// TODO: render differently if known to be non-removable (known cursed)
|
|
drawWorn(painter, uarm, 1, 3); // Armour
|
|
drawWorn(painter, uarmc, 1, 2); // Cloak
|
|
drawWorn(painter, uarmh, 1, 0); // Helmet
|
|
// shield slot varies depending upon weapon usage
|
|
if (u.twoweap)
|
|
drawWorn(painter, uswapwep, 0, 1); // Secondary weapon, in use
|
|
else if (uwep && bimanual(uwep))
|
|
drawWorn(painter, uwep, 0, 1); // Two-handed weapon shown twice
|
|
else
|
|
drawWorn(painter, uarms, 0, 1); // Shield (might be blank)
|
|
drawWorn(painter, uarmg, 0, 2); // Gloves
|
|
drawWorn(painter, uarmf, 1, 5); // Shoes (feet)
|
|
drawWorn(painter, uarmu, 1, 4); // Undershirt
|
|
drawWorn(painter, uleft, 0, 3); // RingL
|
|
drawWorn(painter, uright, 2, 3); // RingR
|
|
|
|
drawWorn(painter, uwep, 2, 1); // Weapon
|
|
drawWorn(painter, !u.twoweap ? uswapwep : NULL, 0, 0); // Alternate weapon
|
|
drawWorn(painter, uquiver, 2, 2); // Quiver
|
|
drawWorn(painter, uamul, 1, 1); // Amulet
|
|
drawWorn(painter, ublindf, 2, 0); // Blindfold/Towel/Lenses
|
|
|
|
// light source and leash aren't unique and don't have pointers defined
|
|
drawWorn(painter, find_tool(LEASH), 0, 4);
|
|
// OIL_LAMP matches lit candles, lamps, lantern, and candelabrum (and will
|
|
// also duplicate Sunsword when it is wielded and shown in the uwep slot)
|
|
drawWorn(painter, find_tool(OIL_LAMP), 2, 4);
|
|
|
|
painter.end();
|
|
|
|
#ifdef ENHANCED_PAPERDOLL
|
|
qt_settings->glyphs().setSize(qt_settings->tileWidth,
|
|
qt_settings->tileHeight);
|
|
#endif
|
|
}
|
|
|
|
QSize NetHackQtInvUsageWindow::sizeHint(void) const
|
|
{
|
|
if (qt_settings) {
|
|
int w = 0, h = 0;
|
|
#ifdef ENHANCED_PAPERDOLL
|
|
if (qt_settings->doll_is_shown) {
|
|
w = qt_settings->dollWidth * 3;
|
|
h = qt_settings->dollHeight * 6;
|
|
}
|
|
#else
|
|
w = qt_settings->glyphs().width() * 3;
|
|
h = qt_settings->glyphs().height() * 6;
|
|
#endif
|
|
return QSize(w, h);
|
|
} else {
|
|
return QWidget::sizeHint();
|
|
}
|
|
}
|
|
|
|
} // namespace nethack_qt_
|