Skip to content

Commit

Permalink
Add keybindings for directly setting power/coolant for engineering. S…
Browse files Browse the repository at this point in the history 
…o you can have joystick bindings to directly set this.
  • Loading branch information
@daid
daid committed Apr 4, 2024
1 parent e60b242 commit d155b73
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 45 deletions.
84 changes: 66 additions & 18 deletions src/gui/hotkeyConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,17 @@ Keys::Keys() :
}},

//Engineering
engineering_select_reactor("ENGINEERING_SELECT_SYSTEM_REACTOR", "1"),
engineering_select_beam_weapons("ENGINEERING_SELECT_SYSTEM_BEAM_WEAPONS", "2"),
engineering_select_missile_system("ENGINEERING_SELECT_SYSTEM_MISSILE", "3"),
engineering_select_maneuvering_system("ENGINEERING_SELECT_SYSTEM_MANEUVERING", "4"),
engineering_select_impulse_system("ENGINEERING_SELECT_SYSTEM_IMPULSE", "5"),
engineering_select_warp_system("ENGINEERING_SELECT_SYSTEM_WARP", "6"),
engineering_select_jump_drive_system("ENGINEERING_SELECT_SYSTEM_JUMP_DRIVE", "7"),
engineering_select_front_shield_system("ENGINEERING_SELECT_SYSTEM_FRONT_SHIELD", "8"),
engineering_select_rear_shield_system("ENGINEERING_SELECT_SYSTEM_READ_SHIELD", "9"),
engineering_select_system{
{"ENGINEERING_SELECT_SYSTEM_REACTOR", "1"},
{"ENGINEERING_SELECT_SYSTEM_BEAM_WEAPONS", "2"},
{"ENGINEERING_SELECT_SYSTEM_MISSILE", "3"},
{"ENGINEERING_SELECT_SYSTEM_MANEUVERING", "4"},
{"ENGINEERING_SELECT_SYSTEM_IMPULSE", "5"},
{"ENGINEERING_SELECT_SYSTEM_WARP", "6"},
{"ENGINEERING_SELECT_SYSTEM_JUMP_DRIVE", "7"},
{"ENGINEERING_SELECT_SYSTEM_FRONT_SHIELD", "8"},
{"ENGINEERING_SELECT_SYSTEM_READ_SHIELD", "9"},
},
engineering_set_power_000("ENGINEERING_POWER_000"),
engineering_set_power_030("ENGINEERING_POWER_030"),
engineering_set_power_050("ENGINEERING_POWER_050"),
Expand All @@ -251,8 +253,10 @@ Keys::Keys() :
engineering_set_power_300("ENGINEERING_POWER_300"),
engineering_increase_power("ENGINEERING_POWER_INCREASE", "]"),
engineering_decrease_power("ENGINEERING_POWER_DECREASE", "["),
engineering_set_power("ENGINEERING_POWER_SET"),
engineering_increase_coolant("ENGINEERING_COOLANT_INCREASE", "="),
engineering_decrease_coolant("ENGINEERING_COOLANT_DECREASE", "-"),
engineering_set_coolant("ENGINEERING_COOLANT_SET"),
engineering_next_repair_crew("ENGINEERING_REPAIR_CREW_NEXT", "C"),
engineering_repair_crew_up("ENGINEERING_REPAIR_CREW_UP", "Up"),
engineering_repair_crew_down("ENGINEERING_REPAIR_CREW_DOWN", "Down"),
Expand All @@ -261,6 +265,28 @@ Keys::Keys() :
engineering_self_destruct_start("ENGINEERING_SELF_DESTRUCT_START"),
engineering_self_destruct_confirm("ENGINEERING_SELF_DESTRUCT_CONFIRM"),
engineering_self_destruct_cancel("ENGINEERING_SELF_DESTRUCT_CANCEL"),
engineering_set_power_for_system{
{"ENGINEERING_SET_SYSTEM_POWER_REACTOR"},
{"ENGINEERING_SET_SYSTEM_POWER_BEAM_WEAPONS"},
{"ENGINEERING_SET_SYSTEM_POWER_MISSILE"},
{"ENGINEERING_SET_SYSTEM_POWER_MANEUVERING"},
{"ENGINEERING_SET_SYSTEM_POWER_IMPULSE"},
{"ENGINEERING_SET_SYSTEM_POWER_WARP"},
{"ENGINEERING_SET_SYSTEM_POWER_JUMP_DRIVE"},
{"ENGINEERING_SET_SYSTEM_POWER_FRONT_SHIELD"},
{"ENGINEERING_SET_SYSTEM_POWER_READ_SHIELD"},
},
engineering_set_coolant_for_system{
{"ENGINEERING_SET_SYSTEM_COOLANT_REACTOR"},
{"ENGINEERING_SET_SYSTEM_COOLANT_BEAM_WEAPONS"},
{"ENGINEERING_SET_SYSTEM_COOLANT_MISSILE"},
{"ENGINEERING_SET_SYSTEM_COOLANT_MANEUVERING"},
{"ENGINEERING_SET_SYSTEM_COOLANT_IMPULSE"},
{"ENGINEERING_SET_SYSTEM_COOLANT_WARP"},
{"ENGINEERING_SET_SYSTEM_COOLANT_JUMP_DRIVE"},
{"ENGINEERING_SET_SYSTEM_COOLANT_FRONT_SHIELD"},
{"ENGINEERING_SET_SYSTEM_COOLANT_READ_SHIELD"},
},

relay_alert_level_none("RELAY_ALERT_NONE"),
relay_alert_level_yellow("RELAY_ALERT_YELLOW"),
Expand Down Expand Up @@ -378,15 +404,15 @@ void Keys::init()
}

//Engineering
engineering_select_reactor.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select reactor system"));
engineering_select_beam_weapons.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select beam weapon system"));
engineering_select_missile_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select missile weapon system"));
engineering_select_maneuvering_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select maneuvering system"));
engineering_select_impulse_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select impulse system"));
engineering_select_warp_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select warp system"));
engineering_select_jump_drive_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select jump drive system"));
engineering_select_front_shield_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select front shields system"));
engineering_select_rear_shield_system.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select rear shields system"));
engineering_select_system[SYS_Reactor].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select reactor system"));
engineering_select_system[SYS_BeamWeapons].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select beam weapon system"));
engineering_select_system[SYS_MissileSystem].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select missile weapon system"));
engineering_select_system[SYS_Maneuver].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select maneuvering system"));
engineering_select_system[SYS_Impulse].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select impulse system"));
engineering_select_system[SYS_Warp].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select warp system"));
engineering_select_system[SYS_JumpDrive].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select jump drive system"));
engineering_select_system[SYS_FrontShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select front shields system"));
engineering_select_system[SYS_RearShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Select rear shields system"));
engineering_set_power_000.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system power to 0%"));
engineering_set_power_030.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system power to 30%"));
engineering_set_power_050.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system power to 50%"));
Expand All @@ -397,8 +423,10 @@ void Keys::init()
engineering_set_power_300.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system power to 300%"));
engineering_increase_power.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Increase system power"));
engineering_decrease_power.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Decrease system power"));
engineering_set_power.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system power (analogue)"));
engineering_increase_coolant.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Increase system coolant"));
engineering_decrease_coolant.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Decrease system coolant"));
engineering_set_coolant.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set system coolant (analogue)"));
engineering_next_repair_crew.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Next repair crew"));
engineering_repair_crew_up.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Crew move up"));
engineering_repair_crew_down.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Crew move down"));
Expand All @@ -408,6 +436,26 @@ void Keys::init()
engineering_self_destruct_confirm.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Confirm self-destruct"));
engineering_self_destruct_cancel.setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Cancel self-destruct"));

engineering_set_power_for_system[SYS_Reactor].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set reactor power (analogue)"));
engineering_set_power_for_system[SYS_BeamWeapons].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set beam weapon power (analogue)"));
engineering_set_power_for_system[SYS_MissileSystem].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set missile weapon power (analogue)"));
engineering_set_power_for_system[SYS_Maneuver].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set maneuvering power (analogue)"));
engineering_set_power_for_system[SYS_Impulse].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set impulse power (analogue)"));
engineering_set_power_for_system[SYS_Warp].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set warp power (analogue)"));
engineering_set_power_for_system[SYS_JumpDrive].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set jump drive power (analogue)"));
engineering_set_power_for_system[SYS_FrontShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set front shields power (analogue)"));
engineering_set_power_for_system[SYS_RearShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set rear shields power (analogue)"));

engineering_set_coolant_for_system[SYS_Reactor].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set reactor coolant (analogue)"));
engineering_set_coolant_for_system[SYS_BeamWeapons].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set beam weapon coolant (analogue)"));
engineering_set_coolant_for_system[SYS_MissileSystem].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set missile weapon coolant (analogue)"));
engineering_set_coolant_for_system[SYS_Maneuver].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set maneuvering coolant (analogue)"));
engineering_set_coolant_for_system[SYS_Impulse].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set impulse coolant (analogue)"));
engineering_set_coolant_for_system[SYS_Warp].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set warp coolant (analogue)"));
engineering_set_coolant_for_system[SYS_JumpDrive].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set jump drive coolant (analogue)"));
engineering_set_coolant_for_system[SYS_FrontShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set front shields coolant (analogue)"));
engineering_set_coolant_for_system[SYS_RearShield].setLabel(tr("hotkey_menu", "Engineering"), tr("hotkey_Engineering", "Set rear shields coolant (analogue)"));

relay_alert_level_none.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Normal"));
relay_alert_level_yellow.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Yellow"));
relay_alert_level_red.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Red"));
Expand Down
17 changes: 8 additions & 9 deletions src/gui/hotkeyConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <SDL.h>
#include <io/keybinding.h>
#include "stringImproved.h"
#include "shipTemplate.h"


class Keys
{
Expand Down Expand Up @@ -107,15 +109,7 @@ class Keys
std::array<sp::io::Keybinding, 4> science_scan_param_set;

//Engineering
sp::io::Keybinding engineering_select_reactor;
sp::io::Keybinding engineering_select_beam_weapons;
sp::io::Keybinding engineering_select_missile_system;
sp::io::Keybinding engineering_select_maneuvering_system;
sp::io::Keybinding engineering_select_impulse_system;
sp::io::Keybinding engineering_select_warp_system;
sp::io::Keybinding engineering_select_jump_drive_system;
sp::io::Keybinding engineering_select_front_shield_system;
sp::io::Keybinding engineering_select_rear_shield_system;
sp::io::Keybinding engineering_select_system[SYS_COUNT];
sp::io::Keybinding engineering_set_power_000;
sp::io::Keybinding engineering_set_power_030;
sp::io::Keybinding engineering_set_power_050;
Expand All @@ -126,8 +120,10 @@ class Keys
sp::io::Keybinding engineering_set_power_300;
sp::io::Keybinding engineering_increase_power;
sp::io::Keybinding engineering_decrease_power;
sp::io::Keybinding engineering_set_power;
sp::io::Keybinding engineering_increase_coolant;
sp::io::Keybinding engineering_decrease_coolant;
sp::io::Keybinding engineering_set_coolant;
sp::io::Keybinding engineering_next_repair_crew;
sp::io::Keybinding engineering_repair_crew_up;
sp::io::Keybinding engineering_repair_crew_down;
Expand All @@ -137,6 +133,9 @@ class Keys
sp::io::Keybinding engineering_self_destruct_confirm;
sp::io::Keybinding engineering_self_destruct_cancel;

sp::io::Keybinding engineering_set_power_for_system[SYS_COUNT];
sp::io::Keybinding engineering_set_coolant_for_system[SYS_COUNT];

//Relay
sp::io::Keybinding relay_alert_level_none;
sp::io::Keybinding relay_alert_level_yellow;
Expand Down
38 changes: 29 additions & 9 deletions src/screens/crew6/engineeringScreen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,15 +361,22 @@ void EngineeringScreen::onUpdate()
{
if (my_spaceship && isVisible())
{
if (keys.engineering_select_reactor.getDown()) selectSystem(SYS_Reactor);
if (keys.engineering_select_beam_weapons.getDown()) selectSystem(SYS_BeamWeapons);
if (keys.engineering_select_missile_system.getDown()) selectSystem(SYS_MissileSystem);
if (keys.engineering_select_maneuvering_system.getDown()) selectSystem(SYS_Maneuver);
if (keys.engineering_select_impulse_system.getDown()) selectSystem(SYS_Impulse);
if (keys.engineering_select_warp_system.getDown()) selectSystem(SYS_Warp);
if (keys.engineering_select_jump_drive_system.getDown()) selectSystem(SYS_JumpDrive);
if (keys.engineering_select_front_shield_system.getDown()) selectSystem(SYS_FrontShield);
if (keys.engineering_select_rear_shield_system.getDown()) selectSystem(SYS_RearShield);
for(unsigned int n=0; n<SYS_COUNT; n++) {
if (keys.engineering_select_system[n].getDown()) selectSystem(static_cast<ESystem>(n));

float set_value = keys.engineering_set_power_for_system[n].getValue() * 3.0f;
if (set_value != my_spaceship->systems[n].power_request && (set_value != 0.0f || set_power_active[n]))
{
my_spaceship->commandSetSystemPowerRequest(selected_system, set_value);
set_power_active[n] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
set_value = keys.engineering_set_coolant_for_system[n].getValue() * my_spaceship->max_coolant_per_system;
if (set_value != my_spaceship->systems[n].coolant_request && (set_value != 0.0f || set_coolant_active[n]))
{
my_spaceship->commandSetSystemCoolantRequest(selected_system, set_value);
set_coolant_active[n] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
}

if (selected_system != SYS_None)
{
Expand Down Expand Up @@ -427,6 +434,19 @@ void EngineeringScreen::onUpdate()
coolant_slider->setValue(my_spaceship->systems[selected_system].coolant_request + coolant_adjust);
my_spaceship->commandSetSystemCoolantRequest(selected_system, coolant_slider->getValue());
}

float set_value = keys.engineering_set_power.getValue() * 3.0f;
if (set_value != my_spaceship->systems[selected_system].power_request && (set_value != 0.0f || set_power_active[selected_system]))
{
my_spaceship->commandSetSystemPowerRequest(selected_system, set_value);
set_power_active[selected_system] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
set_value = keys.engineering_set_coolant.getValue() * my_spaceship->max_coolant_per_system;
if (set_value != my_spaceship->systems[selected_system].coolant_request && (set_value != 0.0f || set_coolant_active[selected_system]))
{
my_spaceship->commandSetSystemCoolantRequest(selected_system, set_value);
set_coolant_active[selected_system] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/screens/crew6/engineeringScreen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ class EngineeringScreen : public GuiOverlay
float previous_energy_level;
float average_energy_delta;

bool set_power_active[SYS_COUNT] = {false};
bool set_coolant_active[SYS_COUNT] = {false};

void addSystemEffect(string key, string value);
void selectSystem(ESystem system);

Expand Down
25 changes: 16 additions & 9 deletions src/screens/extra/powerManagement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,22 @@ void PowerManagementScreen::onUpdate()
{
if (my_spaceship && isVisible())
{
if (keys.engineering_select_reactor.getDown()) selected_system = SYS_Reactor;
if (keys.engineering_select_beam_weapons.getDown()) selected_system = SYS_BeamWeapons;
if (keys.engineering_select_missile_system.getDown()) selected_system = SYS_MissileSystem;
if (keys.engineering_select_maneuvering_system.getDown()) selected_system = SYS_Maneuver;
if (keys.engineering_select_impulse_system.getDown()) selected_system = SYS_Impulse;
if (keys.engineering_select_warp_system.getDown()) selected_system = SYS_Warp;
if (keys.engineering_select_jump_drive_system.getDown()) selected_system = SYS_JumpDrive;
if (keys.engineering_select_front_shield_system.getDown()) selected_system = SYS_FrontShield;
if (keys.engineering_select_rear_shield_system.getDown()) selected_system = SYS_RearShield;
for(unsigned int n=0; n<SYS_COUNT; n++) {
if (keys.engineering_select_system[n].getDown()) selected_system = static_cast<ESystem>(n);

float set_value = keys.engineering_set_power_for_system[n].getValue() * 3.0f;
if (set_value != my_spaceship->systems[n].power_request && (set_value != 0.0f || set_power_active[n]))
{
my_spaceship->commandSetSystemPowerRequest(selected_system, set_value);
set_power_active[n] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
set_value = keys.engineering_set_coolant_for_system[n].getValue() * my_spaceship->max_coolant_per_system;
if (set_value != my_spaceship->systems[n].coolant_request && (set_value != 0.0f || set_coolant_active[n]))
{
my_spaceship->commandSetSystemCoolantRequest(selected_system, set_value);
set_coolant_active[n] = set_value != 0.0f; //Make sure the next update is send, even if it is back to zero.
}
}

// Don't act if the selected system doesn't exist.
if (!my_spaceship->hasSystem(selected_system))
Expand Down
2 changes: 2 additions & 0 deletions src/screens/extra/powerManagement.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class PowerManagementScreen : public GuiOverlay
GuiProgressbar* coolant_bar;
};
SystemRow systems[SYS_COUNT];
bool set_power_active[SYS_COUNT] = {false};
bool set_coolant_active[SYS_COUNT] = {false};
public:
PowerManagementScreen(GuiContainer* owner);

Expand Down

2 comments on commit d155b73

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on d155b73 Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[ninja -j 2 package] returned [1]:


FAILED: CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o 

/usr/bin/c++  -I/data/tinyci_build/daid/EmptyEpsilon/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/include -I/data/tinyci_build/daid/SeriousProton/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/SeriousProton/include -I/data/tinyci_build/daid/SeriousProton/libs/Box2D/.. -I/data/tinyci_build/daid/SeriousProton/libs/glad -I/data/tinyci_build/daid/SeriousProton/libs/lua/.. -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/glm-src/glm/.. -I/data/tinyci_build/daid/SeriousProton/libs/freetype2/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/basis-src -I/data/tinyci_build/daid/SeriousProton/libs/libopus/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/meshoptimizer-src/src -isystem /usr/include/SDL2 -O2 -g -DNDEBUG -fdiagnostics-color -g1 -O3 -flto -funsafe-math-optimizations -Wall -Wextra -Woverloaded-virtual -Wdouble-promotion -Wsuggest-override -Werror=return-type -Wno-unused-parameter -Wno-unused-but-set-parameter -MD -MT CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o -MF CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o.d -o CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o -c /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyBinder.cpp

In file included from /data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:13,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.h:9,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyBinder.cpp:3:

/data/tinyci_build/daid/EmptyEpsilon/src/missileWeaponData.h:25:41: error: expected constructor, destructor, or type conversion before ‘;’ token

   25 | REGISTER_MULTIPLAYER_ENUM(EMissileSizes);

      |                                         ^

/data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:209:35: error: expected constructor, destructor, or type conversion before ‘;’ token

  209 | REGISTER_MULTIPLAYER_ENUM(ESystem);

      |                                   ^

[2/175] Building CXX object CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o

FAILED: CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o 

/usr/bin/c++  -I/data/tinyci_build/daid/EmptyEpsilon/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/include -I/data/tinyci_build/daid/SeriousProton/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/SeriousProton/include -I/data/tinyci_build/daid/SeriousProton/libs/Box2D/.. -I/data/tinyci_build/daid/SeriousProton/libs/glad -I/data/tinyci_build/daid/SeriousProton/libs/lua/.. -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/glm-src/glm/.. -I/data/tinyci_build/daid/SeriousProton/libs/freetype2/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/basis-src -I/data/tinyci_build/daid/SeriousProton/libs/libopus/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/meshoptimizer-src/src -isystem /usr/include/SDL2 -O2 -g -DNDEBUG -fdiagnostics-color -g1 -O3 -flto -funsafe-math-optimizations -Wall -Wextra -Woverloaded-virtual -Wdouble-promotion -Wsuggest-override -Werror=return-type -Wno-unused-parameter -Wno-unused-but-set-parameter -MD -MT CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o -MF CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o.d -o CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o -c /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.cpp

In file included from /data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:13,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.h:9,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.cpp:2:

/data/tinyci_build/daid/EmptyEpsilon/src/missileWeaponData.h:25:41: error: expected constructor, destructor, or type conversion before ‘;’ token

   25 | REGISTER_MULTIPLAYER_ENUM(EMissileSizes);

      |                                         ^

/data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:209:35: error: expected constructor, destructor, or type conversion before ‘;’ token

  209 | REGISTER_MULTIPLAYER_ENUM(ESystem);

      |                                   ^

ninja: build stopped: subcommand failed.

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on d155b73 Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[ninja -j 2 package] returned [1]:


FAILED: CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o 

/usr/bin/c++  -I/data/tinyci_build/daid/EmptyEpsilon/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/include -I/data/tinyci_build/daid/SeriousProton/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/SeriousProton/include -I/data/tinyci_build/daid/SeriousProton/libs/Box2D/.. -I/data/tinyci_build/daid/SeriousProton/libs/glad -I/data/tinyci_build/daid/SeriousProton/libs/lua/.. -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/glm-src/glm/.. -I/data/tinyci_build/daid/SeriousProton/libs/freetype2/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/basis-src -I/data/tinyci_build/daid/SeriousProton/libs/libopus/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/meshoptimizer-src/src -isystem /usr/include/SDL2 -O2 -g -DNDEBUG -fdiagnostics-color -g1 -O3 -flto -funsafe-math-optimizations -Wall -Wextra -Woverloaded-virtual -Wdouble-promotion -Wsuggest-override -Werror=return-type -Wno-unused-parameter -Wno-unused-but-set-parameter -MD -MT CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o -MF CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o.d -o CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyConfig.cpp.o -c /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.cpp

In file included from /data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:13,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.h:9,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.cpp:2:

/data/tinyci_build/daid/EmptyEpsilon/src/missileWeaponData.h:25:41: error: expected constructor, destructor, or type conversion before ‘;’ token

   25 | REGISTER_MULTIPLAYER_ENUM(EMissileSizes);

      |                                         ^

/data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:209:35: error: expected constructor, destructor, or type conversion before ‘;’ token

  209 | REGISTER_MULTIPLAYER_ENUM(ESystem);

      |                                   ^

[2/175] Building CXX object CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o

FAILED: CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o 

/usr/bin/c++  -I/data/tinyci_build/daid/EmptyEpsilon/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/include -I/data/tinyci_build/daid/SeriousProton/src -I/data/tinyci_build/daid/EmptyEpsilon/_build_native/SeriousProton/include -I/data/tinyci_build/daid/SeriousProton/libs/Box2D/.. -I/data/tinyci_build/daid/SeriousProton/libs/glad -I/data/tinyci_build/daid/SeriousProton/libs/lua/.. -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/glm-src/glm/.. -I/data/tinyci_build/daid/SeriousProton/libs/freetype2/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/basis-src -I/data/tinyci_build/daid/SeriousProton/libs/libopus/include -I/home/tinyci/builds/daid/EmptyEpsilon/_build_native/_deps/meshoptimizer-src/src -isystem /usr/include/SDL2 -O2 -g -DNDEBUG -fdiagnostics-color -g1 -O3 -flto -funsafe-math-optimizations -Wall -Wextra -Woverloaded-virtual -Wdouble-promotion -Wsuggest-override -Werror=return-type -Wno-unused-parameter -Wno-unused-but-set-parameter -MD -MT CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o -MF CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o.d -o CMakeFiles/EE_GuiLIB.dir/src/gui/hotkeyBinder.cpp.o -c /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyBinder.cpp

In file included from /data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:13,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyConfig.h:9,

                 from /data/tinyci_build/daid/EmptyEpsilon/src/gui/hotkeyBinder.cpp:3:

/data/tinyci_build/daid/EmptyEpsilon/src/missileWeaponData.h:25:41: error: expected constructor, destructor, or type conversion before ‘;’ token

   25 | REGISTER_MULTIPLAYER_ENUM(EMissileSizes);

      |                                         ^

/data/tinyci_build/daid/EmptyEpsilon/src/shipTemplate.h:209:35: error: expected constructor, destructor, or type conversion before ‘;’ token

  209 | REGISTER_MULTIPLAYER_ENUM(ESystem);

      |                                   ^

ninja: build stopped: subcommand failed.

Please sign in to comment.