wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary initialization of shared_ptrs

Browse source 
Signed-off-by: William Brawner <me@wbrawner.com>
This commit is contained in:
William Brawner 2021-06-09 18:26:19 -06:00 committed by seedhartha
parent a0f6e13ac7
commit 143288876b
2 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/engine/game/gui/ingame/character.h
View file

@ -41,75 +41,75 @@ public:
private:
struct Binding {
std::shared_ptr<gui::Label> lbl3dChar {nullptr};
std::shared_ptr<gui::Button> btn3dChar {nullptr};
std::shared_ptr<gui::Slider> sldAlign {nullptr};
std::shared_ptr<gui::Label> lblStr {nullptr};
std::shared_ptr<gui::Label> lblFortitudeStat {nullptr};
std::shared_ptr<gui::Label> lblReflexStat {nullptr};
std::shared_ptr<gui::Label> lblWillStat {nullptr};
std::shared_ptr<gui::Label> lblDefenseStat {nullptr};
std::shared_ptr<gui::Label> lblForceStat {nullptr};
std::shared_ptr<gui::Label> lblVitalityStat {nullptr};
std::shared_ptr<gui::Label> lblDex {nullptr};
std::shared_ptr<gui::Label> lblCon {nullptr};
std::shared_ptr<gui::Label> lblInt {nullptr};
std::shared_ptr<gui::Label> lblCha {nullptr};
std::shared_ptr<gui::Label> lblWis {nullptr};
std::shared_ptr<gui::Label> lblStrMod {nullptr};
std::shared_ptr<gui::Label> lblDexMod {nullptr};
std::shared_ptr<gui::Label> lblConMod {nullptr};
std::shared_ptr<gui::Label> lblIntMod {nullptr};
std::shared_ptr<gui::Label> lblWisMod {nullptr};
std::shared_ptr<gui::Label> lblChaMod {nullptr};
std::shared_ptr<gui::Label> lblExperienceStat {nullptr};
std::shared_ptr<gui::Label> lblNeededXp {nullptr};
std::shared_ptr<gui::Label> lblStrength {nullptr};
std::shared_ptr<gui::Label> lblDexterity {nullptr};
std::shared_ptr<gui::Label> lblConstitution {nullptr};
std::shared_ptr<gui::Label> lblIntelligence {nullptr};
std::shared_ptr<gui::Label> lblCharisma {nullptr};
std::shared_ptr<gui::Label> lblReflex {nullptr};
std::shared_ptr<gui::Label> lblWill {nullptr};
std::shared_ptr<gui::Label> lblExperience {nullptr};
std::shared_ptr<gui::Label> lblNextLevel {nullptr};
std::shared_ptr<gui::Label> lblForce {nullptr};
std::shared_ptr<gui::Label> lblVitality {nullptr};
std::shared_ptr<gui::Label> lblDefense {nullptr};
std::shared_ptr<gui::Label> lblFortitude {nullptr};
std::shared_ptr<gui::Label> lblBevel {nullptr};
std::shared_ptr<gui::Label> lblWisdom {nullptr};
std::shared_ptr<gui::Label> lblBevel2 {nullptr};
std::shared_ptr<gui::Label> lblLight {nullptr};
std::shared_ptr<gui::Label> lblDark {nullptr};
std::shared_ptr<gui::Button> btnExit {nullptr};
std::shared_ptr<gui::Button> btnAuto {nullptr};
std::shared_ptr<gui::Button> btnLevelup {nullptr};
std::shared_ptr<gui::Button> btnChange1 {nullptr};
std::shared_ptr<gui::Button> btnChange2 {nullptr};
std::shared_ptr<gui::Label> lbl3dChar;
std::shared_ptr<gui::Button> btn3dChar;
std::shared_ptr<gui::Slider> sldAlign;
std::shared_ptr<gui::Label> lblStr;
std::shared_ptr<gui::Label> lblFortitudeStat;
std::shared_ptr<gui::Label> lblReflexStat;
std::shared_ptr<gui::Label> lblWillStat;
std::shared_ptr<gui::Label> lblDefenseStat;
std::shared_ptr<gui::Label> lblForceStat;
std::shared_ptr<gui::Label> lblVitalityStat;
std::shared_ptr<gui::Label> lblDex;
std::shared_ptr<gui::Label> lblCon;
std::shared_ptr<gui::Label> lblInt;
std::shared_ptr<gui::Label> lblCha;
std::shared_ptr<gui::Label> lblWis;
std::shared_ptr<gui::Label> lblStrMod;
std::shared_ptr<gui::Label> lblDexMod;
std::shared_ptr<gui::Label> lblConMod;
std::shared_ptr<gui::Label> lblIntMod;
std::shared_ptr<gui::Label> lblWisMod;
std::shared_ptr<gui::Label> lblChaMod;
std::shared_ptr<gui::Label> lblExperienceStat;
std::shared_ptr<gui::Label> lblNeededXp;
std::shared_ptr<gui::Label> lblStrength;
std::shared_ptr<gui::Label> lblDexterity;
std::shared_ptr<gui::Label> lblConstitution;
std::shared_ptr<gui::Label> lblIntelligence;
std::shared_ptr<gui::Label> lblCharisma;
std::shared_ptr<gui::Label> lblReflex;
std::shared_ptr<gui::Label> lblWill;
std::shared_ptr<gui::Label> lblExperience;
std::shared_ptr<gui::Label> lblNextLevel;
std::shared_ptr<gui::Label> lblForce;
std::shared_ptr<gui::Label> lblVitality;
std::shared_ptr<gui::Label> lblDefense;
std::shared_ptr<gui::Label> lblFortitude;
std::shared_ptr<gui::Label> lblBevel;
std::shared_ptr<gui::Label> lblWisdom;
std::shared_ptr<gui::Label> lblBevel2;
std::shared_ptr<gui::Label> lblLight;
std::shared_ptr<gui::Label> lblDark;
std::shared_ptr<gui::Button> btnExit;
std::shared_ptr<gui::Button> btnAuto;
std::shared_ptr<gui::Button> btnLevelup;
std::shared_ptr<gui::Button> btnChange1;
std::shared_ptr<gui::Button> btnChange2;
// KOTOR only
std::shared_ptr<gui::Label> lblAdorn {nullptr};
std::shared_ptr<gui::Button> btnScripts {nullptr};
std::shared_ptr<gui::Label> lblClass {nullptr};
std::shared_ptr<gui::Label> lblClass1 {nullptr};
std::shared_ptr<gui::Label> lblClass2 {nullptr};
std::shared_ptr<gui::Label> lblAdorn;
std::shared_ptr<gui::Button> btnScripts;
std::shared_ptr<gui::Label> lblClass;
std::shared_ptr<gui::Label> lblClass1;
std::shared_ptr<gui::Label> lblClass2;
std::shared_ptr<gui::Label> lblGood[10];
std::shared_ptr<gui::Label> lblLevel {nullptr};
std::shared_ptr<gui::Label> lblLevel1 {nullptr};
std::shared_ptr<gui::Label> lblLevel2 {nullptr};
std::shared_ptr<gui::Label> lblMore {nullptr};
std::shared_ptr<gui::Label> lblName {nullptr};
std::shared_ptr<gui::Button> btnCharLeft {nullptr};
std::shared_ptr<gui::Button> btnCharRight {nullptr};
std::shared_ptr<gui::Label> lblLevel;
std::shared_ptr<gui::Label> lblLevel1;
std::shared_ptr<gui::Label> lblLevel2;
std::shared_ptr<gui::Label> lblMore;
std::shared_ptr<gui::Label> lblName;
std::shared_ptr<gui::Button> btnCharLeft;
std::shared_ptr<gui::Button> btnCharRight;
// End KOTOR only
// TSL only
std::shared_ptr<gui::Label> lblForceMastery {nullptr};
std::shared_ptr<gui::Label> lblMoreBack {nullptr};
std::shared_ptr<gui::Label> lblStatsBorder {nullptr};
std::shared_ptr<gui::Label> lblTitle {nullptr};
std::shared_ptr<gui::Label> lblXpBack {nullptr};
std::shared_ptr<gui::Label> lblForceMastery;
std::shared_ptr<gui::Label> lblMoreBack;
std::shared_ptr<gui::Label> lblStatsBorder;
std::shared_ptr<gui::Label> lblTitle;
std::shared_ptr<gui::Label> lblXpBack;
std::shared_ptr<gui::Label> lblBar[6];
// End TSL only
} _binding;

66
src/engine/game/gui/ingame/equip.h
View file

@ -56,47 +56,47 @@ public:
private:
struct Binding {
std::shared_ptr<gui::Label> lblCantEquip { nullptr };
std::shared_ptr<gui::Label> lblAttackInfo { nullptr };
std::shared_ptr<gui::Label> lblToHitR { nullptr };
std::shared_ptr<gui::Label> lblPortBord { nullptr };
std::shared_ptr<gui::Label> lblPortrait { nullptr };
std::shared_ptr<gui::ListBox> lbItems { nullptr };
std::shared_ptr<gui::Label> lblDefInfo { nullptr };
std::shared_ptr<gui::Label> lblCantEquip;
std::shared_ptr<gui::Label> lblAttackInfo;
std::shared_ptr<gui::Label> lblToHitR;
std::shared_ptr<gui::Label> lblPortBord;
std::shared_ptr<gui::Label> lblPortrait;
std::shared_ptr<gui::ListBox> lbItems;
std::shared_ptr<gui::Label> lblDefInfo;
std::unordered_map<Equipment::Slot, std::shared_ptr<gui::Label>> lblInv;
std::unordered_map<Equipment::Slot, std::shared_ptr<gui::Button>> btnInv;
std::shared_ptr<gui::Label> lblAtkL { nullptr };
std::shared_ptr<gui::Label> lblAtkR { nullptr };
std::shared_ptr<gui::Label> lblDef { nullptr };
std::shared_ptr<gui::Label> lblTitle { nullptr };
std::shared_ptr<gui::Label> lblDamage { nullptr };
std::shared_ptr<gui::Label> lblToHitL { nullptr };
std::shared_ptr<gui::Label> lblToHit { nullptr };
std::shared_ptr<gui::Label> lblSlotName { nullptr };
std::shared_ptr<gui::Button> btnBack { nullptr };
std::shared_ptr<gui::Button> btnEquip{ nullptr };
std::shared_ptr<gui::ListBox> lbDesc { nullptr };
std::shared_ptr<gui::Label> lblAtkL;
std::shared_ptr<gui::Label> lblAtkR;
std::shared_ptr<gui::Label> lblDef;
std::shared_ptr<gui::Label> lblTitle;
std::shared_ptr<gui::Label> lblDamage;
std::shared_ptr<gui::Label> lblToHitL;
std::shared_ptr<gui::Label> lblToHit;
std::shared_ptr<gui::Label> lblSlotName;
std::shared_ptr<gui::Button> btnBack;
std::shared_ptr<gui::Button> btnEquip;
std::shared_ptr<gui::ListBox> lbDesc;
// KOTOR only
std::shared_ptr<gui::Label> lblVitality { nullptr };
std::shared_ptr<gui::Label> lblTxtBar { nullptr };
std::shared_ptr<gui::Button> btnCharLeft { nullptr };
std::shared_ptr<gui::Button> btnCharRight { nullptr };
std::shared_ptr<gui::Label> lblSelectTitle { nullptr };
std::shared_ptr<gui::Button> btnChange1 { nullptr };
std::shared_ptr<gui::Button> btnChange2 { nullptr };
std::shared_ptr<gui::Label> lblVitality;
std::shared_ptr<gui::Label> lblTxtBar;
std::shared_ptr<gui::Button> btnCharLeft;
std::shared_ptr<gui::Button> btnCharRight;
std::shared_ptr<gui::Label> lblSelectTitle;
std::shared_ptr<gui::Button> btnChange1;
std::shared_ptr<gui::Button> btnChange2;
// End KOTOR only
// TSL only
std::shared_ptr<gui::Label> lblBack1 { nullptr };
std::shared_ptr<gui::Label> lblDefBack { nullptr };
std::shared_ptr<gui::Label> lblBack1;
std::shared_ptr<gui::Label> lblDefBack;
std::shared_ptr<gui::Label> lblBar[5];
std::shared_ptr<gui::Label> lblAttackMod { nullptr };
std::shared_ptr<gui::Label> lblDamText { nullptr };
std::shared_ptr<gui::Button> btnSwapWeapons { nullptr };
std::shared_ptr<gui::Button> btnPrevNpc { nullptr };
std::shared_ptr<gui::Button> btnNextNpc { nullptr };
std::shared_ptr<gui::Label> lblDefText { nullptr };
std::shared_ptr<gui::Label> lblAttackMod;
std::shared_ptr<gui::Label> lblDamText;
std::shared_ptr<gui::Button> btnSwapWeapons;
std::shared_ptr<gui::Button> btnPrevNpc;
std::shared_ptr<gui::Button> btnNextNpc;
std::shared_ptr<gui::Label> lblDefText;
// End TSL only
} _binding;