Merge branch 'NetHack-3.6'
This commit is contained in:
+4
-4
@@ -137,7 +137,7 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
|
||||
|
||||
painter.setPen( Qt::green );
|
||||
/* map glyph to character and color */
|
||||
mapglyph(g, &ch, &color, &special, i, j);
|
||||
mapglyph(g, &ch, &color, &special, i, j, 0);
|
||||
ch = cp437(ch);
|
||||
#ifdef TEXTCOLOR
|
||||
painter.setPen( nhcolor_to_pen(color) );
|
||||
@@ -176,7 +176,7 @@ void NetHackQtMapViewport::paintEvent(QPaintEvent* event)
|
||||
int color;
|
||||
int ch;
|
||||
unsigned special;
|
||||
mapglyph(g, &ch, &color, &special, i, j);
|
||||
mapglyph(g, &ch, &color, &special, i, j, 0);
|
||||
qt_settings->glyphs().drawCell(painter, g, i, j);
|
||||
#ifdef TEXTCOLOR
|
||||
if (((special & MG_PET) != 0) && ::iflags.hilite_pet) {
|
||||
@@ -829,7 +829,7 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
|
||||
|
||||
painter.setPen( Qt::green );
|
||||
/* map glyph to character and color */
|
||||
mapglyph(g, &ch, &color, &special, i, j);
|
||||
mapglyph(g, &ch, &color, &special, i, j, 0);
|
||||
#ifdef TEXTCOLOR
|
||||
painter.setPen( nhcolor_to_pen(color) );
|
||||
#endif
|
||||
@@ -859,7 +859,7 @@ void NetHackQtMapWindow::paintEvent(QPaintEvent* event)
|
||||
int color;
|
||||
int ch;
|
||||
unsigned special;
|
||||
mapglyph(g, &ch, &color, &special, i, j);
|
||||
mapglyph(g, &ch, &color, &special, i, j, 0);
|
||||
qt_settings->glyphs().drawCell(painter, g, i, j);
|
||||
#ifdef TEXTCOLOR
|
||||
if (((special & MG_PET) != 0) && ::iflags.hilite_pet) {
|
||||
|
||||
Reference in New Issue
Block a user