mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-07 08:15:59 -10:00
Goober5000andClaude Opus 4.7
49a9141073
team_data was the last persistence-adjacent structure sized by MAX_SHIP_CLASSES: four parallel ship arrays plus four parallel weapon arrays (one slot per mission-file loadout line, holding a class or a sexp variable name, and a count or a sexp variable name) with manual num_*_choices counters, plus a dense per-class weapon_required flag array. Convert all of it to the sparse-container family:
ship_list / ship_list_variables / ship_count / ship_count_variables
-> SCP_vector<loadout_entry> ship_choices
weaponry_pool / weaponry_count / weaponry_pool_variable /
weaponry_amount_variable
-> SCP_vector<loadout_entry> weapon_choices
bool weapon_required[MAX_WEAPON_TYPES]
-> SCP_set<int> required_weapons
where loadout_entry is {class_index, count, class_variable, count_variable}, with empty variable strings meaning the value was given literally. num_ship_choices / num_weapon_choices become .size().
Intentional behavior fixes, all previously latent memory errors or
data bugs:
* is_ship_assignable stored an alt ship CLASS in a variable used as a
loadout list INDEX when default_to_this_class was false, then
swapped to ship_list[class] - garbage for any mission where the two
domains diverge. It now swaps to the alt class itself, per the
evident intent.
* The default-ship fallback read ship_list[0] even when a team had
zero ship choices; it now leaves default_ship at -1, and
ss_fixup_team_data guards its append of the default ship accordingly.
* FRED2's dumpstats indexed Ships[] with a ship class when printing
loadout entries; it now prints the entry's class or variable name
directly.
* Team parse now clears the previous mission's entries explicitly
rather than relying on overwrite-in-place.
This clears the largest remaining cluster of MAX_SHIP_CLASSES references on the way to lifting the ship class limit.
Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
114 lines
3.5 KiB
C++
114 lines
3.5 KiB
C++
/*
|
|
* Copyright (C) Volition, Inc. 1999. All rights reserved.
|
|
*
|
|
* All source code herein is the property of Volition, Inc. You may not sell
|
|
* or otherwise commercially exploit the source or things you created based on the
|
|
* source.
|
|
*
|
|
*/
|
|
|
|
|
|
|
|
#include "ShipCheckListBox.h"
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
// player_start_editor dialog
|
|
|
|
class player_start_editor : public CDialog
|
|
{
|
|
// Construction
|
|
public:
|
|
player_start_editor(CWnd* pParent = NULL); // standard constructor
|
|
|
|
// Dialog Data
|
|
//{{AFX_DATA(player_start_editor)
|
|
enum { IDD = IDD_LOADOUT_EDITOR };
|
|
CSpinButtonCtrl m_pool_spin;
|
|
CSpinButtonCtrl m_delay_spin;
|
|
CSpinButtonCtrl m_spin1;
|
|
ShipCheckListBox m_ship_list;
|
|
ShipCheckListBox m_weapon_list;
|
|
ShipCheckListBox m_ship_variable_list;
|
|
ShipCheckListBox m_weapon_variable_list;
|
|
int m_delay;
|
|
int m_weapon_pool;
|
|
int m_ship_pool;
|
|
CComboBox m_ship_quantity_variable;
|
|
CComboBox m_weapon_quantity_variable;
|
|
CStatic m_ships_used_in_wings;
|
|
CStatic m_weapons_used_in_wings;
|
|
BOOL m_validation_toggle;
|
|
//}}AFX_DATA
|
|
|
|
|
|
// Overrides
|
|
// ClassWizard generated virtual function overrides
|
|
//{{AFX_VIRTUAL(player_start_editor)
|
|
protected:
|
|
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
|
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
|
|
//}}AFX_VIRTUAL
|
|
|
|
// Implementation
|
|
protected:
|
|
|
|
// Generated message map functions
|
|
//{{AFX_MSG(player_start_editor)
|
|
virtual BOOL OnInitDialog();
|
|
afx_msg void OnInitMenu(CMenu* pMenu);
|
|
afx_msg void OnSelchangeShipList();
|
|
afx_msg void OnSelchangeWeaponList();
|
|
afx_msg void OnUpdateShipPool();
|
|
afx_msg void OnUpdateWeaponPool();
|
|
void OnCancel();
|
|
void OnOK();
|
|
afx_msg void OnSelchangeShipVariablesList();
|
|
afx_msg void OnSelchangeWeaponVariablesList();
|
|
afx_msg void OnSelchangeShipVariablesCombo();
|
|
afx_msg void OnSelchangeWeaponVariablesCombo();
|
|
afx_msg void OnRequiredWeapons();
|
|
afx_msg void OnSelValidationToggle();
|
|
//}}AFX_MSG
|
|
DECLARE_MESSAGE_MAP()
|
|
|
|
private:
|
|
// if we've finished initializing the dialog
|
|
int dlg_inited;
|
|
|
|
// team we're currently working with
|
|
int selected_team;
|
|
int previous_team; // The last team we worked with
|
|
|
|
bool autobalance;
|
|
|
|
// ship pool info; an absent map entry means "not in the loadout" / "no variable" (the old -1 sentinel)
|
|
SCP_map<int, int> static_ship_pool[MAX_TVT_TEAMS]; // ship class -> count set by the team loadout
|
|
SCP_map<int, int> dynamic_ship_pool[MAX_TVT_TEAMS]; // string sexp variable index -> count
|
|
SCP_map<int, int> static_ship_variable_pool[MAX_TVT_TEAMS]; // ship class -> number sexp variable index supplying its count
|
|
SCP_map<int, int> dynamic_ship_variable_pool[MAX_TVT_TEAMS]; // string sexp variable index -> number sexp variable index supplying its count
|
|
|
|
// weapon pool info
|
|
SCP_map<int, int> static_weapon_pool[MAX_TVT_TEAMS];
|
|
SCP_map<int, int> dynamic_weapon_pool[MAX_TVT_TEAMS];
|
|
SCP_map<int, int> static_weapon_variable_pool[MAX_TVT_TEAMS];
|
|
SCP_map<int, int> dynamic_weapon_variable_pool[MAX_TVT_TEAMS];
|
|
|
|
// ship and weapon usage pools (class -> number used in starting wings)
|
|
SCP_map<int, int> ship_usage[MAX_TVT_TEAMS];
|
|
SCP_map<int, int> weapon_usage[MAX_TVT_TEAMS];
|
|
|
|
SCP_set<int> weapon_is_required[MAX_TVT_TEAMS];
|
|
|
|
bool validation_toggle[MAX_TVT_TEAMS];
|
|
|
|
// regenerate all controls
|
|
void reset_controls();
|
|
int GetSelectedShipListIndex();
|
|
int GetSelectedShipVariableListIndex();
|
|
int GetSelectedWeaponListIndex();
|
|
int GetSelectedWeaponVariableListIndex();
|
|
|
|
void UpdateQuantityVariable(CComboBox *variable_list, int pool_value);
|
|
|
|
};
|