nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt without tiles

Browse Source 
Qt is capable of using an ascii map, and does so on the rogue level.
So failing to load tiles doesn't need to quit; it can continue in
text mode.

Not extensively tested.  This disables the paper doll when the ascii
map is forced (either via options settings or due to tiles loading
failure, but not when simply on the rogue level) rather than trying
to display it with object class characters.
This commit is contained in:
PatR
2020-08-17 16:42:24 -07:00
parent 0438dfe5a3
commit ae4c180cf6
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_glyph.cpp
+7 -5
View File
@@ -46,16 +46,15 @@ NetHackQtGlyphs::NetHackQtGlyphs()
tile_file = iflags.wc_tile_file;
if (!img.load(tile_file)) {
tiles_per_row = TILES_PER_ROW;
tile_file = PIXMAPDIR "/x11tiles";
if (!img.load(tile_file)) {
QString msg;
msg.sprintf("Cannot load 'nhtiles.bmp' or 'x11tiles'.");
QMessageBox::warning(0, "IO Error", msg);
NetHackQtBind::qt_exit_nhwindows((const char *) 0);
nh_terminate(EXIT_FAILURE);
iflags.wc_ascii_map = 1;
iflags.wc_tiled_map = 0;
} else {
tiles_per_row = TILES_PER_ROW;
if (img.width() % tiles_per_row) {
impossible(
"Tile file \"%s\" has %d columns, not multiple of row count (%d)",
@@ -68,8 +67,11 @@ NetHackQtGlyphs::NetHackQtGlyphs()
if (iflags.wc_tile_width)
tilefile_tile_W = iflags.wc_tile_width;
else if (iflags.wc_ascii_map)
tilefile_tile_W = 16;
else
tilefile_tile_W = img.width() / tiles_per_row;
if (iflags.wc_tile_height)
tilefile_tile_H = iflags.wc_tile_height;
else