MapInfo - use DBString

EasyRPG · Aug 16, 2020 · 09cfa2d · 09cfa2d
1 parent 08bb429
commit 09cfa2d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/generator/csv/fields.csv b/generator/csv/fields.csv
@@ -598,7 +598,7 @@ Database,classes,f,Array<Class>,0x1E,,1,1,rpg::Class - RPG2003
 Database,classD1,f,EmptyBlock,0x1F,,1,1,Duplicated? - Not used - RPG2003
 Database,battleranimations,f,Array<BattlerAnimation>,0x20,,1,1,rpg::BattlerAnimation - RPG2003
 Encounter,troop_id,f,Ref<Troop>,0x01,0,0,0,Integer
-MapInfo,name,f,String,0x01,'',0,0,String. Note: Map ID 0 used to be game title but it should be ignored (TreeCtrl dummy editor dumped data); always use RPG_RT.ini GameTitle instead
+MapInfo,name,f,DBString,0x01,'',0,0,String. Note: Map ID 0 used to be game title but it should be ignored (TreeCtrl dummy editor dumped data); always use RPG_RT.ini GameTitle instead
 MapInfo,parent_map,f,Ref<Map>,0x02,0,0,0,Integer. Used to inherit parent map properties
 MapInfo,indentation,f,Int32,0x03,0,0,0,Integer. Dummy editor dumped data. Branch indentation level in TreeCtrl
 MapInfo,type,f,Enum<TreeMap_MapType>,0x04,-1,0,0,Integer

diff --git a/src/generated/lcf/rpg/mapinfo.h b/src/generated/lcf/rpg/mapinfo.h
@@ -16,6 +16,7 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
+#include "lcf/dbstring.h"
 #include "lcf/enum_tags.h"
 #include "lcf/rpg/encounter.h"
 #include "lcf/rpg/music.h"
@@ -62,7 +63,7 @@ namespace rpg {
 		);
 
 		int ID = 0;
-		std::string name;
+		DBString name;
 		int32_t parent_map = 0;
 		int32_t indentation = 0;
 		int32_t type = -1;

diff --git a/src/generated/lmt_mapinfo.cpp b/src/generated/lmt_mapinfo.cpp
@@ -20,7 +20,7 @@ namespace lcf {
 
 template <>
 char const* const Struct<rpg::MapInfo>::name = "MapInfo";
-static TypedField<rpg::MapInfo, std::string> static_name(
+static TypedField<rpg::MapInfo, DBString> static_name(
 	&rpg::MapInfo::name,
 	LMT_Reader::ChunkMapInfo::name,
 	"name",