Qt's 3.6 status conditions
Replace the blank placeholder icon with individual placeholders for Stone, Slime, Strngl, Deaf, Lev, Fly, and Ride. They're just 40x40 tiles showing solid color (different for each) holding white block letters spelling the condition. For the first four of those, the text runs from upper-left to lower-right, for Lev and Fly the text runs from lower-left towards upper-right, and for Ride it's horizontal. Not particularly exciting but better than blank. We still need real artwork to make them be similar to the older conditions. Also moves the two petmarks and the pilemark from qt_xpms.h to qt_map.cpp. The marks and the assorted status icons are all static arrays, and including that header in two source files meant that they were all duplicated unless the compiler or linker was smart enough to discard the unused ones.
This commit is contained in:
@@ -18,10 +18,57 @@ extern "C" {
|
||||
#include "qt_map.moc"
|
||||
#include "qt_click.h"
|
||||
#include "qt_glyph.h"
|
||||
#include "qt_xpms.h"
|
||||
#include "qt_set.h"
|
||||
#include "qt_str.h"
|
||||
|
||||
// pet- and pile-mark xpm arrays moved out of qt_xpms.h so that we don't
|
||||
// include it here anymore; including that header in two files resulted in
|
||||
// two copies of all the static xpm data and all the rest is for qt_stat.cpp
|
||||
//
|
||||
/* XPM */
|
||||
static const char *pet_mark_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"8 7 2 1",
|
||||
/* colors */
|
||||
". c None",
|
||||
" c #FF0000",
|
||||
/* pixels */
|
||||
"........",
|
||||
".. . .",
|
||||
". ",
|
||||
". ",
|
||||
".. .",
|
||||
"... ..",
|
||||
".... ..."
|
||||
};
|
||||
/* XPM */
|
||||
static const char *pet_mark_small_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"5 5 2 1",
|
||||
/* colors */
|
||||
". c None",
|
||||
"X c #FF0000",
|
||||
/* pixels */
|
||||
".X.X.",
|
||||
"XXXXX",
|
||||
".XXX.",
|
||||
"..X.."
|
||||
};
|
||||
/* XPM */
|
||||
static const char *pile_mark_xpm[] = {
|
||||
/* width height ncolors chars_per_pixel */
|
||||
"5 5 2 1",
|
||||
/* colors */
|
||||
". c None",
|
||||
"X c #00FF00",
|
||||
/* pixels */
|
||||
"..X..",
|
||||
"..X..",
|
||||
"XXXXX",
|
||||
"..X..",
|
||||
"..X.."
|
||||
};
|
||||
|
||||
// temporary
|
||||
extern int qt_compact_mode;
|
||||
// end temporary
|
||||
|
||||
Reference in New Issue
Block a user