ui: loading entertainment windows from js moved to window_info.cpp

Author: dalerank

src/building/building_jugler_school.cpp

@@ -12,11 +12,6 @@
 
 buildings::model_t<building_juggler_school> juggler_school_m;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_building_juggler_school);
-void config_load_building_juggler_school() {
-    juggler_school_m.load();
-}
-
 void building_juggler_school::update_month() {
     data.entertainment.spawned_entertainer_this_month = false;
 }

src/window/autoconfig_window.h

@@ -24,9 +24,9 @@ template<typename T>
 struct autoconfig_window_t : public autoconfig_window {
     inline pcstr section() const { 
         static type_name_holder<T> _impl;
-        static pcstr _section = strstr(_impl.value.data(), "::")
-                                    ? strstr(_impl.value.data(), "::") + 2
-                                    : _impl.value.data();
+        static pcstr _section = strstr(_impl.value.data(), "::") ? strstr(_impl.value.data(), "::") + 2 
+                                : strstr(_impl.value.data(), "struct ") ? strstr(_impl.value.data(), "struct ") + 7
+                                : _impl.value.data();
         return _section;
     }
 

src/window/window_building_info.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "window_info.h"
+#include "core/typename.h"
 
 struct building;
 
@@ -23,4 +24,15 @@ struct building_info_window : public common_info_window {
 
     void common_info_background(object_info& c);
     void draw_employment_details(object_info &c, int text_id = -1);
+};
+
+template<typename T>
+struct building_info_window_t : public building_info_window {
+    virtual pcstr section() const override {
+        static type_name_holder<T> _impl;
+        static pcstr _section = strstr(_impl.value.data(), "::") ? strstr(_impl.value.data(), "::") + 2
+                                : strstr(_impl.value.data(), "struct ") ? strstr(_impl.value.data(), "struct ") + 7
+                                : _impl.value.data();
+        return _section;
+    }
 };

src/window/window_entertainment_info.cpp

@@ -5,41 +5,34 @@
 #include "window/building/common.h"
 #include "js/js_game.h"
 
-struct entertainment_info_window : public building_info_window {
+struct info_window_entertainment : public building_info_window_t<info_window_entertainment>{
     virtual void window_info_background(object_info &c) override;
     virtual bool check(object_info &c) override {
         building *b = c.building_get();
-        return building_type_any_of(b->type, BUILDING_PAVILLION);
+        return building_type_any_of(b->type, BUILDING_PAVILLION, BUILDING_JUGGLER_SCHOOL);
     }
 };
 
-struct info_window_bandstand : public building_info_window {
+struct info_window_bandstand : public building_info_window_t<info_window_bandstand>{
     virtual void window_info_background(object_info &c) override;
     virtual bool check(object_info &c) override {
         return c.building_get()->dcast_bandstand();
     }
 };
 
-struct info_window_booth : public building_info_window {
+struct info_window_booth : public building_info_window_t<info_window_booth> {
     virtual void window_info_background(object_info &c) override;
     virtual bool check(object_info &c) override {
         building *b = c.building_get();
         return c.building_get()->dcast_booth();
     }
 };
 
-entertainment_info_window entertainment_infow;
+info_window_entertainment entertainment_infow;
 info_window_bandstand bandstand_infow;
 info_window_booth booth_infow;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_entertainment_info_window);
-void config_load_entertainment_info_window() {
-    entertainment_infow.load("info_window_entertainment");
-    bandstand_infow.load("info_window_bandstand");
-    booth_infow.load("info_window_bandstand");
-}
-
-void entertainment_info_window::window_info_background(object_info &c) {
+void info_window_entertainment::window_info_background(object_info &c) {
     c.go_to_advisor.first = ADVISOR_ENTERTAINMENT;
 
     building_info_window::window_info_background(c);

src/window/window_info.cpp

@@ -71,6 +71,15 @@ void config_load_info_window() {
     g_empty_info_window.load("empty_info_window");
     g_terrain_info_window.load("terrain_info_window");
     g_figure_info_window.load("figure_info_window");
+
+    for (auto &building_info_handler: *g_window_building_handlers) {
+        pcstr section = building_info_handler->section();
+        if (!section || !*section) {
+            //custom loader
+            continue;
+        }
+        building_info_handler->load(section);
+    }
 }
 
 static int center_in_city(int element_width_pixels) {

src/window/window_info.h

@@ -7,6 +7,7 @@ struct object_info;
 struct tooltip_context;
 
 struct common_info_window : public ui::widget {
+    virtual pcstr section() const { return ""; }
     virtual bool check(object_info &c) { return false; }
     virtual int get_height_id(object_info &c) { return 0; }
     virtual void window_info_background(object_info &c);