mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-07-28 23:16:15 -04:00
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...
This commit is contained in:
DarthArgus
@@ -55,7 +55,7 @@ struct ScriptData
|
||||
typedef std::vector<ScriptListEntry> ScriptList;
|
||||
|
||||
typedef Unicode::String String_t;
|
||||
typedef stdvector <String_t>::fwd StringVector_t;
|
||||
typedef std::vector <String_t> StringVector_t;
|
||||
|
||||
// values returned from script functions
|
||||
enum
|
||||
@@ -135,7 +135,7 @@ public:
|
||||
|
||||
static void makeScriptDictionary(const ScriptParams & params, ScriptDictionaryPtr & dictionary);
|
||||
bool handleMessage(const std::string &messageName, const ScriptDictionaryPtr & data);
|
||||
bool handleMessage(const std::string &messageName, const stdvector<int8>::fwd & packedData);
|
||||
bool handleMessage(const std::string &messageName, const std::vector<int8> & packedData);
|
||||
|
||||
void onWatching(ServerObject & subject);
|
||||
void onStopWatching(ServerObject & subject);
|
||||
@@ -150,7 +150,7 @@ public:
|
||||
static void enableNewJediTracking(bool enableTracking);
|
||||
static int getScriptFreeMem();
|
||||
|
||||
static stdset<std::string>::fwd & getScriptFunctions(const std::string & script);
|
||||
static std::set<std::string> & getScriptFunctions(const std::string & script);
|
||||
static Scheduler & getScriptScheduler();
|
||||
static void runOneScript(
|
||||
const std::string & scriptName,
|
||||
@@ -174,9 +174,9 @@ public:
|
||||
|
||||
static void packAllScriptVarDeltas();
|
||||
void clearScriptVars();
|
||||
void packScriptVars(stdvector<int8>::fwd & target) const;
|
||||
void unpackScriptVars(const stdvector<int8>::fwd & data) const;
|
||||
void unpackDeltaScriptVars(const stdvector<int8>::fwd & source) const;
|
||||
void packScriptVars(std::vector<int8> & target) const;
|
||||
void unpackScriptVars(const std::vector<int8> & data) const;
|
||||
void unpackDeltaScriptVars(const std::vector<int8> & source) const;
|
||||
|
||||
static ScriptListEntry getScriptListEntry(std::string const &scriptName);
|
||||
|
||||
@@ -238,7 +238,7 @@ inline const ScriptList & GameScriptObject::getScripts(void) const
|
||||
return m_scriptList;
|
||||
}
|
||||
|
||||
inline stdset<std::string>::fwd & GameScriptObject::getScriptFunctions(const std::string & script)
|
||||
inline std::set<std::string> & GameScriptObject::getScriptFunctions(const std::string & script)
|
||||
{
|
||||
return (*ms_scriptDataMap)[script].functions;
|
||||
}
|
||||
|
||||
@@ -5483,7 +5483,7 @@ namespace ScriptConversion {
|
||||
return true;
|
||||
}
|
||||
|
||||
const bool convert(const jobjectArray & source, stdvector<std::string>::fwd & target)
|
||||
const bool convert(const jobjectArray & source, std::vector<std::string> & target)
|
||||
{
|
||||
JNIEnv * env = JavaLibrary::getEnv();
|
||||
if (!env || !source)
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace Archive
|
||||
|
||||
typedef std::vector<ScriptListEntry> ScriptList;
|
||||
typedef Unicode::String String_t;
|
||||
typedef stdvector <String_t>::fwd StringVector_t;
|
||||
typedef stdvector<ObjectMenuRequestData>::fwd MenuDataVector;
|
||||
typedef std::vector <String_t> StringVector_t;
|
||||
typedef std::vector<ObjectMenuRequestData> MenuDataVector;
|
||||
|
||||
//========================================================================
|
||||
// C<->Java conversion functions
|
||||
@@ -79,20 +79,20 @@ namespace ScriptConversion
|
||||
{
|
||||
const bool convert(const Location & sourceLoc, LocalRefPtr & target);
|
||||
const bool convert(const LocalRefParam & sourceLoc, Location & target);
|
||||
const bool convert(const LocalObjectArrayRefParam & sourceLoc, stdvector<Location>::fwd & target);
|
||||
const bool convert(const stdvector<const Unicode::String *>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convert(const LocalObjectArrayRefParam & sourceLoc, std::vector<Location> & target);
|
||||
const bool convert(const std::vector<const Unicode::String *> & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convert(const jobject source, StringId & target);
|
||||
const bool convert(const LocalRefParam & source, StringId & target);
|
||||
const bool convert(const StringId & source, LocalRefPtr & target);
|
||||
const bool getClassName(const jobject & source, std::string & target);
|
||||
const bool convert(const stdvector<const char *>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const stdvector<std::string>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const jobjectArray & source, stdvector<std::string>::fwd & strArray);
|
||||
const bool convert(const stdset<CellPermissions::PermissionObject>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const stdvector<ServerObject *>::fwd & source, LocalLongArrayRefPtr & target);
|
||||
const bool convert(const stdvector<NetworkId>::fwd & source, LocalLongArrayRefPtr & target);
|
||||
const bool convert(const jlongArray & source, stdvector<ServerObject *>::fwd & target);
|
||||
const bool convert(const jlongArray & source, stdvector<NetworkId>::fwd & target);
|
||||
const bool convert(const std::vector<const char *> & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const std::vector<std::string> & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const jobjectArray & source, std::vector<std::string> & strArray);
|
||||
const bool convert(const std::set<CellPermissions::PermissionObject> & source, LocalObjectArrayRefPtr & strArray);
|
||||
const bool convert(const std::vector<ServerObject *> & source, LocalLongArrayRefPtr & target);
|
||||
const bool convert(const std::vector<NetworkId> & source, LocalLongArrayRefPtr & target);
|
||||
const bool convert(const jlongArray & source, std::vector<ServerObject *> & target);
|
||||
const bool convert(const jlongArray & source, std::vector<NetworkId> & target);
|
||||
const bool convert(const jobject & source, Vector & target, NetworkId & targetCell);
|
||||
const bool convertWorld(const jobject & source, Vector & target);
|
||||
const bool convertWorld(const jlong & source, Vector & target);
|
||||
@@ -101,16 +101,16 @@ namespace ScriptConversion
|
||||
const bool convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell);
|
||||
const bool convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId);
|
||||
const bool convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target);
|
||||
const bool convertWorld(const jobjectArray & source, stdvector<Vector>::fwd & target);
|
||||
const bool convert(const stdvector<const Vector *>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convertWorld(const jobjectArray & source, std::vector<Vector> & target);
|
||||
const bool convert(const std::vector<const Vector *> & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convert(const LocalRefParam & source, const Region * & target);
|
||||
const bool convert(const jobject & source, const Region * & target);
|
||||
const bool convert(const Region & source, LocalRefPtr & target);
|
||||
const bool convert(const AttribMod::AttribMod & source, LocalRefPtr & target);
|
||||
const bool convert(const jobject & source, AttribMod::AttribMod & target);
|
||||
const bool convert(const LocalRefParam & source, AttribMod::AttribMod & target);
|
||||
const bool convert(const stdvector<AttribMod::AttribMod>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convert(const jobjectArray & source, stdvector<AttribMod::AttribMod>::fwd & target);
|
||||
const bool convert(const std::vector<AttribMod::AttribMod> & source, LocalObjectArrayRefPtr & target);
|
||||
const bool convert(const jobjectArray & source, std::vector<AttribMod::AttribMod> & target);
|
||||
const bool convert(const jobject & source, Vector & target, NetworkId & targetCell, const Vector & i_default);
|
||||
const bool convert(const jbyteArray & source, std::vector<int8> & target);
|
||||
const bool convert(const LocalByteArrayRef & source, std::vector<int8> & target);
|
||||
@@ -134,16 +134,16 @@ class JavaLibrary
|
||||
// friend jobject convertDynamicVariableListToObject(JNIEnv *env, const DynamicVariableList& list);
|
||||
friend const bool ScriptConversion::convert(const Location & sourceLoc, LocalRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const LocalRefParam & sourceLoc, Location & target);
|
||||
friend const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, stdvector<Location>::fwd & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<const Unicode::String *>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const LocalObjectArrayRefParam & sourceLoc, std::vector<Location> & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<const Unicode::String *> & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const jobject source, StringId & target);
|
||||
friend const bool ScriptConversion::convert(const LocalRefParam & source, StringId & target);
|
||||
friend const bool ScriptConversion::convert(const StringId & source, LocalRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<ServerObject *>::fwd & source, LocalLongArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<NetworkId>::fwd & source, LocalLongArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<const char *>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const jlongArray & source, stdvector<ServerObject *>::fwd & target);
|
||||
friend const bool ScriptConversion::convert(const jlongArray & source, stdvector<NetworkId>::fwd & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<ServerObject *> & source, LocalLongArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<NetworkId> & source, LocalLongArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<const char *> & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const jlongArray & source, std::vector<ServerObject *> & target);
|
||||
friend const bool ScriptConversion::convert(const jlongArray & source, std::vector<NetworkId> & target);
|
||||
friend const bool ScriptConversion::convert(const jobject & source, Vector & target, NetworkId & targetCell);
|
||||
friend const bool ScriptConversion::convertWorld(const jobject & source, Vector & target);
|
||||
friend const bool ScriptConversion::convertWorld(const jlong & source, Vector & target);
|
||||
@@ -152,18 +152,18 @@ class JavaLibrary
|
||||
friend const bool ScriptConversion::convert(const jobject & source, Vector & targetLoc, std::string & targetSceneId, NetworkId & targetCell);
|
||||
friend const bool ScriptConversion::convertWorld(const jobject & source, Vector & targetLoc, std::string & targetSceneId);
|
||||
friend const bool ScriptConversion::convert(const Vector & sourceLoc, const std::string & sourceSceneId, const NetworkId & sourceCell, LocalRefPtr & target);
|
||||
friend const bool ScriptConversion::convertWorld(const jobjectArray & source, stdvector<Vector>::fwd & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<const Vector *>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convertWorld(const jobjectArray & source, std::vector<Vector> & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<const Vector *> & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const jobject & source, const Region* &target);
|
||||
friend const bool ScriptConversion::convert(const Region & source, LocalRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<std::string>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const jobjectArray & source, stdvector<std::string>::fwd & strArray);
|
||||
friend const bool ScriptConversion::convert(const stdset<CellPermissions::PermissionObject>::fwd & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const std::vector<std::string> & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const jobjectArray & source, std::vector<std::string> & strArray);
|
||||
friend const bool ScriptConversion::convert(const std::set<CellPermissions::PermissionObject> & source, LocalObjectArrayRefPtr & strArray);
|
||||
friend const bool ScriptConversion::convert(const AttribMod::AttribMod & source, LocalRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const jobject & source, AttribMod::AttribMod & target);
|
||||
friend const bool ScriptConversion::convert(const LocalRefParam & source, AttribMod::AttribMod & target);
|
||||
friend const bool ScriptConversion::convert(const stdvector<AttribMod::AttribMod>::fwd & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const jobjectArray & source, stdvector<AttribMod::AttribMod>::fwd & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<AttribMod::AttribMod> & source, LocalObjectArrayRefPtr & target);
|
||||
friend const bool ScriptConversion::convert(const jobjectArray & source, std::vector<AttribMod::AttribMod> & target);
|
||||
friend const bool ScriptConversion::convert(const jbyteArray & source, std::vector<int8> & target);
|
||||
friend const bool ScriptConversion::convert(const LocalByteArrayRef & source, std::vector<int8> & target);
|
||||
friend const bool ScriptConversion::convert(const std::vector<int8> & source, LocalByteArrayRefPtr & target);
|
||||
@@ -221,9 +221,9 @@ public:
|
||||
static void setScriptVar(const ServerObject &object, const std::string & name, float value);
|
||||
static void setScriptVar(const ServerObject &object, const std::string & name, const std::string & value);
|
||||
static void clearScriptVars(const ServerObject & source);
|
||||
static void unpackScriptVars(const ServerObject & target, const stdvector<int8>::fwd & data);
|
||||
static void unpackDeltaScriptVars(const ServerObject & target, const stdvector<int8>::fwd & data);
|
||||
static void packScriptVars(const ServerObject & source, stdvector<int8>::fwd & data);
|
||||
static void unpackScriptVars(const ServerObject & target, const std::vector<int8> & data);
|
||||
static void unpackDeltaScriptVars(const ServerObject & target, const std::vector<int8> & data);
|
||||
static void packScriptVars(const ServerObject & source, std::vector<int8> & data);
|
||||
static void packAllDeltaScriptVars();
|
||||
|
||||
// accessor functions
|
||||
@@ -309,13 +309,13 @@ public:
|
||||
static const bool convert(const JavaStringParam & source, std::string & target);
|
||||
static const bool convert(const Unicode::String & source, JavaString & target);
|
||||
static const bool convert(const JavaStringParam & source, Unicode::String & target);
|
||||
static const bool convert(const JavaDictionary & source, stdvector<int8>::fwd & target);
|
||||
static const bool convert(const JavaDictionary & source, std::vector<int8> & target);
|
||||
static const bool convert(const LocalRefParamPtr & source, MenuDataVector & target);
|
||||
static const bool convert(const MenuDataVector & source, LocalRefParamPtr & target);
|
||||
static const bool convert(const stdmap<std::string, int>::fwd & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const stdvector<std::pair<std::string, int> >::fwd & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const stdvector<std::pair<std::string, std::pair<int, int> > >::fwd & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const stdvector<std::pair<std::string, bool> >::fwd & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const std::map<std::string, int> & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const std::vector<std::pair<std::string, int> > & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const std::vector<std::pair<std::string, std::pair<int, int> > > & source, JavaDictionaryPtr & target);
|
||||
static const bool convert(const std::vector<std::pair<std::string, bool> > & source, JavaDictionaryPtr & target);
|
||||
static LocalRefPtr convert(const ValueDictionary & source);
|
||||
static void convert(const jobject & source, ValueDictionary & target);
|
||||
|
||||
@@ -332,8 +332,8 @@ public:
|
||||
// message functions
|
||||
int callMessages(const NetworkId & caller, const std::string & method, const ScriptDictionaryPtr & data);
|
||||
int callMessage(const NetworkId & caller, const std::string & script, const std::string & method, const ScriptDictionary & data);
|
||||
void packDictionary(const ScriptDictionary & dictionary, stdvector<int8>::fwd & packedData);
|
||||
bool unpackDictionary(const stdvector<int8>::fwd & packedData, ScriptDictionaryPtr & dictionary);
|
||||
void packDictionary(const ScriptDictionary & dictionary, std::vector<int8> & packedData);
|
||||
bool unpackDictionary(const std::vector<int8> & packedData, ScriptDictionaryPtr & dictionary);
|
||||
void convert(const ScriptParams & params, JavaDictionaryPtr & dictionary);
|
||||
|
||||
static void setupWeaponCombatData(JNIEnv *env, const WeaponObject * weapon, jobject weaponData);
|
||||
|
||||
@@ -27,7 +27,7 @@ public:
|
||||
|
||||
virtual void serialize(void) = 0;
|
||||
|
||||
const stdvector<int8>::fwd & getSerializedData(void) const;
|
||||
const std::vector<int8> & getSerializedData(void) const;
|
||||
uint32 getCrc(void) const;
|
||||
|
||||
protected:
|
||||
@@ -35,7 +35,7 @@ protected:
|
||||
ScriptDictionary(void);
|
||||
|
||||
|
||||
stdvector<int8>::fwd m_serializedData;
|
||||
std::vector<int8> m_serializedData;
|
||||
uint32 m_crc;
|
||||
|
||||
private:
|
||||
@@ -53,7 +53,7 @@ inline ScriptDictionary::~ScriptDictionary()
|
||||
{
|
||||
}
|
||||
|
||||
inline const stdvector<int8>::fwd & ScriptDictionary::getSerializedData(void) const
|
||||
inline const std::vector<int8> & ScriptDictionary::getSerializedData(void) const
|
||||
{
|
||||
return m_serializedData;
|
||||
}
|
||||
|
||||
@@ -392,7 +392,7 @@ void JNICALL ScriptMethodsNewbieTutorialNamespace::newbieTutorialSendStartingLoc
|
||||
|
||||
//-- Build the list for the client in order. Mark them unavailable when we've reached the minimum and the population is too high.
|
||||
typedef std::pair<StartingLocationData, bool> LocationStatus;
|
||||
typedef stdvector<LocationStatus>::fwd LocationStatusVector;
|
||||
typedef std::vector<LocationStatus> LocationStatusVector;
|
||||
LocationStatusVector clientLocations;
|
||||
clientLocations.reserve (ldv.size ());
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ static const std::string THEATER_FLATTEN_LAYER("terrain/poi_small.lay");
|
||||
namespace ScriptMethodsObjectCreateNamespace
|
||||
{
|
||||
bool install();
|
||||
jlong createTheater(const stdvector<jint>::fwd & crcs, const stdvector<Vector>::fwd & positions, const stdvector<float>::fwd & headings, const std::vector<std::string> & scripts, const Vector & center, const std::string & script, const NetworkId & creator, const std::string & name, int locationType);
|
||||
jlong createTheater(const std::vector<jint> & crcs, const std::vector<Vector> & positions, const std::vector<float> & headings, const std::vector<std::string> & scripts, const Vector & center, const std::string & script, const NetworkId & creator, const std::string & name, int locationType);
|
||||
|
||||
jlong JNICALL createNewObjectAt(JNIEnv *env, jobject self, jstring source, jlong target);
|
||||
jlong JNICALL createNewObjectInWorld(JNIEnv *env, jobject self, jlong source, jobject location);
|
||||
|
||||
@@ -72,8 +72,8 @@ using namespace JNIWrappersNamespace;
|
||||
namespace ScriptMethodsObjectInfoNamespace
|
||||
{
|
||||
bool install();
|
||||
void getGoodItemsFromContainer(const Container & container, stdvector<NetworkId>::fwd & goodItems);
|
||||
jobjectArray getNamesFromCrcs(JNIEnv *env, const stdvector<jint>::fwd & templateCrcs);
|
||||
void getGoodItemsFromContainer(const Container & container, std::vector<NetworkId> & goodItems);
|
||||
jobjectArray getNamesFromCrcs(JNIEnv *env, const std::vector<jint> & templateCrcs);
|
||||
LocalRefPtr createCustomVar(const jlong &objId, const std::string &variablePathName, CustomizationVariable &variable);
|
||||
LocalRefPtr createRangedIntCustomVar(const jlong &objId, const std::string &variablePathName, RangedIntCustomizationVariable &rangedIntVariable);
|
||||
LocalRefPtr createPalcolorCustomVar(const jlong &objId, const std::string &variablePathName, PaletteColorCustomizationVariable &variable);
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Crafting
|
||||
struct IngredientSlot;
|
||||
}
|
||||
|
||||
typedef stdvector<ObjectMenuRequestData>::fwd MenuDataVector;
|
||||
typedef std::vector<ObjectMenuRequestData> MenuDataVector;
|
||||
|
||||
struct SlotData
|
||||
{
|
||||
@@ -78,33 +78,33 @@ struct Param
|
||||
union
|
||||
{
|
||||
bool bParam;
|
||||
const stddeque<bool>::fwd * baParam;
|
||||
const std::deque<bool> * baParam;
|
||||
int iParam;
|
||||
const stdvector<int>::fwd * iaParam;
|
||||
const std::vector<int> * iaParam;
|
||||
float fParam;
|
||||
const stdvector<float>::fwd * faParam;
|
||||
const std::vector<float> * faParam;
|
||||
const char * sParam;
|
||||
stdvector<const char *>::fwd *saParam;
|
||||
std::vector<const char *> *saParam;
|
||||
const Unicode::String * uParam;
|
||||
stdvector<const Unicode::String *>::fwd * uaParam;
|
||||
std::vector<const Unicode::String *> * uaParam;
|
||||
const NetworkId * oidParam;
|
||||
const stdvector<NetworkId>::fwd *oidaParam;
|
||||
const stdvector<CachedNetworkId>::fwd *coidaParam;
|
||||
const stdvector<const stdvector<NetworkId>::fwd *>::fwd *oidaaParam;
|
||||
const std::vector<NetworkId> *oidaParam;
|
||||
const std::vector<CachedNetworkId> *coidaParam;
|
||||
const std::vector<const std::vector<NetworkId> *> *oidaaParam;
|
||||
const StringId * sidParam;
|
||||
const stdvector<const StringId *>::fwd *sidaParam;
|
||||
const std::vector<const StringId *> *sidaParam;
|
||||
const AttribMod::AttribMod * amParam;
|
||||
const stdvector<AttribMod::AttribMod>::fwd * amaParam;
|
||||
const std::vector<AttribMod::AttribMod> * amaParam;
|
||||
const ServerObjectTemplate::MentalStateMod * msmParam;
|
||||
const stdvector<ServerObjectTemplate::MentalStateMod>::fwd * amsmParam;
|
||||
const std::vector<ServerObjectTemplate::MentalStateMod> * amsmParam;
|
||||
const MenuDataVector * aomrdParam;
|
||||
const ManufactureObjectInterface * msoParam;
|
||||
const Vector * lParam;
|
||||
const stdvector<const Vector *>::fwd * laParam;
|
||||
const std::vector<const Vector *> * laParam;
|
||||
SlotData isParam;
|
||||
const ValueDictionary * valueDictionaryParam;
|
||||
const stdvector<ValueDictionary>::fwd * valueDictionaryArrayParam;
|
||||
const stdvector<unsigned char>::fwd * byteArrayParam;
|
||||
const std::vector<ValueDictionary> * valueDictionaryArrayParam;
|
||||
const std::vector<unsigned char> * byteArrayParam;
|
||||
|
||||
} m_param;
|
||||
};
|
||||
@@ -115,8 +115,8 @@ namespace Archive
|
||||
class ReadIterator;
|
||||
void get(ReadIterator & source, ScriptParams & target);
|
||||
void put(ByteStream & target, const ScriptParams & source);
|
||||
void get(ReadIterator & source, stdvector<const stdvector<NetworkId>::fwd *>::fwd & target);
|
||||
void put(ByteStream & target, const stdvector<const stdvector<NetworkId>::fwd *>::fwd & source);
|
||||
void get(ReadIterator & source, std::vector<const std::vector<NetworkId> *> & target);
|
||||
void put(ByteStream & target, const std::vector<const std::vector<NetworkId> *> & source);
|
||||
}
|
||||
|
||||
class ScriptParams
|
||||
@@ -132,74 +132,74 @@ public:
|
||||
|
||||
void addParam(const Unicode::unicode_char_t *, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(bool param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stddeque<bool>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::deque<bool> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(int param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<int>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<int> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(float param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<float>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<float> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const char * param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(stdvector<const char *>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(std::vector<const char *> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const Unicode::String & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(stdvector<const Unicode::String *>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(std::vector<const Unicode::String *> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const NetworkId & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<NetworkId>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<CachedNetworkId>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<const stdvector<NetworkId>::fwd *>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<NetworkId> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<CachedNetworkId> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<const std::vector<NetworkId> *> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const StringId & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<const StringId *>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<const StringId *> & param, const std::string & paramName = "", bool owned = false);
|
||||
// void addParam(SlotData param);
|
||||
// void addParam(const std::vector<SlotData> & param);
|
||||
void addParam(const AttribMod::AttribMod & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<AttribMod::AttribMod>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<AttribMod::AttribMod> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const ServerObjectTemplate::MentalStateMod & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<ServerObjectTemplate::MentalStateMod>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<ServerObjectTemplate::MentalStateMod> & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const ManufactureObjectInterface & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const Crafting::IngredientSlot & param, const ManufactureObjectInterface & schematic, int amountRequired, const std::string & appearance, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const Vector &location, const std::string ¶mName = "", bool owned = false);
|
||||
void addParam(const stdvector<const Vector *>::fwd &location, const std::string ¶mName = "", bool owned = false);
|
||||
void addParam(const std::vector<const Vector *> &location, const std::string ¶mName = "", bool owned = false);
|
||||
void addParam(const ValueDictionary & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<ValueDictionary>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<ValueDictionary> & param, const std::string & paramName = "", bool owned = false);
|
||||
|
||||
void addParam(const MenuDataVector & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const stdvector<unsigned char>::fwd & param, const std::string & paramName = "", bool owned = false);
|
||||
void addParam(const std::vector<unsigned char> & param, const std::string & paramName = "", bool owned = false);
|
||||
|
||||
bool changeParam(int index, int param, bool owned = false);
|
||||
bool changeParam(int index, stdvector<int>::fwd & param, bool owned = false);
|
||||
bool changeParam(int index, std::vector<int> & param, bool owned = false);
|
||||
bool changeParam(int index, float param, bool owned = false);
|
||||
bool changeParam(int index, const StringId & param, bool owned = false);
|
||||
bool changeParam(int index, const MenuDataVector & param, bool owned = false);
|
||||
bool changeParam(int index, stdvector<const char *>::fwd & param, bool owned = false);
|
||||
bool changeParam(int index, stdvector<const Unicode::String *>::fwd & param, bool owned = false);
|
||||
bool changeParam(int index, stdvector<unsigned char>::fwd & param, bool owned = false);
|
||||
bool changeParam(int index, std::vector<const char *> & param, bool owned = false);
|
||||
bool changeParam(int index, std::vector<const Unicode::String *> & param, bool owned = false);
|
||||
bool changeParam(int index, std::vector<unsigned char> & param, bool owned = false);
|
||||
|
||||
stdvector<Param>::fwd & getParams();
|
||||
const stdvector<Param>::fwd & getParams() const;
|
||||
std::vector<Param> & getParams();
|
||||
const std::vector<Param> & getParams() const;
|
||||
int getParamCount(void) const;
|
||||
Param::ParamType getParamType(int index) const;
|
||||
const std::string & getParamName(int index) const;
|
||||
bool getBoolParam(int index) const;
|
||||
const stddeque<bool>::fwd & getBoolArrayParam(int index) const;
|
||||
const std::deque<bool> & getBoolArrayParam(int index) const;
|
||||
int getIntParam(int index) const;
|
||||
const stdvector<int>::fwd & getIntArrayParam(int index) const;
|
||||
const std::vector<int> & getIntArrayParam(int index) const;
|
||||
float getFloatParam(int index) const;
|
||||
const stdvector<float>::fwd & getFloatArrayParam(int index) const;
|
||||
const std::vector<float> & getFloatArrayParam(int index) const;
|
||||
const char * getStringParam(int index) const;
|
||||
const stdvector<const char *>::fwd & getStringArrayParam(int index) const;
|
||||
const std::vector<const char *> & getStringArrayParam(int index) const;
|
||||
const Unicode::String & getUnicodeParam(int index) const;
|
||||
const stdvector<const Unicode::String *>::fwd & getUnicodeArrayParam(int index) const;
|
||||
const std::vector<const Unicode::String *> & getUnicodeArrayParam(int index) const;
|
||||
const NetworkId & getObjIdParam(int index) const;
|
||||
const stdvector<NetworkId>::fwd & getObjIdArrayParam(int index) const;
|
||||
const stdvector<CachedNetworkId>::fwd & getCachedObjIdArrayParam(int index) const;
|
||||
const stdvector<const stdvector<NetworkId>::fwd *>::fwd & getObjIdArrayArrayParam(int index) const;
|
||||
const std::vector<NetworkId> & getObjIdArrayParam(int index) const;
|
||||
const std::vector<CachedNetworkId> & getCachedObjIdArrayParam(int index) const;
|
||||
const std::vector<const std::vector<NetworkId> *> & getObjIdArrayArrayParam(int index) const;
|
||||
const Vector & getLocationParam(int index) const;
|
||||
const stdvector<const Vector *>::fwd & getLocationArrayParam(int index) const;
|
||||
const std::vector<const Vector *> & getLocationArrayParam(int index) const;
|
||||
const StringId & getStringIdParam(int index) const;
|
||||
const stdvector<const StringId *>::fwd & getStringIdArrayParam(int index) const;
|
||||
const std::vector<const StringId *> & getStringIdArrayParam(int index) const;
|
||||
const AttribMod::AttribMod & getAttribModParam(int index) const;
|
||||
const stdvector<unsigned char>::fwd & getByteArrayParam(int index) const;
|
||||
const stdvector<AttribMod::AttribMod>::fwd & getAttribModArrayParam(int index) const;
|
||||
const std::vector<unsigned char> & getByteArrayParam(int index) const;
|
||||
const std::vector<AttribMod::AttribMod> & getAttribModArrayParam(int index) const;
|
||||
const ServerObjectTemplate::MentalStateMod & getMentalStateModParam(int index) const;
|
||||
const stdvector<ServerObjectTemplate::MentalStateMod>::fwd & getMentalStateModArrayParam(int index) const;
|
||||
const std::vector<ServerObjectTemplate::MentalStateMod> & getMentalStateModArrayParam(int index) const;
|
||||
const MenuDataVector & getObjectMenuRequestDataArrayParam(int index) const;
|
||||
const ManufactureObjectInterface & getManufactureSchematicParam(int index) const;
|
||||
const Crafting::IngredientSlot & getIngredientSlotParam(int index) const;
|
||||
@@ -207,14 +207,14 @@ public:
|
||||
int getIngredientSlotParamAmountRequired(int index) const;
|
||||
const std::string & getIngredientSlotParamAppearance(int index) const;
|
||||
const ValueDictionary & getValueDictionaryParam(int index) const;
|
||||
const stdvector<ValueDictionary>::fwd & getValueDictionaryArrayParam(int index) const;
|
||||
const std::vector<ValueDictionary> & getValueDictionaryArrayParam(int index) const;
|
||||
|
||||
protected:
|
||||
friend void Archive::get(Archive::ReadIterator & source, ScriptParams & target);
|
||||
|
||||
private:
|
||||
|
||||
stdvector<Param>::fwd m_params;
|
||||
std::vector<Param> m_params;
|
||||
};
|
||||
|
||||
|
||||
@@ -224,12 +224,12 @@ inline void ScriptParams::clear(void)
|
||||
m_params.clear();
|
||||
} // ScriptParams::clear
|
||||
|
||||
inline stdvector<Param>::fwd & ScriptParams::getParams()
|
||||
inline std::vector<Param> & ScriptParams::getParams()
|
||||
{
|
||||
return m_params;
|
||||
}
|
||||
|
||||
inline const stdvector<Param>::fwd & ScriptParams::getParams() const
|
||||
inline const std::vector<Param> & ScriptParams::getParams() const
|
||||
{
|
||||
return m_params;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ inline bool ScriptParams::getBoolParam(int index) const
|
||||
return m_params[index].m_param.bParam;
|
||||
} // ScriptParams::getBoolParam
|
||||
|
||||
inline const stddeque<bool>::fwd & ScriptParams::getBoolArrayParam(int index) const
|
||||
inline const std::deque<bool> & ScriptParams::getBoolArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.baParam;
|
||||
} // ScriptParams::getBoolArrayParam
|
||||
@@ -264,7 +264,7 @@ inline int ScriptParams::getIntParam(int index) const
|
||||
return m_params[index].m_param.iParam;
|
||||
} // ScriptParams::getIntParam
|
||||
|
||||
inline const stdvector<int>::fwd & ScriptParams::getIntArrayParam(int index) const
|
||||
inline const std::vector<int> & ScriptParams::getIntArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.iaParam;
|
||||
} // ScriptParams::getIntArrayParam
|
||||
@@ -274,7 +274,7 @@ inline float ScriptParams::getFloatParam(int index) const
|
||||
return m_params[index].m_param.fParam;
|
||||
} // ScriptParams::getFloatParam
|
||||
|
||||
inline const stdvector<float>::fwd & ScriptParams::getFloatArrayParam(int index) const
|
||||
inline const std::vector<float> & ScriptParams::getFloatArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.faParam;
|
||||
} // ScriptParams::getFloatArrayParam
|
||||
@@ -284,7 +284,7 @@ inline const char * ScriptParams::getStringParam(int index) const
|
||||
return m_params[index].m_param.sParam;
|
||||
} // ScriptParams::getStringParam
|
||||
|
||||
inline const stdvector<const char *>::fwd & ScriptParams::getStringArrayParam(int index) const
|
||||
inline const std::vector<const char *> & ScriptParams::getStringArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.saParam;
|
||||
} // ScriptParams::getStringArrayParam
|
||||
@@ -294,7 +294,7 @@ inline const Unicode::String & ScriptParams::getUnicodeParam(int index) const
|
||||
return *m_params[index].m_param.uParam;
|
||||
} // ScriptParams::getUnicodeParam
|
||||
|
||||
inline const stdvector<const Unicode::String *>::fwd & ScriptParams::getUnicodeArrayParam(int index) const
|
||||
inline const std::vector<const Unicode::String *> & ScriptParams::getUnicodeArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.uaParam;
|
||||
} // ScriptParams::getUnicodeArrayParam
|
||||
@@ -304,7 +304,7 @@ inline const Vector &ScriptParams::getLocationParam(int index) const
|
||||
return *m_params[index].m_param.lParam;
|
||||
} // ScriptParams::getIntParam
|
||||
|
||||
inline const stdvector<const Vector *>::fwd & ScriptParams::getLocationArrayParam(int index) const
|
||||
inline const std::vector<const Vector *> & ScriptParams::getLocationArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.laParam;
|
||||
} // ScriptParams::getIntArrayParam
|
||||
@@ -316,17 +316,17 @@ inline const NetworkId & ScriptParams::getObjIdParam(int index) const
|
||||
return NetworkId::cms_invalid;
|
||||
} // ScriptParams::getObjIdParam
|
||||
|
||||
inline const stdvector<NetworkId>::fwd & ScriptParams::getObjIdArrayParam(int index) const
|
||||
inline const std::vector<NetworkId> & ScriptParams::getObjIdArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.oidaParam;
|
||||
} // ScriptParams::getObjIdArrayParam
|
||||
|
||||
inline const stdvector<CachedNetworkId>::fwd & ScriptParams::getCachedObjIdArrayParam(int index) const
|
||||
inline const std::vector<CachedNetworkId> & ScriptParams::getCachedObjIdArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.coidaParam;
|
||||
} // ScriptParams::getCachedObjIdArrayParam
|
||||
|
||||
inline const stdvector<const stdvector<NetworkId>::fwd *>::fwd & ScriptParams::getObjIdArrayArrayParam(int index) const
|
||||
inline const std::vector<const std::vector<NetworkId> *> & ScriptParams::getObjIdArrayArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.oidaaParam;
|
||||
}
|
||||
@@ -336,7 +336,7 @@ inline const StringId & ScriptParams::getStringIdParam(int index) const
|
||||
return *m_params[index].m_param.sidParam;
|
||||
} // ScriptParams::getStringIdParam
|
||||
|
||||
inline const stdvector<const StringId *>::fwd & ScriptParams::getStringIdArrayParam(int index) const
|
||||
inline const std::vector<const StringId *> & ScriptParams::getStringIdArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.sidaParam;
|
||||
} // ScriptParams::getStringIdArrayParam
|
||||
@@ -346,7 +346,7 @@ inline const AttribMod::AttribMod & ScriptParams::getAttribModParam(int index) c
|
||||
return *m_params[index].m_param.amParam;
|
||||
} // ScriptParams::getAttribModParam
|
||||
|
||||
inline const stdvector<AttribMod::AttribMod>::fwd & ScriptParams::getAttribModArrayParam(int index) const
|
||||
inline const std::vector<AttribMod::AttribMod> & ScriptParams::getAttribModArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.amaParam;
|
||||
} // ScriptParams::getAttribModArrayParam
|
||||
@@ -356,7 +356,7 @@ inline const ServerObjectTemplate::MentalStateMod & ScriptParams::getMentalState
|
||||
return *m_params[index].m_param.msmParam;
|
||||
} // ScriptParams::getMentalStateModParam
|
||||
|
||||
inline const stdvector<ServerObjectTemplate::MentalStateMod>::fwd & ScriptParams::getMentalStateModArrayParam(int index) const
|
||||
inline const std::vector<ServerObjectTemplate::MentalStateMod> & ScriptParams::getMentalStateModArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.amsmParam;
|
||||
} // ScriptParams::getMentalStateModArrayParam
|
||||
@@ -396,12 +396,12 @@ inline const ValueDictionary & ScriptParams::getValueDictionaryParam(int index)
|
||||
return *m_params[index].m_param.valueDictionaryParam;
|
||||
}
|
||||
|
||||
inline const stdvector<ValueDictionary>::fwd & ScriptParams::getValueDictionaryArrayParam(int index) const
|
||||
inline const std::vector<ValueDictionary> & ScriptParams::getValueDictionaryArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.valueDictionaryArrayParam;
|
||||
}
|
||||
|
||||
inline const stdvector<unsigned char>::fwd & ScriptParams::getByteArrayParam(int index) const
|
||||
inline const std::vector<unsigned char> & ScriptParams::getByteArrayParam(int index) const
|
||||
{
|
||||
return *m_params[index].m_param.byteArrayParam;
|
||||
} // ScriptParams::getIntArrayParam
|
||||
|
||||
Reference in New Issue
Block a user