Skip to content

Commit 19ca945

Browse files
committed
refactor: simplified using building::get_info()
1 parent 70b0d3d commit 19ca945

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/building/building.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ class building {
510510
void industry_add_workers(int fid);
511511
void industry_remove_worker(int fid);
512512

513-
static const metainfo &get_info(pcstr type);
513+
static const metainfo &get_info(const xstring type);
514514

515515
template<typename T>
516516
building_impl *acquire_impl() {
@@ -530,7 +530,7 @@ class building_impl {
530530
bool fire_proof;
531531
bool damage_proof;
532532
bool is_draggable;
533-
bstring64 meta_id;
533+
xstring meta_id;
534534
metainfo meta;
535535
e_resource input_resource;
536536
e_resource input_resource_second;

src/building/building_info.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "js/js_game.h"
77

8-
std::map<std::string, metainfo> g_building_metainfo;
8+
std::map<xstring, metainfo> g_building_metainfo;
99

1010
ANK_REGISTER_CONFIG_ITERATOR(config_load_building_info);
1111
void config_load_building_info() {
@@ -17,6 +17,6 @@ void config_load_building_info() {
1717
});
1818
}
1919

20-
const metainfo &building::get_info(pcstr type) {
20+
const metainfo &building::get_info(const xstring type) {
2121
return g_building_metainfo[type];
2222
}

0 commit comments

Comments
 (0)