Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cargo - Fix can't load Slingload_01_Base_F #8437

Merged
merged 2 commits into from
Sep 25, 2021
Merged

Conversation

Vdauphin
Copy link
Contributor

20ft containers (Land_Cargo20_military_green_F) can be loaded. But all children from Slingload_01_Base_F which share the same real size of a 20ft container can't be loaded (ex: B_Slingload_01_Ammo_F)

When merged this pull request will:

  • This pull request enable the loading of Slingload_01_Base_F childrens. It follow the current behavior of all 20 ft containers (
    class Land_Cargo20_blue_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_brick_red_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_cyan_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_grey_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_light_blue_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_light_green_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_military_green_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_orange_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_red_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_sand_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_vr_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_white_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Land_Cargo20_yellow_F: Cargo_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    class Cargo_IDAP_base_F: Cargo_base_F {};
    class Land_Cargo20_IDAP_F: Cargo_IDAP_base_F {
    class EventHandlers {
    class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
    };
    GVAR(space) = 49;
    GVAR(size) = 50;
    };
    )

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)
@jonpas
Copy link
Member

jonpas commented Sep 12, 2021

Can you add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference?

@jonpas jonpas added the kind/bug-fix Release Notes: **FIXED:** label Sep 12, 2021
@jonpas jonpas added this to the 3.14.0 milestone Sep 12, 2021
add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
@PabstMirror PabstMirror merged commit e31d931 into acemod:master Sep 25, 2021
@Vdauphin Vdauphin deleted the patch-8 branch October 21, 2021 19:26
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
* fix can't load Slingload_01_Base_F

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)

* add a comment next to the changed line 

add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants