Project

General

Profile

Bug #556 » 0063-Correct-goverment-to-government.patch

main, S3_2 - Marko Lindqvist, 05/06/2024 02:42 AM

View differences:

client/gui-qt/menu.cpp
revol_gov = game.government_during_revolution;
for (i = 0; i < gov_count; ++i) {
gov = government_by_number(i);
if (gov != revol_gov) { // Skip revolution goverment
if (gov != revol_gov) { // Skip revolution government
// Defeat keyboard shortcut mnemonics
action = addAction(QString(government_name_translation(gov))
.replace("&", "&&"));
......
revol_gov = game.government_during_revolution;
for (i = 0, j = 0; i < gov_count; i++) {
gov = government_by_number(i);
if (gov != revol_gov) { // Skip revolution goverment
if (gov != revol_gov) { // Skip revolution government
sprite = get_government_sprite(tileset, gov);
if (sprite != nullptr) {
actions[j + 1]->setIcon(QIcon(*(sprite->pm)));
client/gui-sdl2/dialogs.c
/* ==================== Public ========================= */
/**************************************************************************
Select Goverment Type
Select Government Type
**************************************************************************/
static struct small_dialog *gov_dlg = NULL;
client/gui-sdl2/gui_id.h
ID_CHANGE_TAXRATE_DLG_TAX_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_LUX_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_SCI_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_GOVERMENT_LABEL,
ID_CHANGE_TAXRATE_DLG_GOVERNMENT_LABEL,
ID_CHANGE_TAXRATE_DLG_OK_BUTTON,
ID_CHANGE_TAXRATE_DLG_CANCEL_BUTTON,
ID_SCIENCE_DLG_WINDOW,
client/gui-sdl3/dialogs.c
/* ==================== Public ========================= */
/**************************************************************************
Select Goverment Type
Select Government Type
**************************************************************************/
static struct small_dialog *gov_dlg = NULL;
client/gui-sdl3/gui_id.h
ID_CHANGE_TAXRATE_DLG_TAX_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_LUX_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_SCI_BLOCK_CHECKBOX,
ID_CHANGE_TAXRATE_DLG_GOVERMENT_LABEL,
ID_CHANGE_TAXRATE_DLG_GOVERNMENT_LABEL,
ID_CHANGE_TAXRATE_DLG_OK_BUTTON,
ID_CHANGE_TAXRATE_DLG_CANCEL_BUTTON,
ID_SCIENCE_DLG_WINDOW,
server/unittools.c
}
/**********************************************************************//**
Does: 1) updates the unit's homecity and the city it enters/leaves (the
city's happiness varies). This also takes into account when the
unit enters/leaves a fortress.
Does: 1) updates the unit's homecity and the city it enters/leaves
(the city's happiness varies). This also takes into account when
the unit enters/leaves a fortress.
2) updates adjacent cities' unavailable tiles.
FIXME: Sometimes it is not necessary to send cities because the goverment
doesn't care whether a unit is away or not.
FIXME: Sometimes it is not necessary to send cities because
the government doesn't care whether a unit is away or not.
**************************************************************************/
static bool unit_move_consequences(struct unit *punit,
struct tile *src_tile,
(1-1/2)