Skip to content

Commit

Permalink
fixing a typo
Browse files Browse the repository at this point in the history
  • Loading branch information
AsherGlick committed Oct 9, 2023
1 parent 7e8cd83 commit 0ceba3d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion xml_converter/doc/trigger/guid.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class: UniqueId
xml_fields: ["GUID"]
applies_to: ["Icon", "Trail"]
protobuf_field: guid
ptotobuf_type: "String"
protobuf_type: String
---
A globally unique identifier value to make sure this maker's trigger reset data is always assocaited with this marker and never lost or confused with other markers.

Expand Down
16 changes: 8 additions & 8 deletions xml_converter/generators/code_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
optional={
"side_effects": array_t(string_t()),
"uses_file_path": boolean_t(),
"ptotobuf_type": enum_t(["Int32", "Fixed32", "Float32", "String"]),
"protobuf_type": enum_t(["Int32", "Fixed32", "Float32", "String"]),
}
),
})
Expand Down Expand Up @@ -169,11 +169,11 @@ class AttributeVariable:
is_component: bool = False

# A flag to override the type that should be used when writing or reading from a protobuf
ptotobuf_type: str = ""
protobuf_type: str = ""

def __post_init__(self) -> None:
if self.ptotobuf_type == "":
self.ptotobuf_type = self.attribute_type
if self.protobuf_type == "":
self.protobuf_type = self.attribute_type


XML_ATTRIBUTE_PARSER_DEFAULT_ARGUMENTS: Final[List[str]] = ["attribute", "errors"]
Expand Down Expand Up @@ -421,9 +421,9 @@ def generate_cpp_variable_data(
if fieldval['xml_bundled_components'] == []:
write_to_xml = False

ptotobuf_type = ""
if "ptotobuf_type" in fieldval:
ptotobuf_type = fieldval["ptotobuf_type"]
protobuf_type = ""
if "protobuf_type" in fieldval:
protobuf_type = fieldval["protobuf_type"]

attribute_variable = AttributeVariable(
attribute_name=attribute_name,
Expand All @@ -439,7 +439,7 @@ def generate_cpp_variable_data(
write_to_xml=write_to_xml,
attribute_flag_name=attribute_name + "_is_set",
side_effects=side_effects,
ptotobuf_type=ptotobuf_type
protobuf_type=protobuf_type
)
attribute_variables.append(attribute_variable)

Expand Down
8 changes: 4 additions & 4 deletions xml_converter/generators/cpp_templates/class_template.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ waypoint::{{cpp_class}} {{cpp_class}}::as_protobuf() const {
{% for attribute_variable in attribute_variables %}
{% if attribute_variable.is_component == false %}
if (this->{{attribute_variable.attribute_flag_name}}) {
{% if attribute_variable.ptotobuf_type in ["MultiflagValue", "CompoundValue", "Custom", "CompoundCustomClass"] %}
{% if attribute_variable.protobuf_type in ["MultiflagValue", "CompoundValue", "Custom", "CompoundCustomClass"] %}
proto_{{cpp_class_header}}.{{attribute_variable.mutable_proto_drilldown_calls}}set_allocated_{{attribute_variable.protobuf_field}}(to_proto_{{attribute_variable.class_name}}(this->{{attribute_variable.attribute_name}}));
{% else %}
proto_{{cpp_class_header}}.{{attribute_variable.mutable_proto_drilldown_calls}}set_{{attribute_variable.protobuf_field}}(to_proto_{{attribute_variable.class_name}}(this->{{attribute_variable.attribute_name}}));
Expand All @@ -112,11 +112,11 @@ waypoint::{{cpp_class}} {{cpp_class}}::as_protobuf() const {
void {{cpp_class}}::parse_protobuf(waypoint::{{cpp_class}} proto_{{cpp_class_header}}) {
{% for attribute_variable in attribute_variables %}
{% if attribute_variable.is_component == false %}
{% if attribute_variable.ptotobuf_type in ["MultiflagValue", "CompoundValue", "Custom", "CompoundCustomClass"] %}
{% if attribute_variable.protobuf_type in ["MultiflagValue", "CompoundValue", "Custom", "CompoundCustomClass"] %}
if (proto_{{cpp_class_header}}{{attribute_variable.proto_drilldown_calls}}.has_{{attribute_variable.protobuf_field}}()) {
{% elif attribute_variable.ptotobuf_type == "String" %}
{% elif attribute_variable.protobuf_type == "String" %}
if (proto_{{cpp_class_header}}{{attribute_variable.proto_drilldown_calls}}.{{attribute_variable.protobuf_field}}() != "") {
{% elif attribute_variable.ptotobuf_type == "Enum" %}
{% elif attribute_variable.protobuf_type == "Enum" %}
if (proto_{{cpp_class_header}}{{attribute_variable.proto_drilldown_calls}}.{{attribute_variable.protobuf_field}}() != 0) {
{% else %}
if (proto_{{cpp_class_header}}{{attribute_variable.proto_drilldown_calls}}.{{attribute_variable.protobuf_field}}() != 0) {
Expand Down

0 comments on commit 0ceba3d

Please sign in to comment.