Finish migrating tileset layers to classes

client/CMakeLists.txt

@@ -110,21 +110,36 @@ target_sources(
 
   audio/audio.cpp
   audio/audio_none.cpp
+
   tileset/drawn_sprite.cpp
+  tileset/layer_abstract_activities.cpp
   tileset/layer_background.cpp
   tileset/layer_base_flags.cpp
+  tileset/layer_city.cpp
+  tileset/layer_city_size.cpp
   tileset/layer_darkness.cpp
+  tileset/layer_infrawork.cpp
+  tileset/layer_editor.cpp
+  tileset/layer_fog.cpp
+  tileset/layer_goto.cpp
+  tileset/layer_grid.cpp
+  tileset/layer_overlays.cpp
+  tileset/layer_roads.cpp
   tileset/layer_special.cpp
   tileset/layer_terrain.cpp
   tileset/layer_units.cpp
+  tileset/layer_water.cpp
+  tileset/layer_workertask.cpp
   tileset/layer.cpp
   tileset/sprite.cpp
   tileset/tilespec.cpp
+
   utils/collated_sort_proxy.cpp
   utils/colorizer.cpp
   utils/improvement_seller.cpp
   utils/unit_quick_menu.cpp
   utils/unit_utils.cpp
+
   views/view_cities.cpp
   views/view_cities_data.cpp
   views/view_economics.cpp
@@ -136,6 +151,7 @@ target_sources(
   views/view_research.cpp
   views/view_research_reqtree.cpp
   views/view_units.cpp
+
   widgets/decorations.cpp
   widgets/city/city_icon_widget.cpp
   widgets/city/governor_widget.cpp

client/citybar.cpp

@@ -489,13 +489,13 @@ QRect traditional_citybar_painter::paint(QPainter &painter,
       unsigned long count = unit_list_size(pcity->tile->units);
       count =
           qBound(0UL, count,
-                 static_cast<unsigned long>(citybar->occupancy.size - 1));
-      first.add_icon(citybar->occupancy.p[count]);
+                 static_cast<unsigned long>(citybar->occupancy.size() - 1));
+      first.add_icon(citybar->occupancy[count]);
     } else {
       if (pcity->client.occupied) {
         first.add_icon(citybar->occupied);
       } else {
-        first.add_icon(citybar->occupancy.p[0]);
+        first.add_icon(citybar->occupancy[0]);
       }
     }
 
@@ -642,7 +642,7 @@ QRect polished_citybar_painter::paint(QPainter &painter,
   // Decide on the target height. It's the max of the font sizes and the
   // occupied indicator (we assume all indicators have the same size).
   // It's used to scale the flag, progress bars and production.
-  double target_height = citybar->occupancy.p[0]->height();
+  double target_height = citybar->occupancy[0]->height();
   target_height = std::max(target_height,
                            QFontMetricsF(get_font(FONT_CITY_NAME)).height());
   target_height = std::max(target_height,
@@ -717,14 +717,15 @@ QRect polished_citybar_painter::paint(QPainter &painter,
   // Occupied indicator
   if (can_player_see_units_in_city(client.conn.playing, pcity)) {
     unsigned long count = unit_list_size(pcity->tile->units);
-    count = qBound(0UL, count,
-                   static_cast<unsigned long>(citybar->occupancy.size - 1));
-    line.add_icon(citybar->occupancy.p[count]);
+    count =
+        qBound(0UL, count,
+               static_cast<unsigned long>(citybar->occupancy.size() - 1));
+    line.add_icon(citybar->occupancy[count]);
   } else {
     if (pcity->client.occupied) {
       line.add_icon(citybar->occupied);
     } else {
-      line.add_icon(citybar->occupancy.p[0]);
+      line.add_icon(citybar->occupancy[0]);
     }
   }
 

client/citydlg.cpp

@@ -207,7 +207,7 @@ QPixmap unit_list_widget::create_unit_image(const unit *punit)
     }
 
     unit_pixmap.fill(Qt::transparent);
-    put_unit(punit, &unit_pixmap, 0, 0);
+    put_unit(punit, &unit_pixmap, QPoint());
 
     if (m_show_upkeep) {
       put_unit_city_overlays(punit, &unit_pixmap, 0,

client/client_main.cpp

@@ -374,7 +374,9 @@ int client_main(int argc, char *argv[])
        {{"S", "Sound"}, _("Read sound tags from FILE."), "FILE"},
        {{"m", "music"}, _("Read music tags from FILE."), "FILE"},
        {{"t", "tiles"}, _("Use data file FILE.tilespec for tiles."), "FILE"},
-       {{"w", "warnings"}, _("Warn about deprecated modpack constructs.")}});
+       {{"w", "warnings"}, _("Warn about deprecated modpack constructs.")},
+       {"debug-tileset", _("Prints tileset debugging information.")}});
+
   parser.addPositionalArgument(
       _("url"), _("Server information in URL format."), _("[url]"));
   if (!ok) {
@@ -384,8 +386,16 @@ int client_main(int argc, char *argv[])
   parser.process(app);
 
   // Process the parsed options
-  if (!log_init(parser.value(QStringLiteral("debug")))) {
-    exit(EXIT_FAILURE);
+
+  // Init log level
+  {
+    QStringList extra;
+    if (!parser.isSet(QStringLiteral("debug-tileset"))) {
+      extra.push_back(QStringLiteral("freeciv.tileset.info = false"));
+    }
+    if (!log_init(parser.value(QStringLiteral("debug")), extra)) {
+      exit(EXIT_FAILURE);
+    }
   }
   if (parser.isSet(QStringLiteral("version"))) {
     fc_fprintf(stderr, "%s %s\n", freeciv_name_version(), client_string);

client/dialogs.cpp

@@ -48,7 +48,7 @@
 #include "page_game.h"
 #include "qtg_cxxside.h"
 #include "text.h"
-#include "tileset/sprite.h"
+#include "tileset/layer_city.h"
 #include "tileset/tilespec.h"
 #include "unithudselector.h"
 #include "unitselect.h"
@@ -372,7 +372,6 @@ races_dialog::races_dialog(struct player *pplayer, QWidget *parent)
   QGroupBox *no_name;
   QTableWidgetItem *item;
   QHeaderView *header;
-  QSize size;
   QString title;
   QLabel *ns_label;
 
@@ -452,12 +451,10 @@ races_dialog::races_dialog(struct player *pplayer, QWidget *parent)
     if (i >= 0) {
       item = new QTableWidgetItem;
       styles->insertRow(i);
-      auto pix = get_sample_city_sprite(tileset, i);
-      item->setData(Qt::DecorationRole, *pix);
+      auto pix = tileset_layer_city(tileset)->sample_sprite(i);
+      item->setData(Qt::DecorationRole, pix);
       item->setData(Qt::UserRole, style_number(pstyle));
-      size.setWidth(pix->width());
-      size.setHeight(pix->height());
-      item->setSizeHint(size);
+      item->setSizeHint(pix.size());
       styles->setItem(i, 0, item);
       item = new QTableWidgetItem;
       item->setText(style_name_translation(pstyle));
@@ -1212,7 +1209,7 @@ void choice_dialog::set_layout()
     pix = new QPixmap(tileset_unit_width(tileset),
                       tileset_unit_height(tileset));
     pix->fill(Qt::transparent);
-    put_unit(targeted_unit, pix, 0, 0);
+    put_unit(targeted_unit, pix, QPoint());
     target_unit_button->setIcon(QIcon(*pix));
     delete pix;
     target_unit_button->setIconSize(QSize(96, 96));
@@ -1364,7 +1361,7 @@ void choice_dialog::next_unit()
   pix =
       new QPixmap(tileset_unit_width(tileset), tileset_unit_height(tileset));
   pix->fill(Qt::transparent);
-  put_unit(targeted_unit, pix, 0, 0);
+  put_unit(targeted_unit, pix, QPoint());
   target_unit_button->setIcon(QIcon(*pix));
   delete pix;
   switch_target();
@@ -1395,7 +1392,7 @@ void choice_dialog::prev_unit()
   pix =
       new QPixmap(tileset_unit_width(tileset), tileset_unit_height(tileset));
   pix->fill(Qt::transparent);
-  put_unit(targeted_unit, pix, 0, 0);
+  put_unit(targeted_unit, pix, QPoint());
   target_unit_button->setIcon(QIcon(*pix));
   delete pix;
   switch_target();

client/goto.h

@@ -16,6 +16,7 @@ class PFPath;
 struct tile;
 struct unit;
 struct unit_list;
+struct unit_order;
 
 enum goto_tile_state {
   GTS_TURN_STEP,

client/helpdlg.cpp

@@ -34,7 +34,6 @@
 #include "fc_client.h"
 #include "fonts.h"
 #include "helpdlg.h"
-#include "tileset/sprite.h"
 #include "tileset/tilespec.h"
 #include "views/view_map_common.h"
 
@@ -1170,7 +1169,7 @@ QPixmap *terrain_canvas(struct terrain *terrain,
   for (i = 0; i < 3; ++i) {
     auto sprites =
         fill_basic_terrain_layer_sprite_array(tileset, i, terrain);
-    put_drawn_sprites(canvas, 0, canvas_y, sprites, false);
+    put_drawn_sprites(canvas, QPoint(0, canvas_y), sprites, false);
   }
 
   pextra = nullptr;
@@ -1183,12 +1182,12 @@ QPixmap *terrain_canvas(struct terrain *terrain,
     extra_type_by_cause_iterate_end;
     fc_assert_ret_val(pextra, nullptr);
     auto sprites = fill_basic_extra_sprite_array(tileset, pextra);
-    put_drawn_sprites(canvas, 0, canvas_y, sprites, false);
+    put_drawn_sprites(canvas, QPoint(0, canvas_y), sprites, false);
   }
 
   if (resource != nullptr) {
     auto sprites = fill_basic_extra_sprite_array(tileset, resource);
-    put_drawn_sprites(canvas, 0, canvas_y, sprites, false);
+    put_drawn_sprites(canvas, QPoint(0, canvas_y), sprites, false);
   }
 
   return canvas;
@@ -1245,7 +1244,6 @@ QLayout *help_widget::create_terrain_widget(const QString &title,
 {
   QGraphicsDropShadowEffect *effect;
   QLabel *label;
-  QPixmap *spr;
   QHBoxLayout *layout = new QHBoxLayout();
   QHBoxLayout *layout1 = new QHBoxLayout();
   QHBoxLayout *layout2 = new QHBoxLayout();
@@ -1267,19 +1265,14 @@ QLayout *help_widget::create_terrain_widget(const QString &title,
   make_helplabel(_("Output becomes: "), tooltip, layout2);
   make_helplabel(QString::number(food), tooltip, layout2)
       ->setProperty("foodlab", "true");
-  spr = tiles_lookup_sprite_tag_alt(tileset, LOG_VERBOSE, "citybar.food",
-                                    "citybar.food", "", "", false);
-  make_helppiclabel(spr, tooltip, layout2);
+  auto sprites = get_citybar_sprites(tileset);
+  make_helppiclabel(sprites->food, tooltip, layout2);
   make_helplabel(QString::number(sh), tooltip, layout2)
       ->setProperty("shieldlab", "true");
-  spr = tiles_lookup_sprite_tag_alt(tileset, LOG_VERBOSE, "citybar.shields",
-                                    "upkeep.shield", "", "", false);
-  make_helppiclabel(spr, tooltip, layout2);
+  make_helppiclabel(sprites->shields, tooltip, layout2);
   make_helplabel(QString::number(eco), tooltip, layout2)
       ->setProperty("ecolab", "true");
-  spr = tiles_lookup_sprite_tag_alt(tileset, LOG_VERBOSE, "citybar.trade",
-                                    "upkeep.gold", "", "", false);
-  make_helppiclabel(spr, tooltip, layout2);
+  make_helppiclabel(sprites->trade, tooltip, layout2);
   w2->setLayout(layout2);
 
   layout->addWidget(w1, Qt::AlignVCenter);

client/hudwidget.cpp

@@ -662,7 +662,7 @@ void hud_units::update_actions()
   unit_pixmap =
       new QPixmap(tileset_unit_width(tileset), tileset_unit_height(tileset));
   unit_pixmap->fill(Qt::transparent);
-  put_unit(punit, unit_pixmap, 0, 0);
+  put_unit(punit, unit_pixmap, QPoint());
   img = unit_pixmap->toImage();
   crop = zealous_crop_rect(img);
   cropped_img = img.copy(crop);
@@ -746,7 +746,7 @@ void hud_units::update_actions()
                               tileset_tile_height(tileset));
   }
   tile_pixmap->fill(QColor(0, 0, 0, 0));
-  put_terrain(punit->tile, tile_pixmap, 0, 0);
+  put_terrain(punit->tile, tile_pixmap, QPoint());
   img = tile_pixmap->toImage();
   crop = zealous_crop_rect(img);
   cropped_img = img.copy(crop);
@@ -1406,7 +1406,7 @@ void hud_unit_combat::init_images(bool redraw)
   defender_pixmap.fill(Qt::transparent);
   if (defender != nullptr) {
     if (!redraw) {
-      put_unit(defender, &defender_pixmap, 0, 0);
+      put_unit(defender, &defender_pixmap, QPoint());
     } else {
       defender_pixmap =
           *get_unittype_sprite(tileset, type_defender, direction8_invalid());
@@ -1430,7 +1430,7 @@ void hud_unit_combat::init_images(bool redraw)
   attacker_pixmap.fill(Qt::transparent);
   if (attacker != nullptr) {
     if (!redraw) {
-      put_unit(attacker, &attacker_pixmap, 0, 0);
+      put_unit(attacker, &attacker_pixmap, QPoint());
     } else {
       attacker_pixmap =
           *get_unittype_sprite(tileset, type_attacker, direction8_invalid());

client/overview_common.cpp

@@ -301,7 +301,7 @@ static void put_overview_tile_area(QPixmap *pcanvas, const tile *ptile,
   p.fillRect(x, y, w, h, overview_tile_color(ptile));
   if (gui_options->overview.fog
       && TILE_KNOWN_UNSEEN == client_tile_get_known(ptile)) {
-    p.drawPixmap(x, y, w, h, *get_basic_fog_sprite(tileset));
+    p.fillRect(x, y, w, h, QColor(0, 0, 0, 128));
   }
   p.end();
 }

client/packhand.cpp

@@ -841,9 +841,6 @@ void handle_city_info(const struct packet_city_info *packet)
   }
 
   pcity->client.walls = packet->walls;
-  if (pcity->client.walls > NUM_WALL_TYPES) {
-    pcity->client.walls = NUM_WALL_TYPES;
-  }
   pcity->style = packet->style;
   pcity->capital = packet->capital;
   if (packet->capital == CAPITAL_PRIMARY) {
@@ -3303,6 +3300,10 @@ void handle_ruleset_description_part(
  */
 void handle_rulesets_ready()
 {
+  // Init extras - has to come after terrain
+  extra_type_iterate(pextra) { tileset_setup_extra(tileset, pextra); }
+  extra_type_iterate_end;
+
   // Setup extra hiders caches
   extra_type_iterate(pextra)
   {
@@ -3356,8 +3357,7 @@ void handle_rulesets_ready()
   // Adjust editor for changed ruleset.
   editor_ruleset_changed();
 
-  /* We are not going to crop any more sprites from big sprites, free them.
-   */
+  // We are not going to crop any more sprites from big sprites, free them.
   finish_loading_sprites(tileset);
 
   game.client.ruleset_ready = true;
@@ -4039,8 +4039,6 @@ void handle_ruleset_extra(const struct packet_ruleset_extra *p)
   pextra->conflicts = p->conflicts;
 
   pextra->helptext = packet_strvec_extract(p->helptext);
-
-  tileset_setup_extra(tileset, pextra);
 }
 
 /**

client/tileset/drawn_sprite.cpp

@@ -18,20 +18,28 @@
 drawn_sprite::drawn_sprite(const struct tileset *ts, const QPixmap *sprite,
                            bool foggable, int offset_x, int offset_y)
     : sprite(sprite), foggable(foggable && tileset_use_hard_coded_fog(ts)),
-      offset_x(offset_x), offset_y(offset_y)
+      offset(offset_x, offset_y)
 {
   fc_assert(sprite);
 }
 
+/**
+ * Instantiates a drawn sprite, ensuring that it's never null.
+ */
+drawn_sprite::drawn_sprite(const struct tileset *ts, const QPixmap *sprite,
+                           bool foggable, const QPoint &offset)
+    : drawn_sprite(ts, sprite, foggable, offset.x(), offset.y())
+{
+}
+
 /**
  * Calculates the bounding rectangle of the given sprite array.
  */
 QRect sprite_array_bounds(const std::vector<drawn_sprite> &sprs)
 {
   QRect bounds;
   for (const auto &sprite : sprs) {
-    bounds |= QRect(QPoint(sprite.offset_x, sprite.offset_y),
-                    sprite.sprite->size());
+    bounds |= QRect(sprite.offset, sprite.sprite->size());
   }
   return bounds;
 }