Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draw bars for unit stats relative to all units #2529

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Draw bars for unit stats relative to all units #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions client/helpdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 1996-2023 Freeciv21 and Freeciv contributors. This file is
Copyright (c) 1996-2025 Freeciv21 and Freeciv contributors. This file is
part of Freeciv21. Freeciv21 is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
Expand Down Expand Up @@ -862,7 +862,7 @@ void help_widget::set_topic_unit(const help_item *topic, const char *title)

// Create information panel
show_info_panel();
max_utype = uclass_max_values(utype->uclass);
max_utype = utype_max_values();

// Unit icon
add_info_pixmap(
Expand Down Expand Up @@ -1607,18 +1607,17 @@ struct terrain *help_widget::terrain_max_values()
}

/**
Retrieves the maximum values any unit of uclass will ever have.
Retrieves the maximum values any unit will ever have.
Supported fields:
attack_strength, bombard_rate, build_cost, city_size, convert_time,
defense_strength, firepower, fuel, happy_cost, hp, move_rate, pop_cost,
upkeep, vision_radius_sq
Other fiels in returned value are undefined. Especially, all pointers are
invalid except uclass.
*/
struct unit_type *help_widget::uclass_max_values(struct unit_class *uclass)
invalid.
*/
struct unit_type *help_widget::utype_max_values()
{
struct unit_type *max = new struct unit_type();
max->uclass = uclass;
max->attack_strength = 0;
max->bombard_rate = 0;
max->build_cost = 0;
Expand All @@ -1640,29 +1639,27 @@ struct unit_type *help_widget::uclass_max_values(struct unit_class *uclass)
max->vision_radius_sq = 0;
unit_type_iterate(utype)
{
if (utype->uclass == uclass) {
#define SET_MAX(v) max->v = max->v > utype->v ? max->v : utype->v
SET_MAX(attack_strength);
SET_MAX(bombard_rate);
SET_MAX(build_cost);
SET_MAX(city_size);
SET_MAX(convert_time);
SET_MAX(defense_strength);
SET_MAX(firepower);
SET_MAX(fuel);
SET_MAX(happy_cost);
SET_MAX(hp);
SET_MAX(move_rate);
SET_MAX(pop_cost);
SET_MAX(upkeep[O_FOOD]);
SET_MAX(upkeep[O_GOLD]);
SET_MAX(upkeep[O_LUXURY]);
SET_MAX(upkeep[O_SCIENCE]);
SET_MAX(upkeep[O_SHIELD]);
SET_MAX(upkeep[O_TRADE]);
SET_MAX(vision_radius_sq);
SET_MAX(attack_strength);
SET_MAX(bombard_rate);
SET_MAX(build_cost);
SET_MAX(city_size);
SET_MAX(convert_time);
SET_MAX(defense_strength);
SET_MAX(firepower);
SET_MAX(fuel);
SET_MAX(happy_cost);
SET_MAX(hp);
SET_MAX(move_rate);
SET_MAX(pop_cost);
SET_MAX(upkeep[O_FOOD]);
SET_MAX(upkeep[O_GOLD]);
SET_MAX(upkeep[O_LUXURY]);
SET_MAX(upkeep[O_SCIENCE]);
SET_MAX(upkeep[O_SHIELD]);
SET_MAX(upkeep[O_TRADE]);
SET_MAX(vision_radius_sq);
#undef SET_MAX
}
}
unit_type_iterate_end return max;
}
6 changes: 2 additions & 4 deletions client/helpdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**************************************************************************
Copyright (c) 1996-2020 Freeciv21 and Freeciv contributors. This file is
Copyright (c) 1996-2025 Freeciv21 and Freeciv contributors. This file is
part of Freeciv21. Freeciv21 is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
Expand All @@ -12,8 +12,6 @@
#include <QDialog>
#include <QHash>
#include <QList>
// common
#include "extras.h"
// client
#include "dialogs.h"
#include "helpdata.h"
Expand Down Expand Up @@ -134,7 +132,7 @@ private slots:

public:
struct terrain *terrain_max_values();
struct unit_type *uclass_max_values(struct unit_class *uclass);
struct unit_type *utype_max_values();
};

void update_help_fonts();
Expand Down
Loading