Fix Qt compile
This commit is contained in:
+5
-2
@@ -534,6 +534,9 @@ void NetHackQtMenuWindow::Invert()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
for (int i=0; i<itemcount; i++) {
|
for (int i=0; i<itemcount; i++) {
|
||||||
|
if ((itemlist[i].itemflags & MENU_ITEMFLAGS_SKIPINVERT) != 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
QTableWidgetItem *count = table->item(i, 0);
|
QTableWidgetItem *count = table->item(i, 0);
|
||||||
if (count != NULL) count->setText("");
|
if (count != NULL) count->setText("");
|
||||||
|
|
||||||
@@ -813,10 +816,10 @@ void NetHackQtMenuOrTextWindow::StartMenu()
|
|||||||
actual->StartMenu();
|
actual->StartMenu();
|
||||||
}
|
}
|
||||||
void NetHackQtMenuOrTextWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
|
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");
|
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)
|
void NetHackQtMenuOrTextWindow::EndMenu(const QString& prompt)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -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::PutStr(int attr, const QString& text) { puts("unexpected PutStr"); }
|
||||||
void NetHackQtWindow::StartMenu() { puts("unexpected StartMenu"); }
|
void NetHackQtWindow::StartMenu() { puts("unexpected StartMenu"); }
|
||||||
void NetHackQtWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
|
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"); }
|
void NetHackQtWindow::EndMenu(const QString& prompt) { puts("unexpected EndMenu"); }
|
||||||
int NetHackQtWindow::SelectMenu(int how, MENU_ITEM_P **menu_list) { puts("unexpected SelectMenu"); return 0; }
|
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"); }
|
void NetHackQtWindow::ClipAround(int x,int y) { puts("unexpected ClipAround"); }
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ public:
|
|||||||
}
|
}
|
||||||
virtual void StartMenu();
|
virtual void StartMenu();
|
||||||
virtual void AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
|
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 void EndMenu(const QString& prompt);
|
||||||
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
|
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
|
||||||
virtual void ClipAround(int x,int y);
|
virtual void ClipAround(int x,int y);
|
||||||
|
|||||||
Reference in New Issue
Block a user