Skip to content

Commit

Permalink
Merge branch 'main' into tricollAndProps
Browse files Browse the repository at this point in the history
  • Loading branch information
RoyalBlue1 authored Apr 21, 2024
2 parents c0ac39e + 581da15 commit d324159
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,11 @@ int convert(char* in_filename, char* out_filename) {
.revision = r1bsp.header_->revision,
._127 = 127
};

// NOTE: we'll come back to write the new LumpHeaders later
size_t write_cursor = sizeof(r2bsp_header);


struct SortKey { int offset, index; };
std::vector<SortKey> lumps;
for (int i = 0; i < 128; i++) {
Expand Down Expand Up @@ -512,6 +514,7 @@ int convert(char* in_filename, char* out_filename) {

// TODO: Tricoll (https://github.com/snake-biscuits/bsp_tool/discussions/106)
switch (k.index) {

case titanfall::GAME_LUMP: { // NULLED OUT
/* TODO: modify sprp GAME_LUMP */
// uint32_t num_mdl_names; char mdl_names[num_mdl_names][128]; /* COPY */
Expand Down Expand Up @@ -631,6 +634,7 @@ int convert(char* in_filename, char* out_filename) {
break;
default: // copy raw lump bytes
memcpy(outfile.rawdata(write_cursor), r1bsp.file_.rawdata(r1lump.offset), r1lump.length);

}
write_cursor += r2lump.length;
}
Expand Down

0 comments on commit d324159

Please sign in to comment.