swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-01 16:13:19 -04:00
Code Issues Projects Releases Wiki Activity

persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...

Browse Source
This commit is contained in:
DarthArgus
2016-12-10 23:17:06 +00:00
parent 688ab3fc9e
commit 8e94519082
450 changed files with 1287 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h
+1 -1
View File
@@ -149,7 +149,7 @@ private:
CompilerIntegerParam m_rating; // armor rating
CompilerIntegerParam m_integrity; // integrity
CompilerIntegerParam m_effectiveness; // default effectiveness (0 = only use special protection)
stdvector<StructParamOT *>::fwd m_specialProtection; // damage-type specific protection
std::vector<StructParamOT *> m_specialProtection; // damage-type specific protection
bool m_specialProtectionLoaded;
bool m_specialProtectionAppend;
CompilerIntegerParam m_vulnerability; // damaga types that this armor doesn't protect against
engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h
+1 -1
View File
@@ -86,7 +86,7 @@ private:
FloatParam m_maxDrainModifier; // //max drain rate in units/sec
FloatParam m_minFaucetModifier; // //min regeneration rate in units/sec
FloatParam m_maxFaucetModifier; // //max regeneration rate in units/sec
stdvector<StructParamOT *>::fwd m_attribMods; // //(de)buffs the creature is created with
std::vector<StructParamOT *> m_attribMods; // //(de)buffs the creature is created with
bool m_attribModsLoaded;
bool m_attribModsAppend;
CompilerIntegerParam m_shockWounds; // //current shock wounds
engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h
+5 -5
View File
@@ -46,7 +46,7 @@ public:
{
bool optional;
StringId name;
stdvector<Ingredient>::fwd options;
std::vector<Ingredient> options;
std::string optionalSkillCommand;
float complexity;
std::string appearance;
@@ -91,7 +91,7 @@ protected:
private:
BoolParam m_optional; // is the slot optional
StringIdParam m_name; // slot name
stdvector<StructParamOT *>::fwd m_options; // possible ingredients that can be used to fill the slot
std::vector<StructParamOT *> m_options; // possible ingredients that can be used to fill the slot
bool m_optionsLoaded;
bool m_optionsAppend;
StringParam m_optionalSkillCommand; // skill commands needed to access this slot if it is optional (ignored for required slots)
@@ -130,14 +130,14 @@ private:
CompilerIntegerParam m_category; // schematic category (food, weapon, etc)
StringParam m_craftedObjectTemplate; // what object we create
StringParam m_crateObjectTemplate; // the "crate" to use when manufacturing multiple copies of the object
stdvector<StructParamOT *>::fwd m_slots; // ingredient slots
std::vector<StructParamOT *> m_slots; // ingredient slots
bool m_slotsLoaded;
bool m_slotsAppend;
stdvector<StringParam *>::fwd m_skillCommands; // skill commands needed to access this schematic and required slots
std::vector<StringParam *> m_skillCommands; // skill commands needed to access this schematic and required slots
bool m_skillCommandsLoaded;
bool m_skillCommandsAppend;
BoolParam m_destroyIngredients; // flag that the ingredients used in the design stage should be destroyed
stdvector<StringParam *>::fwd m_manufactureScripts; // scripts that will be attached to a manufacturing schematic created from this schematic
std::vector<StringParam *> m_manufactureScripts; // scripts that will be attached to a manufacturing schematic created from this schematic
bool m_manufactureScriptsLoaded;
bool m_manufactureScriptsAppend;
CompilerIntegerParam m_itemsPerContainer; // when manufacturing, how many items will be put in a container (1 = items not in a container)
engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h
+2 -2
View File
@@ -66,7 +66,7 @@ public:
struct Ingredient
{
enum IngredientType ingredientType;
stdvector<SimpleIngredient>::fwd ingredients;
std::vector<SimpleIngredient> ingredients;
float complexity;
std::string skillCommand;
};
@@ -163,7 +163,7 @@ protected:
private:
CompilerIntegerParam m_ingredientType; // type of ingredient required
stdvector<StructParamOT *>::fwd m_ingredients; // ingredients to be used/being used
std::vector<StructParamOT *> m_ingredients; // ingredients to be used/being used
bool m_ingredientsLoaded;
bool m_ingredientsAppend;
FloatParam m_complexity; // adjustment to complexity by using this ingredient
engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h
+2 -2
View File
@@ -119,11 +119,11 @@ protected:
private:
StringParam m_draftSchematic; // source draft schematic
StringParam m_creator; // who created me
stdvector<StructParamOT *>::fwd m_ingredients; // ingredients needed to create
std::vector<StructParamOT *> m_ingredients; // ingredients needed to create
bool m_ingredientsLoaded;
bool m_ingredientsAppend;
CompilerIntegerParam m_itemCount; // number of items this schematic can make
stdvector<StructParamOT *>::fwd m_attributes; // values for the attributes the schematic affects
std::vector<StructParamOT *> m_attributes; // values for the attributes the schematic affects
bool m_attributesLoaded;
bool m_attributesAppend;
//@END TFD
engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h
+6 -6
View File
@@ -518,28 +518,28 @@ private:
// this enum is also defined in the shared draft_schematic_object_template.tdf file
// this enum is also defined in the shared draft_schematic_object_template.tdf file
StringParam m_sharedTemplate; // //template the client should associate with this template
stdvector<StringParam *>::fwd m_scripts; // //scripts attached to the object
std::vector<StringParam *> m_scripts; // //scripts attached to the object
bool m_scriptsLoaded;
bool m_scriptsAppend;
DynamicVariableParam m_objvars; // //default objvars added to the object
CompilerIntegerParam m_volume; // //how much room does the object take up
stdvector<CompilerIntegerParam *>::fwd m_visibleFlags; // //who can see this object
std::vector<CompilerIntegerParam *> m_visibleFlags; // //who can see this object
bool m_visibleFlagsLoaded;
bool m_visibleFlagsAppend;
stdvector<CompilerIntegerParam *>::fwd m_deleteFlags; // //who can delete this object
std::vector<CompilerIntegerParam *> m_deleteFlags; // //who can delete this object
bool m_deleteFlagsLoaded;
bool m_deleteFlagsAppend;
stdvector<CompilerIntegerParam *>::fwd m_moveFlags; // //who can move this object
std::vector<CompilerIntegerParam *> m_moveFlags; // //who can move this object
bool m_moveFlagsLoaded;
bool m_moveFlagsAppend;
BoolParam m_invulnerable; // //can this object not be destroyed/killed
FloatParam m_complexity; // //how hard this item is to craft (?)
CompilerIntegerParam m_tintIndex; // //index into client tint palette
FloatParam m_updateRanges[3]; // //distances for network updates
stdvector<StructParamOT *>::fwd m_contents; // //what's in this object
std::vector<StructParamOT *> m_contents; // //what's in this object
bool m_contentsLoaded;
bool m_contentsAppend;
stdvector<StructParamOT *>::fwd m_xpPoints; // //experience points for interacting with this object
std::vector<StructParamOT *> m_xpPoints; // //experience points for interacting with this object
bool m_xpPointsLoaded;
bool m_xpPointsAppend;
BoolParam m_persistByDefault; // //flag to automatically persist this object on creation
engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h
+1 -1
View File
@@ -109,7 +109,7 @@ private:
// //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/script/base_class.java
// //depot/swg/current/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h
// //depot/swg/current/src/engine/server/library/serverGame/src/shared/object/TangibleObject.h
stdvector<TriggerVolumeParam *>::fwd m_triggerVolumes; // trigger volume(s) attached to the object
std::vector<TriggerVolumeParam *> m_triggerVolumes; // trigger volume(s) attached to the object
bool m_triggerVolumesLoaded;
bool m_triggerVolumesAppend;
CompilerIntegerParam m_combatSkeleton; // this should be fixed (not random) for any template type
engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h
+22 -22
View File
@@ -146,16 +146,16 @@ private:
CompilerIntegerParam m_intRandomRange4;
CompilerIntegerParam m_intDiceRoll1;
CompilerIntegerParam m_intDiceRoll2;
stdvector<CompilerIntegerParam *>::fwd m_intListSimple;
std::vector<CompilerIntegerParam *> m_intListSimple;
bool m_intListSimpleLoaded;
bool m_intListSimpleAppend;
stdvector<CompilerIntegerParam *>::fwd m_intListWeightedList;
std::vector<CompilerIntegerParam *> m_intListWeightedList;
bool m_intListWeightedListLoaded;
bool m_intListWeightedListAppend;
stdvector<CompilerIntegerParam *>::fwd m_intListRandomRange;
std::vector<CompilerIntegerParam *> m_intListRandomRange;
bool m_intListRandomRangeLoaded;
bool m_intListRandomRangeAppend;
stdvector<CompilerIntegerParam *>::fwd m_intListDiceRoll;
std::vector<CompilerIntegerParam *> m_intListDiceRoll;
bool m_intListDiceRollLoaded;
bool m_intListDiceRollAppend;
// Float
@@ -170,65 +170,65 @@ private:
FloatParam m_floatRandomRange2;
FloatParam m_floatRandomRange3;
FloatParam m_floatRandomRange4;
stdvector<FloatParam *>::fwd m_floatListSimple;
std::vector<FloatParam *> m_floatListSimple;
bool m_floatListSimpleLoaded;
bool m_floatListSimpleAppend;
stdvector<FloatParam *>::fwd m_floatListWeightedList;
std::vector<FloatParam *> m_floatListWeightedList;
bool m_floatListWeightedListLoaded;
bool m_floatListWeightedListAppend;
stdvector<FloatParam *>::fwd m_floatListRandomRange;
std::vector<FloatParam *> m_floatListRandomRange;
bool m_floatListRandomRangeLoaded;
bool m_floatListRandomRangeAppend;
// Enum
CompilerIntegerParam m_enumIndexedByEnumSingle[3];
CompilerIntegerParam m_enumIndexedByEnumWeightedList[3];
stdvector<CompilerIntegerParam *>::fwd m_enumListIndexed;
std::vector<CompilerIntegerParam *> m_enumListIndexed;
bool m_enumListIndexedLoaded;
bool m_enumListIndexedAppend;
stdvector<CompilerIntegerParam *>::fwd m_enumListWeightedList;
std::vector<CompilerIntegerParam *> m_enumListWeightedList;
bool m_enumListWeightedListLoaded;
bool m_enumListWeightedListAppend;
// StringId
StringIdParam m_stringIdDerived;
StringIdParam m_stringIdSimple;
StringIdParam m_stringIdWeightedList;
stdvector<StringIdParam *>::fwd m_stringIdListSimple;
std::vector<StringIdParam *> m_stringIdListSimple;
bool m_stringIdListSimpleLoaded;
bool m_stringIdListSimpleAppend;
stdvector<StringIdParam *>::fwd m_stringIdListWeightedList;
std::vector<StringIdParam *> m_stringIdListWeightedList;
bool m_stringIdListWeightedListLoaded;
bool m_stringIdListWeightedListAppend;
// String
StringParam m_stringDerived;
StringParam m_stringSimple;
StringParam m_stringWeightedList;
stdvector<StringParam *>::fwd m_stringListSimple;
std::vector<StringParam *> m_stringListSimple;
bool m_stringListSimpleLoaded;
bool m_stringListSimpleAppend;
stdvector<StringParam *>::fwd m_stringListWeightedList;
std::vector<StringParam *> m_stringListWeightedList;
bool m_stringListWeightedListLoaded;
bool m_stringListWeightedListAppend;
// TRIGGER VOLUME
TriggerVolumeParam m_triggerVolumeDerived;
TriggerVolumeParam m_triggerVolumeSimple;
TriggerVolumeParam m_triggerVolumeWeightedList;
stdvector<TriggerVolumeParam *>::fwd m_triggerVolumeList;
std::vector<TriggerVolumeParam *> m_triggerVolumeList;
bool m_triggerVolumeListLoaded;
bool m_triggerVolumeListAppend;
stdvector<TriggerVolumeParam *>::fwd m_triggerVolumesListWeightedList;
std::vector<TriggerVolumeParam *> m_triggerVolumesListWeightedList;
bool m_triggerVolumesListWeightedListLoaded;
bool m_triggerVolumesListWeightedListAppend;
// BOOL
BoolParam m_boolDerived;
BoolParam m_boolSimple;
BoolParam m_boolWeightedList;
stdvector<BoolParam *>::fwd m_boolListDerived;
std::vector<BoolParam *> m_boolListDerived;
bool m_boolListDerivedLoaded;
bool m_boolListDerivedAppend;
stdvector<BoolParam *>::fwd m_boolListSimple;
std::vector<BoolParam *> m_boolListSimple;
bool m_boolListSimpleLoaded;
bool m_boolListSimpleAppend;
stdvector<BoolParam *>::fwd m_boolListWeightedList;
std::vector<BoolParam *> m_boolListWeightedList;
bool m_boolListWeightedListLoaded;
bool m_boolListWeightedListAppend;
///******
@@ -246,14 +246,14 @@ private:
// vector vectorSimpleDeltaNegativePercent
// vector vectorWeightedList
// vector vectorRandomRange
stdvector<VectorParam *>::fwd m_vectorListSimple;
std::vector<VectorParam *> m_vectorListSimple;
bool m_vectorListSimpleLoaded;
bool m_vectorListSimpleAppend;
// Filename
StringParam m_filenameAtDerived;
StringParam m_filenameSimple;
StringParam m_filenameWeightedList;
stdvector<StringParam *>::fwd m_filenameListSimple;
std::vector<StringParam *> m_filenameListSimple;
bool m_filenameListSimpleLoaded;
bool m_filenameListSimpleAppend;
// Objvar
@@ -264,13 +264,13 @@ private:
StringParam m_templateDerived;
StringParam m_templateSimple;
StringParam m_templateWeightedList;
stdvector<StringParam *>::fwd m_templateListSimple;
std::vector<StringParam *> m_templateListSimple;
bool m_templateListSimpleLoaded;
bool m_templateListSimpleAppend;
// Structs
StructParamOT m_structAtDerived;
StructParamOT m_structSimple;
stdvector<StructParamOT *>::fwd m_structListSimple;
std::vector<StructParamOT *> m_structListSimple;
bool m_structListSimpleLoaded;
bool m_structListSimpleAppend;
StructParamOT m_structArrayEnum[3];
engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h
+2 -2
View File
@@ -202,10 +202,10 @@ protected:
private:
// this enum is also defined in the server object_template.tdf file
// this enum is also defined in the server object_template.tdf file
stdvector<StructParamOT *>::fwd m_slots; // ingredient slots
std::vector<StructParamOT *> m_slots; // ingredient slots
bool m_slotsLoaded;
bool m_slotsAppend;
stdvector<StructParamOT *>::fwd m_attributes; // what attributes the schematic can affect
std::vector<StructParamOT *> m_attributes; // what attributes the schematic can affect
bool m_attributesLoaded;
bool m_attributesAppend;
StringParam m_craftedSharedTemplate;
engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h
+6 -6
View File
@@ -290,25 +290,25 @@ protected:
virtual void save(Iff &file);
private:
stdvector<StructParamOT *>::fwd m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template
std::vector<StructParamOT *> m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template
bool m_paletteColorCustomizationVariablesLoaded;
bool m_paletteColorCustomizationVariablesAppend;
stdvector<StructParamOT *>::fwd m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template
std::vector<StructParamOT *> m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template
bool m_rangedIntCustomizationVariablesLoaded;
bool m_rangedIntCustomizationVariablesAppend;
stdvector<StructParamOT *>::fwd m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB
std::vector<StructParamOT *> m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB
bool m_constStringCustomizationVariablesLoaded;
bool m_constStringCustomizationVariablesAppend;
stdvector<CompilerIntegerParam *>::fwd m_socketDestinations; // // GOTs that this object can be socketed into
std::vector<CompilerIntegerParam *> m_socketDestinations; // // GOTs that this object can be socketed into
bool m_socketDestinationsLoaded;
bool m_socketDestinationsAppend;
StringParam m_structureFootprintFileName;
BoolParam m_useStructureFootprintOutline;
BoolParam m_targetable; // // can the object be targetted by the client
stdvector<StringParam *>::fwd m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only)
std::vector<StringParam *> m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only)
bool m_certificationsRequiredLoaded;
bool m_certificationsRequiredAppend;
stdvector<StructParamOT *>::fwd m_customizationVariableMapping; // // Allows remapping of variables when needed
std::vector<StructParamOT *> m_customizationVariableMapping; // // Allows remapping of variables when needed
bool m_customizationVariableMappingLoaded;
bool m_customizationVariableMappingAppend;
CompilerIntegerParam m_clientVisabilityFlag; // // can the object be viewed on the client