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

Fix Qt compile

Browse Source
This commit is contained in:
Pasi Kallinen
2019-12-23 17:24:41 +02:00
parent 370cfad85a
commit fc0596d529
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win/Qt/qt_menu.cpp
View File

@@ -534,6 +534,9 @@ void NetHackQtMenuWindow::Invert()
return;
for (int i=0; i<itemcount; i++) {
if ((itemlist[i].itemflags & MENU_ITEMFLAGS_SKIPINVERT) != 0)
continue;
QTableWidgetItem *count = table->item(i, 0);
if (count != NULL) count->setText("");
@@ -813,10 +816,10 @@ void NetHackQtMenuOrTextWindow::StartMenu()
actual->StartMenu();
}
void NetHackQtMenuOrTextWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
const QString& str, bool presel)
const QString& str, unsigned itemflags)
{
if (!actual) impossible("AddMenu called before we know if Menu or Text");
actual->AddMenu(glyph,identifier,ch,gch,attr,str,presel);
actual->AddMenu(glyph,identifier,ch,gch,attr,str,itemflags);
}
void NetHackQtMenuOrTextWindow::EndMenu(const QString& prompt)
{

2
win/Qt/qt_win.cpp
View File

@@ -125,7 +125,7 @@ void NetHackQtWindow::CursorTo(int x,int y) { puts("unexpected CursorTo"); }
void NetHackQtWindow::PutStr(int attr, const QString& text) { puts("unexpected PutStr"); }
void NetHackQtWindow::StartMenu() { puts("unexpected StartMenu"); }
void NetHackQtWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
const QString& str, bool presel) { puts("unexpected AddMenu"); }
const QString& str, unsigned itemflags) { puts("unexpected AddMenu"); }
void NetHackQtWindow::EndMenu(const QString& prompt) { puts("unexpected EndMenu"); }
int NetHackQtWindow::SelectMenu(int how, MENU_ITEM_P **menu_list) { puts("unexpected SelectMenu"); return 0; }
void NetHackQtWindow::ClipAround(int x,int y) { puts("unexpected ClipAround"); }

2
win/Qt/qt_win.h
View File

@@ -34,7 +34,7 @@ public:
}
virtual void StartMenu();
virtual void AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
const QString& str, bool presel);
const QString& str, unsigned itemflags);
virtual void EndMenu(const QString& prompt);
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
virtual void ClipAround(int x,int y);