Skip to content

Commit

Permalink
Improve handling of Map generator chunks
Browse files Browse the repository at this point in the history
- Works correctly on 2k3, passes through
  any already existing chunks in 2k.
  • Loading branch information
fmatthew5876 committed Oct 29, 2018
1 parent 8d56c05 commit bb11c0a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
28 changes: 14 additions & 14 deletions generator/csv/fields.csv
Expand Up @@ -673,21 +673,21 @@ Map,parallax_auto_loop_x,f,Boolean,0x23,False,0,0,Flag
Map,parallax_sx,f,Int32,0x24,0,0,0,Integer
Map,parallax_auto_loop_y,f,Boolean,0x25,False,0,0,Flag
Map,parallax_sy,f,Int32,0x26,0,0,0,Integer
Map,generator_flag,f,Boolean,0x28,False,0,1,Flag
Map,generator_mode,f,Enum<Map_GeneratorMode>,0x29,0,0,1,Integer
Map,generator_flag,f,Boolean,0x28,False,0,0,Flag
Map,generator_mode,f,Enum<Map_GeneratorMode>,0x29,0,0,0,Integer
Map,top_level,f,Boolean,0x2A,False,0,0,Bool
Map,generator_tiles,f,Enum<Map_GeneratorTiles>,0x30,0,0,1,Integer
Map,generator_width,f,Int32,0x31,4,0,1,Integer
Map,generator_height,f,Int32,0x32,1,0,1,Integer
Map,generator_surround,f,Boolean,0x33,True,0,1,Flag
Map,generator_upper_wall,f,Boolean,0x34,True,0,1,Flag
Map,generator_floor_b,f,Boolean,0x35,True,0,1,Flag
Map,generator_floor_c,f,Boolean,0x36,True,0,1,Flag
Map,generator_extra_b,f,Boolean,0x37,True,0,1,Flag
Map,generator_extra_c,f,Boolean,0x38,True,0,1,Flag
Map,generator_x,f,Vector<UInt32>,0x3C,,1,1,Uint32 x 9 RPG2003
Map,generator_y,f,Vector<UInt32>,0x3D,,1,1,Uint32 x 9 RPG2003
Map,generator_tile_ids,f,Vector<Int16>,0x3E,,1,1,Array - Short RPG2003
Map,generator_tiles,f,Enum<Map_GeneratorTiles>,0x30,0,0,0,Integer
Map,generator_width,f,Int32,0x31,4,0,0,Integer
Map,generator_height,f,Int32,0x32,1,0,0,Integer
Map,generator_surround,f,Boolean,0x33,True,0,0,Flag
Map,generator_upper_wall,f,Boolean,0x34,True,0,0,Flag
Map,generator_floor_b,f,Boolean,0x35,True,0,0,Flag
Map,generator_floor_c,f,Boolean,0x36,True,0,0,Flag
Map,generator_extra_b,f,Boolean,0x37,True,0,0,Flag
Map,generator_extra_c,f,Boolean,0x38,True,0,0,Flag
Map,generator_x,f,Vector<UInt32>,0x3C,,0,0,Uint32 x 9 RPG2003
Map,generator_y,f,Vector<UInt32>,0x3D,,0,0,Uint32 x 9 RPG2003
Map,generator_tile_ids,f,Vector<Int16>,0x3E,,0,0,Array - Short RPG2003
Map,lower_layer,f,Vector<Int16>,0x47,,1,0,Array - Short
Map,upper_layer,f,Vector<Int16>,0x48,,1,0,Array - Short
Map,events,f,Array<Event>,0x51,,1,0,Array - RPG::Event
Expand Down
28 changes: 14 additions & 14 deletions src/generated/lmu_map.cpp
Expand Up @@ -32,21 +32,21 @@ LCF_STRUCT_FIELDS_BEGIN()
LCF_STRUCT_TYPED_FIELD(int32_t, parallax_sx, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, parallax_auto_loop_y, 0, 0),
LCF_STRUCT_TYPED_FIELD(int32_t, parallax_sy, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_flag, 0, 1),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_mode, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_flag, 0, 0),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_mode, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, top_level, 0, 0),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_tiles, 0, 1),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_width, 0, 1),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_height, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_surround, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_upper_wall, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_floor_b, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_floor_c, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_extra_b, 0, 1),
LCF_STRUCT_TYPED_FIELD(bool, generator_extra_c, 0, 1),
LCF_STRUCT_TYPED_FIELD(std::vector<uint32_t>, generator_x, 1, 1),
LCF_STRUCT_TYPED_FIELD(std::vector<uint32_t>, generator_y, 1, 1),
LCF_STRUCT_TYPED_FIELD(std::vector<int16_t>, generator_tile_ids, 1, 1),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_tiles, 0, 0),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_width, 0, 0),
LCF_STRUCT_TYPED_FIELD(int32_t, generator_height, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_surround, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_upper_wall, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_floor_b, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_floor_c, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_extra_b, 0, 0),
LCF_STRUCT_TYPED_FIELD(bool, generator_extra_c, 0, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<uint32_t>, generator_x, 0, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<uint32_t>, generator_y, 0, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<int16_t>, generator_tile_ids, 0, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<int16_t>, lower_layer, 1, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<int16_t>, upper_layer, 1, 0),
LCF_STRUCT_TYPED_FIELD(std::vector<RPG::Event>, events, 1, 0),
Expand Down

0 comments on commit bb11c0a

Please sign in to comment.