<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40053 >
The attached patches fix gui-win32 compilation in S2_1 and S2_2. Will commit immediately.
Index: client/gui-win32/happiness.c =================================================================== --- client/gui-win32/happiness.c (revision 14320) +++ client/gui-win32/happiness.c (working copy) @@ -19,6 +19,7 @@ #include <windowsx.h> #include "city.h" +#include "citydlg_common.h" #include "fcintl.h" #include "game.h" #include "government.h" @@ -181,13 +182,13 @@ repaint_happiness_box(dlg,hdc); ReleaseDC(dlg->win,hdc); - SetWindowText(pdialog->mod_label[CITIES], + SetWindowText(dlg->mod_label[CITIES], text_happiness_cities(dlg->pcity)); SetWindowText(dlg->mod_label[LUXURIES], text_happiness_luxuries(dlg->pcity)); SetWindowText(dlg->mod_label[BUILDINGS], text_happiness_buildings(dlg->pcity)); - SetWindowText(pdialog->mod_label[UNITS], + SetWindowText(dlg->mod_label[UNITS], text_happiness_units(dlg->pcity)); SetWindowText(dlg->mod_label[WONDERS], text_happiness_wonders(dlg->pcity)); Index: client/gui-win32/menu.c =================================================================== --- client/gui-win32/menu.c (revision 14320) +++ client/gui-win32/menu.c (working copy) @@ -24,6 +24,7 @@ #include "astring.h" #include "capability.h" #include "fcintl.h" +#include "game.h" #include "log.h" #include "government.h" #include "map.h"
Index: client/gui-win32/happiness.c =================================================================== --- client/gui-win32/happiness.c (revision 14320) +++ client/gui-win32/happiness.c (working copy) @@ -19,6 +19,7 @@ #include <windowsx.h> #include "city.h" +#include "citydlg_common.h" #include "fcintl.h" #include "game.h" #include "government.h" @@ -181,13 +182,13 @@ repaint_happiness_box(dlg,hdc); ReleaseDC(dlg->win,hdc); - SetWindowText(pdialog->mod_label[CITIES], + SetWindowText(dlg->mod_label[CITIES], text_happiness_cities(dlg->pcity)); SetWindowText(dlg->mod_label[LUXURIES], text_happiness_luxuries(dlg->pcity)); SetWindowText(dlg->mod_label[BUILDINGS], text_happiness_buildings(dlg->pcity)); - SetWindowText(pdialog->mod_label[UNITS], + SetWindowText(dlg->mod_label[UNITS], text_happiness_units(dlg->pcity)); SetWindowText(dlg->mod_label[WONDERS], text_happiness_wonders(dlg->pcity));
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
