Author: jtn
Date: Mon Jun 2 23:21:22 2014
New Revision: 25019
URL: http://svn.gna.org/viewcvs/freeciv?rev=25019&view=rev
Log:
Fix compilation of QT client after patch #4727.
Reported by Marko Lindqvist (cazfi@gna).
See gna bug #22129.
Modified:
trunk/client/gui-qt/plrdlg.cpp
trunk/client/gui-qt/repodlgs.cpp
Modified: trunk/client/gui-qt/plrdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/plrdlg.cpp?rev=25019&r1=25018&r2=25019&view=diff
==============================================================================
--- trunk/client/gui-qt/plrdlg.cpp (original)
+++ trunk/client/gui-qt/plrdlg.cpp Mon Jun 2 23:21:22 2014
@@ -327,7 +327,7 @@
QModelIndexList indexes = sl.indexes();
struct city *pcity;
const struct player_diplstate *state;
- struct player_research *research;
+ struct research *research;
char tbuf[256];
QString res;
QString sp = " ";
@@ -356,7 +356,7 @@
return;
}
pcity = player_capital(pplayer);
- research = player_research_get(pplayer);
+ research = research_get(pplayer);
switch (research->researching) {
case A_UNKNOWN:
Modified: trunk/client/gui-qt/repodlgs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/repodlgs.cpp?rev=25019&r1=25018&r2=25019&view=diff
==============================================================================
--- trunk/client/gui-qt/repodlgs.cpp (original)
+++ trunk/client/gui-qt/repodlgs.cpp Mon Jun 2 23:21:22 2014
@@ -218,7 +218,7 @@
void science_report::update_report()
{
- struct player_research *research = player_research_get(client_player());
+ struct research *research = research_get(client_player());
const char *text;
int total;
int done = research->bulbs_researched;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
