From a63877337eea5e33e470e629ed604dda4289796e Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 17 Jan 2022 03:31:45 -0500 Subject: [PATCH] Refactored DbBindableLong to be more appropriately named DbBindableInt32 --- .../src/shared/TaskChangeStationId.h | 4 +- .../src/shared/TaskClaimRewards.cpp | 26 +- .../src/shared/TaskCreateCharacter.h | 8 +- .../src/shared/TaskDeleteCharacter.h | 4 +- .../src/shared/TaskEnableCharacter.h | 4 +- .../src/shared/TaskGetAccountForPurge.cpp | 6 +- .../src/shared/TaskGetAvatarList.h | 10 +- .../src/shared/TaskGetClusterList.h | 14 +- .../src/shared/TaskGetValidationData.cpp | 22 +- .../LoginServer/src/shared/TaskMapAccount.h | 4 +- .../src/shared/TaskRegisterNewCluster.h | 2 +- .../src/shared/TaskRenameCharacter.h | 2 +- .../src/shared/TaskRestoreCharacter.h | 10 +- .../src/shared/TaskSetPurgeStatus.cpp | 4 +- .../src/shared/TaskToggleCharacterDisable.h | 4 +- .../src/shared/TaskToggleCompletedTutorial.h | 2 +- .../src/shared/TaskUpgradeAccount.h | 24 +- .../shared/TaskUpdateSPCharacterProfileData.h | 8 +- engine/server/library/codegen/make_queries.pl | 2 +- .../server/library/codegen/make_schema_h.pl | 10 +- .../src/shared/CharacterLocator.h | 2 +- .../src/shared/CharacterNameLocator.h | 6 +- .../src/shared/CharacterQueries.h | 6 +- .../shared/DeleteCharacterCustomPersistStep.h | 6 +- .../src/shared/FixLoadWithCustomPersistStep.h | 4 +- .../serverDatabase/src/shared/GetChunkQuery.h | 6 +- .../src/shared/GetGoldVersionNumberQuery.h | 4 +- .../src/shared/GetObjectIdsQuery.h | 2 +- .../src/shared/GetTimestampQuery.h | 2 +- .../src/shared/GetVersionNumberQuery.h | 4 +- .../src/shared/LazyDeleteQuery.h | 4 +- .../shared/MoveToPlayerCustomPersistStep.h | 4 +- .../src/shared/PreloadListQuery.h | 10 +- .../src/shared/SaveTimestampQuery.h | 2 +- .../serverDatabase/src/shared/ScriptQueries.h | 2 +- .../src/shared/StructureQueries.h | 2 +- .../serverDatabase/src/shared/TaskCSTasks.h | 8 +- .../src/shared/TaskChangeStationId.h | 4 +- .../src/shared/TaskCheckCharacterName.h | 2 +- .../src/shared/TaskGetStructuresForPurge.cpp | 4 +- .../src/shared/WorldContainerLocator.h | 4 +- .../sharedDatabaseInterface/DbBindableInt32.h | 1 + .../sharedDatabaseInterface/DbBindableLong.h | 1 - .../src/CMakeLists.txt | 4 +- .../src/shared/core/Bindable.h | 2 +- ...DbBindableLong.cpp => DbBindableInt32.cpp} | 18 +- .../{DbBindableLong.h => DbBindableInt32.h} | 50 +- .../src/shared/core/DbQuery.cpp | 4 +- .../src/shared/core/DbQuery.h | 6 +- .../src/shared/core/DbQueryImplementation.h | 6 +- .../src/shared/queue/DbTestQuery.h | 2 +- .../src_oci/OciQueryImplementation.cpp | 4 +- .../src_oci/OciQueryImplementation.h | 4 +- .../shared/cleanup/TaskBrokenObjectCleanup.h | 2 +- .../cleanup/TaskMarketAttributesCleanup.h | 2 +- .../src/shared/cleanup/TaskMessagesCleanup.h | 2 +- .../shared/cleanup/TaskObjvarNameCleanup.h | 2 +- .../cleanup/TaskOrphanedObjectCleanup.h | 2 +- .../shared/cleanup/TaskVendorObjectCleanup.h | 2 +- .../src/shared/core/SwgSnapshot.cpp | 4 +- .../src/shared/core/SwgSnapshot.h | 4 +- .../shared/generated/ObjectQueries_h.template | 48 +- .../src/shared/generated/Schema_h.template | 586 +++++++++--------- .../shared/queries/BountyHunterTargetQuery.h | 2 +- .../src/shared/queries/CommoditiesQuery.h | 8 +- .../src/shared/queries/CommoditiesSchema.h | 34 +- .../DeleteDemandLoadedContainerQuery.h | 2 +- .../src/shared/queries/LocationQuery.h | 10 +- .../ManufactureSchematicAttributeQuery.h | 2 +- .../src/shared/queries/MessageQuery.h | 12 +- .../shared/queries/ObjectVariableQueries.h | 4 +- .../src/shared/queries/ObjectsTableQuery.h | 2 +- .../queries/OfflineMoneyCustomPersistStep.cpp | 2 +- .../src/shared/queries/PropertyListQuery.h | 10 +- .../src/shared/queries/ResourceTypeQuery.h | 2 +- .../src/shared/queries/SkillQuery.h | 4 +- .../src/shared/tasks/TaskGetAuctionList.h | 16 +- .../src/shared/tasks/TaskGetBidList.h | 4 +- .../src/shared/tasks/TaskGetLocationList.h | 12 +- .../src/shared/tasks/TaskLoadObjvarNames.h | 2 +- .../src/shared/tasks/TaskLocateStructure.h | 6 +- .../src/shared/tasks/TaskMoveToPlayer.h | 2 +- .../src/shared/tasks/TaskRestoreCharacter.h | 6 +- .../src/shared/tasks/TaskRestoreHouse.h | 2 +- .../src/shared/tasks/TaskSaveObjvarNames.h | 2 +- .../src/shared/tasks/TaskUndeleteItem.h | 2 +- .../src/shared/tasks/TaskVerifyCharacter.h | 4 +- 87 files changed, 574 insertions(+), 592 deletions(-) create mode 100755 engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableInt32.h delete mode 100755 engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableLong.h rename engine/shared/library/sharedDatabaseInterface/src/shared/core/{DbBindableLong.cpp => DbBindableInt32.cpp} (71%) rename engine/shared/library/sharedDatabaseInterface/src/shared/core/{DbBindableLong.h => DbBindableInt32.h} (61%) diff --git a/engine/server/application/LoginServer/src/shared/TaskChangeStationId.h b/engine/server/application/LoginServer/src/shared/TaskChangeStationId.h index 6ed1dad4..6a303000 100755 --- a/engine/server/application/LoginServer/src/shared/TaskChangeStationId.h +++ b/engine/server/application/LoginServer/src/shared/TaskChangeStationId.h @@ -36,8 +36,8 @@ class TaskChangeStationId : public DB::TaskRequest public: ChangeStationIdQuery(); - DB::BindableLong destination_station_id; //lint !e1925 // public data member - DB::BindableLong source_station_id; //lint !e1925 // public data member + DB::BindableInt32 destination_station_id; //lint !e1925 // public data member + DB::BindableInt32 source_station_id; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); diff --git a/engine/server/application/LoginServer/src/shared/TaskClaimRewards.cpp b/engine/server/application/LoginServer/src/shared/TaskClaimRewards.cpp index ef741b01..195ac266 100755 --- a/engine/server/application/LoginServer/src/shared/TaskClaimRewards.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskClaimRewards.cpp @@ -33,11 +33,11 @@ namespace TaskClaimRewardsNamespace bool getResult() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId character_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; DB::BindableString<255> event_id; - DB::BindableLong result; + DB::BindableInt32 result; private: //disable ConsumeEventQuery(); @@ -58,11 +58,11 @@ namespace TaskClaimRewardsNamespace bool getResult() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId character_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; DB::BindableString<255> item_id; - DB::BindableLong result; + DB::BindableInt32 result; private: //disable ClaimItemQuery(); @@ -83,12 +83,12 @@ namespace TaskClaimRewardsNamespace bool getResult() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId character_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; DB::BindableString<255> item_id; - DB::BindableLong count_adjustment; - DB::BindableLong result; + DB::BindableInt32 count_adjustment; + DB::BindableInt32 result; private: //disable UpdateFeatureIdTransactionQuery(); @@ -102,7 +102,7 @@ namespace TaskClaimRewardsNamespace GetFeatureIdTransactionsQuery(StationId stationId, NetworkId const & characterId, uint32 clusterId); DB::BindableString<255> item_id; - DB::BindableLong count; + DB::BindableInt32 count; virtual void getSQL(std::string &sql); virtual bool bindParameters(); @@ -110,9 +110,9 @@ namespace TaskClaimRewardsNamespace virtual QueryMode getExecutionMode() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId character_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; private: //disable GetFeatureIdTransactionsQuery(const GetFeatureIdTransactionsQuery&); diff --git a/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h b/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h index 3c53e296..3004bc6d 100755 --- a/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h +++ b/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h @@ -33,12 +33,12 @@ class TaskCreateCharacter : public DB::TaskRequest public: CreateCharacterQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member DB::BindableString<127> character_name; //lint !e1925 // public data member DB::BindableNetworkId character_id; //lint !e1925 // public data member - DB::BindableLong template_id; //lint !e1925 // public data member - DB::BindableLong character_type; //lint !e1925 // public data member + DB::BindableInt32 template_id; //lint !e1925 // public data member + DB::BindableInt32 character_type; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); diff --git a/engine/server/application/LoginServer/src/shared/TaskDeleteCharacter.h b/engine/server/application/LoginServer/src/shared/TaskDeleteCharacter.h index 5b3130a4..a8e391f0 100755 --- a/engine/server/application/LoginServer/src/shared/TaskDeleteCharacter.h +++ b/engine/server/application/LoginServer/src/shared/TaskDeleteCharacter.h @@ -35,9 +35,9 @@ class TaskDeleteCharacter : public DB::TaskRequest public: DeleteCharacterQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member DB::BindableNetworkId character_id; //lint !e1925 // public data member - DB::BindableLong station_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member virtual void getSQL(std::string &sql); virtual bool bindParameters(); diff --git a/engine/server/application/LoginServer/src/shared/TaskEnableCharacter.h b/engine/server/application/LoginServer/src/shared/TaskEnableCharacter.h index 32125532..a5ad5f45 100755 --- a/engine/server/application/LoginServer/src/shared/TaskEnableCharacter.h +++ b/engine/server/application/LoginServer/src/shared/TaskEnableCharacter.h @@ -35,10 +35,10 @@ class TaskEnableCharacter : public DB::TaskRequest public: EnableCharacterQuery(); - DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class + DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class DB::BindableNetworkId character_id; //lint !e1925 // public data member : suppressed because this is a private inner class DB::BindableBool enabled; //lint !e1925 // public data member : suppressed because this is a private inner class - DB::BindableLong result; //lint !e1925 // public data member : suppressed because this is a private inner class + DB::BindableInt32 result; //lint !e1925 // public data member : suppressed because this is a private inner class virtual void getSQL(std::string &sql); diff --git a/engine/server/application/LoginServer/src/shared/TaskGetAccountForPurge.cpp b/engine/server/application/LoginServer/src/shared/TaskGetAccountForPurge.cpp index 061b1c4d..62251e03 100755 --- a/engine/server/application/LoginServer/src/shared/TaskGetAccountForPurge.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskGetAccountForPurge.cpp @@ -32,9 +32,9 @@ namespace TaskGetAccountForPurgeNamespace StationId getAccount() const; private: - DB::BindableLong m_account; - DB::BindableLong m_min_age; - DB::BindableLong m_purge_phase; + DB::BindableInt32 m_account; + DB::BindableInt32 m_min_age; + DB::BindableInt32 m_purge_phase; private: //disable GetAccountForPurgeQuery(const GetAccountForPurgeQuery&); diff --git a/engine/server/application/LoginServer/src/shared/TaskGetAvatarList.h b/engine/server/application/LoginServer/src/shared/TaskGetAvatarList.h index 1c7c6cb1..c76ed5f3 100755 --- a/engine/server/application/LoginServer/src/shared/TaskGetAvatarList.h +++ b/engine/server/application/LoginServer/src/shared/TaskGetAvatarList.h @@ -37,13 +37,13 @@ class TaskGetAvatarList : public DB::TaskRequest class GetCharactersQuery : public DB::Query { public: - DB::BindableLong station_id; //lint !e1925 // public data member - DB::BindableLong cluster_group_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_group_id; //lint !e1925 // public data member DB::BindableString<128> character_name; //lint !e1925 // public data member - DB::BindableLong object_template_id; //lint !e1925 // public data member + DB::BindableInt32 object_template_id; //lint !e1925 // public data member DB::BindableNetworkId object_id; //lint !e1925 // public data member - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong character_type; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 character_type; //lint !e1925 // public data member GetCharactersQuery(); diff --git a/engine/server/application/LoginServer/src/shared/TaskGetClusterList.h b/engine/server/application/LoginServer/src/shared/TaskGetClusterList.h index 534c95f1..0c78ded8 100755 --- a/engine/server/application/LoginServer/src/shared/TaskGetClusterList.h +++ b/engine/server/application/LoginServer/src/shared/TaskGetClusterList.h @@ -31,20 +31,20 @@ class TaskGetClusterList : public DB::TaskRequest class GetClustersQuery : public DB::Query { public: - DB::BindableLong group_id; //lint !e1925 // public data member + DB::BindableInt32 group_id; //lint !e1925 // public data member - DB::BindableLong cluster_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member DB::BindableString<255> cluster_name; //lint !e1925 // public data member DB::BindableString<255> address; //lint !e1925 // public data member - DB::BindableLong port; //lint !e1925 // public data member + DB::BindableInt32 port; //lint !e1925 // public data member DB::BindableBool secret; //lint !e1925 // public data member DB::BindableBool locked; //lint !e1925 // public data member DB::BindableBool not_recommended; //lint !e1925 // public data member - DB::BindableLong maxCharacterPerAccount; //lint !e1925 // public data member - DB::BindableLong online_player_limit; //lint !e1925 // public data member - DB::BindableLong online_free_trial_limit; //lint !e1925 // public data member + DB::BindableInt32 maxCharacterPerAccount; //lint !e1925 // public data member + DB::BindableInt32 online_player_limit; //lint !e1925 // public data member + DB::BindableInt32 online_free_trial_limit; //lint !e1925 // public data member DB::BindableBool free_trial_can_create_char; //lint !e1925 // public data member - DB::BindableLong online_tutorial_limit; //lint !e1925 // public data member + DB::BindableInt32 online_tutorial_limit; //lint !e1925 // public data member GetClustersQuery(); diff --git a/engine/server/application/LoginServer/src/shared/TaskGetValidationData.cpp b/engine/server/application/LoginServer/src/shared/TaskGetValidationData.cpp index 735e9e7a..82e227ed 100755 --- a/engine/server/application/LoginServer/src/shared/TaskGetValidationData.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskGetValidationData.cpp @@ -26,10 +26,10 @@ namespace TaskGetValidationDataNamespace public: GetValidationDataQuery(); - DB::BindableLong station_id; //lint !e1925 // public data member - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong character_type_id; //lint !e1925 // public data member - DB::BindableLong num_open_slots; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 character_type_id; //lint !e1925 // public data member + DB::BindableInt32 num_open_slots; //lint !e1925 // public data member virtual void getSQL(std::string &sql); virtual bool bindParameters(); @@ -46,7 +46,7 @@ namespace TaskGetValidationDataNamespace public: GetCompletedTutorialQuery(StationId stationId); - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableBool completed_tutorial; virtual void getSQL(std::string &sql); @@ -74,9 +74,9 @@ namespace TaskGetValidationDataNamespace NetworkId const getCharacterId() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableString<100> event_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; DB::BindableNetworkId character_id; private: //disable @@ -100,9 +100,9 @@ namespace TaskGetValidationDataNamespace NetworkId const getCharacterId() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableString<100> item_id; - DB::BindableLong cluster_id; + DB::BindableInt32 cluster_id; DB::BindableNetworkId character_id; private: //disable @@ -116,8 +116,8 @@ namespace TaskGetValidationDataNamespace public: IsClusterAtLimitQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong result; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 result; //lint !e1925 // public data member virtual void getSQL(std::string &sql); virtual bool bindParameters(); diff --git a/engine/server/application/LoginServer/src/shared/TaskMapAccount.h b/engine/server/application/LoginServer/src/shared/TaskMapAccount.h index ad7f04e1..70e34c5b 100644 --- a/engine/server/application/LoginServer/src/shared/TaskMapAccount.h +++ b/engine/server/application/LoginServer/src/shared/TaskMapAccount.h @@ -34,8 +34,8 @@ class TaskMapAccount : public DB::TaskRequest public: MapAccountQuery(); - DB::BindableLong parentID; //lint !e1925 // public data member - DB::BindableLong childID; //lint !e1925 // public data member + DB::BindableInt32 parentID; //lint !e1925 // public data member + DB::BindableInt32 childID; //lint !e1925 // public data member virtual void getSQL(std::string &sql); virtual bool bindParameters(); diff --git a/engine/server/application/LoginServer/src/shared/TaskRegisterNewCluster.h b/engine/server/application/LoginServer/src/shared/TaskRegisterNewCluster.h index e756e2d9..d2f616ff 100755 --- a/engine/server/application/LoginServer/src/shared/TaskRegisterNewCluster.h +++ b/engine/server/application/LoginServer/src/shared/TaskRegisterNewCluster.h @@ -34,7 +34,7 @@ class TaskRegisterNewCluster : public DB::TaskRequest public: RegisterClusterQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member DB::BindableString<255> cluster_name; //lint !e1925 // public data member DB::BindableString<255> address; //lint !e1925 // public data member diff --git a/engine/server/application/LoginServer/src/shared/TaskRenameCharacter.h b/engine/server/application/LoginServer/src/shared/TaskRenameCharacter.h index 525cc3ac..20ba975b 100755 --- a/engine/server/application/LoginServer/src/shared/TaskRenameCharacter.h +++ b/engine/server/application/LoginServer/src/shared/TaskRenameCharacter.h @@ -35,7 +35,7 @@ class TaskRenameCharacter : public DB::TaskRequest public: RenameCharacterQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member DB::BindableNetworkId character_id; //lint !e1925 // public data member DB::BindableString<127> new_name; //lint !e1925 // public data member diff --git a/engine/server/application/LoginServer/src/shared/TaskRestoreCharacter.h b/engine/server/application/LoginServer/src/shared/TaskRestoreCharacter.h index d30d6abd..2867bd3b 100755 --- a/engine/server/application/LoginServer/src/shared/TaskRestoreCharacter.h +++ b/engine/server/application/LoginServer/src/shared/TaskRestoreCharacter.h @@ -33,13 +33,13 @@ class TaskRestoreCharacter : public DB::TaskRequest public: RestoreCharacterQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member DB::BindableString<127> character_name; //lint !e1925 // public data member DB::BindableNetworkId character_id; //lint !e1925 // public data member - DB::BindableLong template_id; //lint !e1925 // public data member - DB::BindableLong character_type; //lint !e1925 // public data member - DB::BindableLong result; //lint !e1925 // public data member + DB::BindableInt32 template_id; //lint !e1925 // public data member + DB::BindableInt32 character_type; //lint !e1925 // public data member + DB::BindableInt32 result; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); diff --git a/engine/server/application/LoginServer/src/shared/TaskSetPurgeStatus.cpp b/engine/server/application/LoginServer/src/shared/TaskSetPurgeStatus.cpp index 3f20de28..4ee5e65e 100755 --- a/engine/server/application/LoginServer/src/shared/TaskSetPurgeStatus.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskSetPurgeStatus.cpp @@ -29,8 +29,8 @@ namespace TaskSetPurgeStatusNamespace virtual QueryMode getExecutionMode() const; private: - DB::BindableLong m_account; - DB::BindableLong m_purge_phase; + DB::BindableInt32 m_account; + DB::BindableInt32 m_purge_phase; private: //disable SetPurgeStatusQuery(const SetPurgeStatusQuery&); diff --git a/engine/server/application/LoginServer/src/shared/TaskToggleCharacterDisable.h b/engine/server/application/LoginServer/src/shared/TaskToggleCharacterDisable.h index 32d21cb1..118bc4fd 100755 --- a/engine/server/application/LoginServer/src/shared/TaskToggleCharacterDisable.h +++ b/engine/server/application/LoginServer/src/shared/TaskToggleCharacterDisable.h @@ -35,9 +35,9 @@ class TaskToggleCharacterDisable : public DB::TaskRequest public: ToggleCharacterDisableQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member : suppressed because this is a private inner class + DB::BindableInt32 cluster_id; //lint !e1925 // public data member : suppressed because this is a private inner class DB::BindableNetworkId character_id; //lint !e1925 // public data member : suppressed because this is a private inner class - DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class + DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class DB::BindableBool enabled_flag; //lint !e1925 // public data member : suppressed because this is a private inner class diff --git a/engine/server/application/LoginServer/src/shared/TaskToggleCompletedTutorial.h b/engine/server/application/LoginServer/src/shared/TaskToggleCompletedTutorial.h index 1e1def17..8c152a11 100755 --- a/engine/server/application/LoginServer/src/shared/TaskToggleCompletedTutorial.h +++ b/engine/server/application/LoginServer/src/shared/TaskToggleCompletedTutorial.h @@ -34,7 +34,7 @@ class TaskToggleCompletedTutorial : public DB::TaskRequest public: ToggleCompletedTutorialQuery(); - DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class + DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class DB::BindableBool completed_flag; //lint !e1925 // public data member : suppressed because this is a private inner class virtual void getSQL(std::string &sql); diff --git a/engine/server/application/LoginServer/src/shared/TaskUpgradeAccount.h b/engine/server/application/LoginServer/src/shared/TaskUpgradeAccount.h index 325014ff..97b56c1e 100755 --- a/engine/server/application/LoginServer/src/shared/TaskUpgradeAccount.h +++ b/engine/server/application/LoginServer/src/shared/TaskUpgradeAccount.h @@ -36,10 +36,10 @@ class TaskUpgradeAccount : public DB::TaskRequest public: SetCharacterTypeQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member DB::BindableNetworkId character; //lint !e1925 // public data member - DB::BindableLong character_type; //lint !e1925 // public data member + DB::BindableInt32 character_type; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); @@ -56,9 +56,9 @@ class TaskUpgradeAccount : public DB::TaskRequest public: QueryJediQuery(); - DB::BindableLong station_id; //lint !e1925 // public data member - DB::BindableLong character_type; //lint !e1925 // public data member - DB::BindableLong result; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member + DB::BindableInt32 character_type; //lint !e1925 // public data member + DB::BindableInt32 result; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); @@ -76,8 +76,8 @@ class TaskUpgradeAccount : public DB::TaskRequest public: AddJediQuery(); - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); @@ -140,10 +140,10 @@ public: public: GetOnlyOpenCharacterSlotsQuery(); - DB::BindableLong station_id; //lint !e1925 // public data member - DB::BindableLong cluster_id; //lint !e1925 // public data member - DB::BindableLong character_type_id; //lint !e1925 // public data member - DB::BindableLong num_open_slots; //lint !e1925 // public data member + DB::BindableInt32 station_id; //lint !e1925 // public data member + DB::BindableInt32 cluster_id; //lint !e1925 // public data member + DB::BindableInt32 character_type_id; //lint !e1925 // public data member + DB::BindableInt32 num_open_slots; //lint !e1925 // public data member virtual void getSQL(std::string &sql); virtual bool bindParameters(); diff --git a/engine/server/application/StationPlayersCollector/src/shared/TaskUpdateSPCharacterProfileData.h b/engine/server/application/StationPlayersCollector/src/shared/TaskUpdateSPCharacterProfileData.h index 712b95bd..3a5cb54d 100755 --- a/engine/server/application/StationPlayersCollector/src/shared/TaskUpdateSPCharacterProfileData.h +++ b/engine/server/application/StationPlayersCollector/src/shared/TaskUpdateSPCharacterProfileData.h @@ -44,11 +44,11 @@ class TaskUpdateSPCharacterProfileData : public DB::TaskRequest DB::BindableDouble cash_balance; DB::BindableDouble bank_balance; DB::BindableString<500> objectTemplateName; - DB::BindableLong stationId; + DB::BindableInt32 stationId; DB::BindableNetworkId containedBy; - DB::BindableLong createTime; - DB::BindableLong playedTime; - DB::BindableLong numLots; + DB::BindableInt32 createTime; + DB::BindableInt32 playedTime; + DB::BindableInt32 numLots; virtual void getSQL (std::string &sql); virtual bool bindParameters (); diff --git a/engine/server/library/codegen/make_queries.pl b/engine/server/library/codegen/make_queries.pl index 7858d1c2..01c72158 100755 --- a/engine/server/library/codegen/make_queries.pl +++ b/engine/server/library/codegen/make_queries.pl @@ -126,7 +126,7 @@ sub writeHeader $i++; } - $newText.="\tDB::BindableLong\t\t\t m_numItems;\n"; + $newText.="\tDB::BindableInt32\t\t\t m_numItems;\n"; $newText.="};\n"; $newText.="\n"; diff --git a/engine/server/library/codegen/make_schema_h.pl b/engine/server/library/codegen/make_schema_h.pl index d79e1a5a..89b5f384 100755 --- a/engine/server/library/codegen/make_schema_h.pl +++ b/engine/server/library/codegen/make_schema_h.pl @@ -128,7 +128,7 @@ sub parseTable } if ($tablename eq "Object") { - $decl{$tablename}.="\n\tDB::BindableLong container_level;\n"; + $decl{$tablename}.="\n\tDB::BindableInt32 container_level;\n"; } $decl{$tablename}.="\n\tvirtual void copy(const DB::Row &rhs)\n"; @@ -205,8 +205,8 @@ sub translateType my($dbtype)=@_; SWITCH: { - if ($dbtype eq "int") { $ctype="DB::BindableLong"; last SWITCH; } - if ($dbtype eq "number") { $ctype="DB::BindableLong"; last SWITCH; } + if ($dbtype eq "int") { $ctype="DB::BindableInt32"; last SWITCH; } + if ($dbtype eq "number") { $ctype="DB::BindableInt32"; last SWITCH; } if ($dbtype eq "float") { $ctype="DB::BindableDouble"; last SWITCH; } if ($dbtype eq "date") { $ctype="DB::BindableTimestamp"; last SWITCH; } if ($dbtype eq "char(1)") { $ctype="DB::BindableBool"; last SWITCH; } @@ -224,8 +224,8 @@ sub translateBufferType my($dbtype)=@_; SWITCH: { - if ($dbtype eq "int") { $ctype="DB::BindableLong"; last SWITCH; } - if ($dbtype eq "number") { $ctype="DB::BindableLong"; last SWITCH; } + if ($dbtype eq "int") { $ctype="DB::BindableInt32"; last SWITCH; } + if ($dbtype eq "number") { $ctype="DB::BindableInt32"; last SWITCH; } if ($dbtype eq "float") { $ctype="DB::BindableDouble"; last SWITCH; } if ($dbtype eq "date") { $ctype="DB::BindableTimestamp"; last SWITCH; } if ($dbtype eq "char(1)") { $ctype="DB::BindableBool"; last SWITCH; } diff --git a/engine/server/library/serverDatabase/src/shared/CharacterLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterLocator.h index fc1fa203..8c655ee0 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterLocator.h @@ -50,7 +50,7 @@ class CharacterLocator : public ObjectLocator LocateCharacterQuery& operator=(const LocateCharacterQuery&); //disable public: - DB::BindableLong object_count; + DB::BindableInt32 object_count; DB::BindableNetworkId object_id; private: diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 3ca8cd55..b33777d8 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -32,11 +32,11 @@ class CharacterNameLocator : public ObjectLocator struct CharacterNameRow { DB::BindableNetworkId character_id; - DB::BindableLong character_station_id; + DB::BindableInt32 character_station_id; DB::BindableString<127> character_name; DB::BindableString<127> character_full_name; - DB::BindableLong character_create_time; - DB::BindableLong character_last_login_time; + DB::BindableInt32 character_create_time; + DB::BindableInt32 character_last_login_time; }; class CharacterNameQuery : public DB::Query diff --git a/engine/server/library/serverDatabase/src/shared/CharacterQueries.h b/engine/server/library/serverDatabase/src/shared/CharacterQueries.h index 9cc1dfc8..b4a4b8a2 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterQueries.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterQueries.h @@ -36,7 +36,7 @@ namespace DBQuery { DB::BindableDouble x; DB::BindableDouble y; DB::BindableDouble z; - DB::BindableLong station_id; + DB::BindableInt32 station_id; }; GetCharacters() {} @@ -76,7 +76,7 @@ namespace DBQuery { virtual QueryMode getExecutionMode() const; private: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId object_id; DB::BindableString<127> character_name; DB::BindableString<127> normalized_name; @@ -105,7 +105,7 @@ namespace DBQuery { DB::BindableNetworkId object_id; DB::BindableString<127> character_name; DB::BindableString<127> normalized_name; - DB::BindableLong result; + DB::BindableInt32 result; private: RenameCharacter (const RenameCharacter&); // disable diff --git a/engine/server/library/serverDatabase/src/shared/DeleteCharacterCustomPersistStep.h b/engine/server/library/serverDatabase/src/shared/DeleteCharacterCustomPersistStep.h index 0ab8a0cc..112c3515 100755 --- a/engine/server/library/serverDatabase/src/shared/DeleteCharacterCustomPersistStep.h +++ b/engine/server/library/serverDatabase/src/shared/DeleteCharacterCustomPersistStep.h @@ -45,10 +45,10 @@ class DeleteCharacterCustomPersistStep : public CustomPersistStep virtual QueryMode getExecutionMode() const; public: - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId character_id; - DB::BindableLong delete_minutes; - DB::BindableLong result; + DB::BindableInt32 delete_minutes; + DB::BindableInt32 result; private: // disable: DeleteCharacterQuery(const DeleteCharacterQuery&); diff --git a/engine/server/library/serverDatabase/src/shared/FixLoadWithCustomPersistStep.h b/engine/server/library/serverDatabase/src/shared/FixLoadWithCustomPersistStep.h index e5e24bea..5f28563e 100755 --- a/engine/server/library/serverDatabase/src/shared/FixLoadWithCustomPersistStep.h +++ b/engine/server/library/serverDatabase/src/shared/FixLoadWithCustomPersistStep.h @@ -12,7 +12,7 @@ #include "Unicode.h" #include "serverDatabase/CustomPersistStep.h" -#include "sharedDatabaseInterface/DbBindableLong.h" +#include "sharedDatabaseInterface/DbBindableInt32.h" #include "sharedDatabaseInterface/BindableNetworkId.h" #include "sharedDatabaseInterface/DbQuery.h" #include "sharedFoundation/NetworkId.h" @@ -50,7 +50,7 @@ class FixLoadWithCustomPersistStep : public CustomPersistStep FixLoadWithQuery &operator=(FixLoadWithQuery const &); DB::BindableNetworkId topmost_object; DB::BindableNetworkId starting_loadwith; - DB::BindableLong max_depth; + DB::BindableInt32 max_depth; }; private: diff --git a/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h b/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h index b99382d2..7ccb5abc 100755 --- a/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h +++ b/engine/server/library/serverDatabase/src/shared/GetChunkQuery.h @@ -41,10 +41,10 @@ namespace DBQuery { GetChunkQuery& operator=(const GetChunkQuery&); //disable private: - DB::BindableLong object_count; + DB::BindableInt32 object_count; DB::BindableString<50> scene_id; - DB::BindableLong node_x; - DB::BindableLong node_z; + DB::BindableInt32 node_x; + DB::BindableInt32 node_z; std::string m_schema; }; diff --git a/engine/server/library/serverDatabase/src/shared/GetGoldVersionNumberQuery.h b/engine/server/library/serverDatabase/src/shared/GetGoldVersionNumberQuery.h index 5e854cc0..a79ed877 100755 --- a/engine/server/library/serverDatabase/src/shared/GetGoldVersionNumberQuery.h +++ b/engine/server/library/serverDatabase/src/shared/GetGoldVersionNumberQuery.h @@ -31,8 +31,8 @@ namespace DBQuery int getMinVersionNumber(); private: - DB::BindableLong current_version_number; - DB::BindableLong min_version_number; + DB::BindableInt32 current_version_number; + DB::BindableInt32 min_version_number; private: GetGoldVersionNumberQuery (const GetGoldVersionNumberQuery &); // disable diff --git a/engine/server/library/serverDatabase/src/shared/GetObjectIdsQuery.h b/engine/server/library/serverDatabase/src/shared/GetObjectIdsQuery.h index 5e8f70b3..59351083 100755 --- a/engine/server/library/serverDatabase/src/shared/GetObjectIdsQuery.h +++ b/engine/server/library/serverDatabase/src/shared/GetObjectIdsQuery.h @@ -43,7 +43,7 @@ namespace DBQuery GetOIDsQuery(const GetOIDsQuery&); GetOIDsQuery& operator=(const GetOIDsQuery&); - DB::BindableLong min_count; + DB::BindableInt32 min_count; DB::BindableNetworkId start_id; DB::BindableNetworkId end_id; }; diff --git a/engine/server/library/serverDatabase/src/shared/GetTimestampQuery.h b/engine/server/library/serverDatabase/src/shared/GetTimestampQuery.h index 08563f61..6789649c 100755 --- a/engine/server/library/serverDatabase/src/shared/GetTimestampQuery.h +++ b/engine/server/library/serverDatabase/src/shared/GetTimestampQuery.h @@ -30,7 +30,7 @@ namespace DBQuery int getTimestamp(); private: - DB::BindableLong timestamp; + DB::BindableInt32 timestamp; private: GetTimestampQuery(const GetTimestampQuery &); // disable diff --git a/engine/server/library/serverDatabase/src/shared/GetVersionNumberQuery.h b/engine/server/library/serverDatabase/src/shared/GetVersionNumberQuery.h index 8871468f..665765be 100755 --- a/engine/server/library/serverDatabase/src/shared/GetVersionNumberQuery.h +++ b/engine/server/library/serverDatabase/src/shared/GetVersionNumberQuery.h @@ -31,8 +31,8 @@ namespace DBQuery int getMinVersionNumber(); private: - DB::BindableLong current_version_number; - DB::BindableLong min_version_number; + DB::BindableInt32 current_version_number; + DB::BindableInt32 min_version_number; private: GetVersionNumberQuery (const GetVersionNumberQuery &); // disable diff --git a/engine/server/library/serverDatabase/src/shared/LazyDeleteQuery.h b/engine/server/library/serverDatabase/src/shared/LazyDeleteQuery.h index 65e40e63..0e6d412b 100755 --- a/engine/server/library/serverDatabase/src/shared/LazyDeleteQuery.h +++ b/engine/server/library/serverDatabase/src/shared/LazyDeleteQuery.h @@ -34,8 +34,8 @@ class LazyDeleteQuery : public DB::Query private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; - DB::BindableLong m_enableDatabaseLogging; + DB::BindableInt32 m_numItems; + DB::BindableInt32 m_enableDatabaseLogging; private: LazyDeleteQuery(const LazyDeleteQuery&); //disable diff --git a/engine/server/library/serverDatabase/src/shared/MoveToPlayerCustomPersistStep.h b/engine/server/library/serverDatabase/src/shared/MoveToPlayerCustomPersistStep.h index b5851bc9..03670391 100755 --- a/engine/server/library/serverDatabase/src/shared/MoveToPlayerCustomPersistStep.h +++ b/engine/server/library/serverDatabase/src/shared/MoveToPlayerCustomPersistStep.h @@ -12,7 +12,7 @@ #include "Unicode.h" #include "serverDatabase/CustomPersistStep.h" -#include "sharedDatabaseInterface/DbBindableLong.h" +#include "sharedDatabaseInterface/DbBindableInt32.h" #include "sharedDatabaseInterface/BindableNetworkId.h" #include "sharedDatabaseInterface/DbQuery.h" #include "sharedFoundation/NetworkId.h" @@ -52,7 +52,7 @@ class MoveToPlayerCustomPersistStep : public CustomPersistStep MoveToPlayerQuery &operator=(MoveToPlayerQuery const &); DB::BindableNetworkId object_id; DB::BindableNetworkId target_player; - DB::BindableLong max_depth; + DB::BindableInt32 max_depth; bool m_useBank; bool m_useDatapad; }; diff --git a/engine/server/library/serverDatabase/src/shared/PreloadListQuery.h b/engine/server/library/serverDatabase/src/shared/PreloadListQuery.h index 3f7695b8..ad7cc24b 100755 --- a/engine/server/library/serverDatabase/src/shared/PreloadListQuery.h +++ b/engine/server/library/serverDatabase/src/shared/PreloadListQuery.h @@ -30,11 +30,11 @@ namespace DBQuery public: DB::BindableString<50> scene_id; DB::BindableNetworkId object_id; - DB::BindableLong chunk_x; - DB::BindableLong chunk_z; - DB::BindableLong preload_range; - DB::BindableLong city_server_id; - DB::BindableLong wilderness_server_id; + DB::BindableInt32 chunk_x; + DB::BindableInt32 chunk_z; + DB::BindableInt32 preload_range; + DB::BindableInt32 city_server_id; + DB::BindableInt32 wilderness_server_id; public: virtual bool bindParameters(); diff --git a/engine/server/library/serverDatabase/src/shared/SaveTimestampQuery.h b/engine/server/library/serverDatabase/src/shared/SaveTimestampQuery.h index 77d4e077..7302ace9 100755 --- a/engine/server/library/serverDatabase/src/shared/SaveTimestampQuery.h +++ b/engine/server/library/serverDatabase/src/shared/SaveTimestampQuery.h @@ -28,7 +28,7 @@ namespace DBQuery virtual bool bindColumns(); private: - DB::BindableLong timestamp; + DB::BindableInt32 timestamp; private: SaveTimestampQuery(const SaveTimestampQuery &); // disable diff --git a/engine/server/library/serverDatabase/src/shared/ScriptQueries.h b/engine/server/library/serverDatabase/src/shared/ScriptQueries.h index ec916eec..2f5cbf81 100755 --- a/engine/server/library/serverDatabase/src/shared/ScriptQueries.h +++ b/engine/server/library/serverDatabase/src/shared/ScriptQueries.h @@ -45,7 +45,7 @@ namespace DBQuery struct ScriptRow { DB::BindableNetworkId object_id; - DB::BindableLong index; + DB::BindableInt32 index; DB::BindableString<128> script_name; }; diff --git a/engine/server/library/serverDatabase/src/shared/StructureQueries.h b/engine/server/library/serverDatabase/src/shared/StructureQueries.h index cee4458d..3893f6af 100755 --- a/engine/server/library/serverDatabase/src/shared/StructureQueries.h +++ b/engine/server/library/serverDatabase/src/shared/StructureQueries.h @@ -35,7 +35,7 @@ namespace DBQuery { DB::BindableDouble y; DB::BindableDouble z; DB::BindableNetworkId character_id; - DB::BindableLong deleted; + DB::BindableInt32 deleted; }; GetStructures() {} diff --git a/engine/server/library/serverDatabase/src/shared/TaskCSTasks.h b/engine/server/library/serverDatabase/src/shared/TaskCSTasks.h index db26fc16..2810b9ee 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskCSTasks.h +++ b/engine/server/library/serverDatabase/src/shared/TaskCSTasks.h @@ -44,7 +44,7 @@ class TaskGetCharactersForAccount:public DB::TaskRequest public: // input: - DB::BindableLong station_id; //lint !e1925 public data member Suppresed because it's in a private inner class + DB::BindableInt32 station_id; //lint !e1925 public data member Suppresed because it's in a private inner class DB::BindableNetworkId character_id; //lint !e1925 public data member Suppresed because it's in a private inner class //output: @@ -122,7 +122,7 @@ class TaskGetDeletedItems:public DB::TaskRequest public: // input: DB::BindableNetworkId character_id; //lint !e1925 public data member Suppresed because it's in a private inner class - DB::BindableLong page_number; + DB::BindableInt32 page_number; private: CSGetDeletedItemsQuery(const CSGetDeletedItemsQuery&); @@ -211,7 +211,7 @@ class TaskGetCharacterId:public DB::TaskRequest struct CharacterIdRow { DB::BindableNetworkId characterId; - DB::BindableLong stationId; + DB::BindableInt32 stationId; DB::BindableString characterName; }; @@ -310,7 +310,7 @@ class TaskCsUndeleteItem : public DB::TaskRequest private: DB::BindableNetworkId characterId; DB::BindableNetworkId itemId; - DB::BindableLong move; + DB::BindableInt32 move; private: CsUndeleteItemQuery(const CsUndeleteItemQuery &); // disable diff --git a/engine/server/library/serverDatabase/src/shared/TaskChangeStationId.h b/engine/server/library/serverDatabase/src/shared/TaskChangeStationId.h index 6ed1dad4..6a303000 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskChangeStationId.h +++ b/engine/server/library/serverDatabase/src/shared/TaskChangeStationId.h @@ -36,8 +36,8 @@ class TaskChangeStationId : public DB::TaskRequest public: ChangeStationIdQuery(); - DB::BindableLong destination_station_id; //lint !e1925 // public data member - DB::BindableLong source_station_id; //lint !e1925 // public data member + DB::BindableInt32 destination_station_id; //lint !e1925 // public data member + DB::BindableInt32 source_station_id; //lint !e1925 // public data member virtual void getSQL (std::string &sql); virtual bool bindParameters (); diff --git a/engine/server/library/serverDatabase/src/shared/TaskCheckCharacterName.h b/engine/server/library/serverDatabase/src/shared/TaskCheckCharacterName.h index 6cf4d3e9..1ce96cf1 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskCheckCharacterName.h +++ b/engine/server/library/serverDatabase/src/shared/TaskCheckCharacterName.h @@ -44,7 +44,7 @@ class TaskCheckCharacterName : public DB::TaskRequest public: DB::BindableString<127> character_name; - DB::BindableLong result; + DB::BindableInt32 result; private: CheckCharacterNameQuery(const CheckCharacterNameQuery&); diff --git a/engine/server/library/serverDatabase/src/shared/TaskGetStructuresForPurge.cpp b/engine/server/library/serverDatabase/src/shared/TaskGetStructuresForPurge.cpp index 5ea2e6c8..09711a52 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskGetStructuresForPurge.cpp +++ b/engine/server/library/serverDatabase/src/shared/TaskGetStructuresForPurge.cpp @@ -35,7 +35,7 @@ namespace TaskGetStructuresForPurgeNamespace NetworkId getOwnerId() const; private: - DB::BindableLong m_station_id; + DB::BindableInt32 m_station_id; DB::BindableNetworkId m_structure_id; DB::BindableNetworkId m_owner_id; @@ -59,7 +59,7 @@ namespace TaskGetStructuresForPurgeNamespace Unicode::String getVendorName() const; private: - DB::BindableLong m_station_id; + DB::BindableInt32 m_station_id; DB::BindableNetworkId m_vendor_id; DB::BindableNetworkId m_owner_id; DB::BindableUnicode<128> m_vendor_name; diff --git a/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h b/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h index ed8272d5..7d6a9d29 100755 --- a/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h +++ b/engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h @@ -58,8 +58,8 @@ class WorldContainerLocator : public ObjectLocator private: DB::BindableVarrayString container_ids; - DB::BindableLong num_containers; - DB::BindableLong num_objects_found; + DB::BindableInt32 num_containers; + DB::BindableInt32 num_objects_found; std::string m_schema; private: diff --git a/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableInt32.h b/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableInt32.h new file mode 100755 index 00000000..0689bee1 --- /dev/null +++ b/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableInt32.h @@ -0,0 +1 @@ +#include "../../src/shared/core/DbBindableInt32.h" diff --git a/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableLong.h b/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableLong.h deleted file mode 100755 index b11e3a91..00000000 --- a/engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableLong.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../src/shared/core/DbBindableLong.h" diff --git a/engine/shared/library/sharedDatabaseInterface/src/CMakeLists.txt b/engine/shared/library/sharedDatabaseInterface/src/CMakeLists.txt index 84c3cd98..39dedc43 100644 --- a/engine/shared/library/sharedDatabaseInterface/src/CMakeLists.txt +++ b/engine/shared/library/sharedDatabaseInterface/src/CMakeLists.txt @@ -18,8 +18,8 @@ set(SHARED_SOURCES shared/core/DbBindableDouble.h shared/core/DbBindableInt64.cpp shared/core/DbBindableInt64.h - shared/core/DbBindableLong.cpp - shared/core/DbBindableLong.h + shared/core/DbBindableInt32.cpp + shared/core/DbBindableInt32.h shared/core/DbBindableString.cpp shared/core/DbBindableString.h shared/core/DbBindableUnicode.cpp diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h index 03c2d7dc..c6f11150 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h @@ -23,7 +23,7 @@ #include "sharedDatabaseInterface/DbBindableBool.h" #include "sharedDatabaseInterface/DbBindableDouble.h" #include "sharedDatabaseInterface/DbBindableInt64.h" -#include "sharedDatabaseInterface/DbBindableLong.h" +#include "sharedDatabaseInterface/DbBindableInt32.h" #include "sharedDatabaseInterface/DbBindableString.h" #include "sharedDatabaseInterface/DbBindableUnicode.h" diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.cpp b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.cpp similarity index 71% rename from engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.cpp rename to engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.cpp index c487f428..efd31d58 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.cpp @@ -1,12 +1,12 @@ // ====================================================================== // -// DBBindableLong.cpp +// DBBindableInt32.cpp // copyright (c) 2001 Sony Online Entertainment // // ====================================================================== #include "sharedDatabaseInterface/FirstSharedDatabaseInterface.h" -#include "sharedDatabaseInterface/DbBindableLong.h" +#include "sharedDatabaseInterface/DbBindableInt32.h" #include @@ -14,15 +14,15 @@ using namespace DB; -BindableLong::BindableLong() : Bindable(), value(-999) +BindableInt32::BindableInt32() : Bindable(), value(-999) { } -BindableLong::BindableLong(int64_t _value) : Bindable(sizeof(value)), value(_value) +BindableInt32::BindableInt32(int32_t _value) : Bindable(sizeof(value)), value(_value) { } -void *BindableLong::getBuffer() +void *BindableInt32::getBuffer() { return &value; //lint !e1536 // exposing private member } @@ -30,14 +30,14 @@ void *BindableLong::getBuffer() // ---------------------------------------------------------------------- -int64_t BindableLong::getValue() const +int32_t BindableInt32::getValue() const { return value; } // ---------------------------------------------------------------------- -BindableLong &BindableLong::operator=(int64_t rhs) +BindableInt32 &BindableInt32::operator=(int32_t rhs) { indicator=sizeof(value); value=rhs; @@ -46,7 +46,7 @@ BindableLong &BindableLong::operator=(int64_t rhs) // ---------------------------------------------------------------------- -void BindableLong::setValue(int64_t rhs) +void BindableInt32::setValue(int32_t rhs) { indicator=sizeof(value); value=rhs; @@ -54,7 +54,7 @@ void BindableLong::setValue(int64_t rhs) // ---------------------------------------------------------------------- -std::string BindableLong::outputValue() const +std::string BindableInt32::outputValue() const { char temp[255]; snprintf(temp,sizeof(temp),"%li",value); diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.h similarity index 61% rename from engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.h rename to engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.h index 037b59f4..4fccc63f 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableLong.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.h @@ -1,12 +1,12 @@ // ====================================================================== // -// DBBindableLong.h +// DBBindableInt32.h // copyright (c) 2001 Sony Online Entertainment // // ====================================================================== -#ifndef INCLUDED_DBBindableLong_H -#define INCLUDED_DBBindableLong_H +#ifndef INCLUDED_DBBindableInt32_H +#define INCLUDED_DBBindableInt32_H // ====================================================================== @@ -19,15 +19,15 @@ namespace DB { /** * Represents a long in C++, bound to an INTEGER or NUMBER database column */ - class BindableLong : public Bindable + class BindableInt32 : public Bindable { public: - BindableLong(); - explicit BindableLong(int64_t _value); + BindableInt32(); + explicit BindableInt32(int32_t _value); - int64_t getValue() const; - void setValue(const int64_t rhs); - BindableLong &operator=(const int64_t rhs); + int32_t getValue() const; + void setValue(const int32_t rhs); + BindableInt32 &operator=(const int32_t rhs); // following alternate getValue's are provided for convenience, particularly in // the auto-generated code: @@ -37,76 +37,58 @@ namespace DB { void getValue(uint16_t &buffer) const; void getValue(int32_t &buffer) const; void getValue(uint32_t &buffer) const; - void getValue(int64_t &buffer) const; - void getValue(uint64_t &buffer) const; void *getBuffer(); virtual std::string outputValue() const; private: - int64_t value; + int32_t value; }; //lint !e1721 !e1509 // no virtual destructor, unusual operator = } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(int8_t &buffer) const +inline void DB::BindableInt32::getValue(int8_t &buffer) const { buffer=static_cast(getValue()); } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(uint8_t &buffer) const +inline void DB::BindableInt32::getValue(uint8_t &buffer) const { buffer=static_cast(getValue()); } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(int16_t &buffer) const +inline void DB::BindableInt32::getValue(int16_t &buffer) const { buffer=getValue(); } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(uint16_t &buffer) const +inline void DB::BindableInt32::getValue(uint16_t &buffer) const { buffer=static_cast(getValue()); } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(int32_t &buffer) const +inline void DB::BindableInt32::getValue(int32_t &buffer) const { buffer=getValue(); } // ---------------------------------------------------------------------- -inline void DB::BindableLong::getValue(uint32_t &buffer) const +inline void DB::BindableInt32::getValue(uint32_t &buffer) const { buffer=static_cast(getValue()); } -// ---------------------------------------------------------------------- - -inline void DB::BindableLong::getValue(int64_t &buffer) const -{ - buffer=getValue(); -} - -// ---------------------------------------------------------------------- - -inline void DB::BindableLong::getValue(uint64_t &buffer) const -{ - buffer=static_cast(getValue()); -} - - - // ====================================================================== #endif diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.cpp b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.cpp index f78c6b2e..9819b73c 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.cpp @@ -181,13 +181,13 @@ void Query::setColArrayMode(size_t skipSize, size_t numElements) impl->setColArrayMode(skipSize, numElements); } -bool Query::bindCol(BindableLong &buffer) +bool Query::bindCol(BindableInt32 &buffer) { NOT_NULL(impl); return impl->bindCol(buffer); } -bool Query::bindParameter(BindableLong &buffer) +bool Query::bindParameter(BindableInt32 &buffer) { NOT_NULL(impl); return impl->bindParameter(buffer); diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.h index e21e24c4..d316bcee 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.h @@ -17,7 +17,7 @@ namespace DB { class Session; class QueryImpl; - class BindableLong; + class BindableInt32; class BindableVarray; class Query @@ -70,8 +70,8 @@ namespace DB { */ void setColArrayMode(size_t skipSize, size_t numElements); - bool bindCol(BindableLong &buffer); - bool bindParameter(BindableLong &buffer); + bool bindCol(BindableInt32 &buffer); + bool bindParameter(BindableInt32 &buffer); bool bindCol(BindableDouble &buffer); bool bindParameter(BindableDouble &buffer); bool bindCol(BindableStringBase &buffer); diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQueryImplementation.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQueryImplementation.h index a978dd77..1e13658e 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQueryImplementation.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQueryImplementation.h @@ -19,7 +19,7 @@ namespace DB class BindableBool; class BindableDouble; class BindableInt64; - class BindableLong; + class BindableInt32; class BindableStringBase; class BindableUnicodeBase; class BindableVarray; @@ -54,8 +54,8 @@ namespace DB virtual void setColArrayMode(size_t skipSize, size_t numElements)=0; - virtual bool bindCol(BindableLong &buffer) =0; - virtual bool bindParameter(BindableLong &buffer) =0; + virtual bool bindCol(BindableInt32 &buffer) =0; + virtual bool bindParameter(BindableInt32 &buffer) =0; virtual bool bindCol(BindableDouble &buffer) =0; virtual bool bindParameter(BindableDouble &buffer) =0; virtual bool bindCol(BindableStringBase &buffer) =0; diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTestQuery.h b/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTestQuery.h index cca5e891..11556487 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTestQuery.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTestQuery.h @@ -7,7 +7,7 @@ class DBTestQuery : public DB::Query { public: - DB::BindableLong value; + DB::BindableInt32 value; DBTestQuery(); virtual void getSQL(std::string &sql); diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp index b4486dc8..46e23a9c 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp @@ -448,7 +448,7 @@ size_t DB::OCIQueryImpl::BindRec::getLengthSkipSize() // ====================================================================== -bool DB::OCIQueryImpl::bindCol(BindableLong &buffer) +bool DB::OCIQueryImpl::bindCol(BindableInt32 &buffer) { BindRec *br=addBindRec(buffer); @@ -478,7 +478,7 @@ bool DB::OCIQueryImpl::bindCol(BindableLong &buffer) // ---------------------------------------------------------------------- -bool DB::OCIQueryImpl::bindParameter(BindableLong &buffer) +bool DB::OCIQueryImpl::bindParameter(BindableInt32 &buffer) { BindRec *br=addBindRec(buffer); diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.h b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.h index 6cf41e37..9276c849 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.h +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.h @@ -50,8 +50,8 @@ namespace DB virtual void setColArrayMode(size_t skipSize, size_t numElements); - virtual bool bindCol(BindableLong &buffer); - virtual bool bindParameter(BindableLong &buffer); + virtual bool bindCol(BindableInt32 &buffer); + virtual bool bindParameter(BindableInt32 &buffer); virtual bool bindCol(BindableDouble &buffer); virtual bool bindParameter(BindableDouble &buffer); virtual bool bindCol(BindableStringBase &buffer); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskBrokenObjectCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskBrokenObjectCleanup.h index ff96a9f0..0bdc0a64 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskBrokenObjectCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskBrokenObjectCleanup.h @@ -41,7 +41,7 @@ class TaskBrokenObjectCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMarketAttributesCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMarketAttributesCleanup.h index 2d35ab60..7075c485 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMarketAttributesCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMarketAttributesCleanup.h @@ -41,7 +41,7 @@ class TaskMarketAttributesCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMessagesCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMessagesCleanup.h index 0efeb860..549ae6a6 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMessagesCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMessagesCleanup.h @@ -41,7 +41,7 @@ class TaskMessagesCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjvarNameCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjvarNameCleanup.h index fd324d45..0a8561f1 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjvarNameCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjvarNameCleanup.h @@ -41,7 +41,7 @@ class TaskObjvarNameCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskOrphanedObjectCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskOrphanedObjectCleanup.h index baafd4c2..cb097e53 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskOrphanedObjectCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskOrphanedObjectCleanup.h @@ -41,7 +41,7 @@ class TaskOrphanedObjectCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskVendorObjectCleanup.h b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskVendorObjectCleanup.h index e715be43..68348d43 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskVendorObjectCleanup.h +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskVendorObjectCleanup.h @@ -41,7 +41,7 @@ class TaskVendorObjectCleanup : public DB::TaskRequest virtual bool bindColumns(); virtual QueryMode getExecutionMode() const; - DB::BindableLong result; + DB::BindableInt32 result; private: DataCleanupQuery(const DataCleanupQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp index dc9f96fa..756c06b8 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp @@ -1033,7 +1033,7 @@ void SwgSnapshot::encodeComponents(const NetworkId &objectId, Archive::ByteStrea // ---------------------------------------------------------------------- void -SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x, DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableLong &planet) const { +SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x, DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableInt32 &planet) const { Location temp; Archive::get(data, temp); Vector vec = temp.getCoordinates(); @@ -1047,7 +1047,7 @@ SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x, // ---------------------------------------------------------------------- void -SwgSnapshot::encodeLocation(Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableLong &planet) const { +SwgSnapshot::encodeLocation(Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableInt32 &planet) const { Location temp(Vector(static_cast(x.getValue()), static_cast(y.getValue()), static_cast(z.getValue())), cell.getValue(), planet.getValue()); Archive::put(data, temp); } diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h index e1b77dba..2f6e6c3a 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h @@ -419,7 +419,7 @@ protected: void decodeVector (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z) const; void decodeMatchMakingId (Archive::ReadIterator &data, DB::BufferString &column) const; void decodeComponents (NetworkId const & objectId, Archive::ReadIterator &data, bool isBaseline); - void decodeLocation (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableLong &planet) const; + void decodeLocation (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableInt32 &planet) const; void decodeWaypoints (const NetworkId &objectId, Archive::ReadIterator &data, bool isBaseline); void decodeSingleWaypoint (const NetworkId &objectId, Archive::ReadIterator &data, bool isBaseline); void decodeQuests (NetworkId const & networkId, Archive::ReadIterator &data, DB::BufferString &part1, DB::BufferString &part2, DB::BufferString &part3, DB::BufferString &part4) const; @@ -439,7 +439,7 @@ protected: void encodeVector (Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z) const; void encodeMatchMakingId (Archive::ByteStream &data, const DB::BufferString &column) const; void encodeComponents (const NetworkId &objectId, Archive::ByteStream &data) const; - void encodeLocation (Archive::ByteStream &data, const DB::BindableDouble &x,const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableLong &planet) const; + void encodeLocation (Archive::ByteStream &data, const DB::BindableDouble &x,const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableInt32 &planet) const; void encodeWaypoints (const NetworkId & objectId, Archive::ByteStream &data) const; void encodeSingleWaypoint (const NetworkId & objectId, Archive::ByteStream &data) const; void encodeQuests (Archive::ByteStream &data, DB::BufferString const &part1, DB::BufferString const &part2, DB::BufferString const &part3, DB::BufferString const &part4) const; diff --git a/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template b/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template index 327283d0..21d290cc 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template +++ b/game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template @@ -45,7 +45,7 @@ public: private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayString m_region_names; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class BattlefieldMarkerObjectQuerySelect : public DB::Query @@ -95,7 +95,7 @@ private: DB::BindableVarrayNumber m_time_last_checkeds; DB::BindableVarrayString m_is_publics; DB::BindableVarrayNumber m_city_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class BuildingObjectQuerySelect : public DB::Query @@ -143,7 +143,7 @@ private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayNumber m_cell_numbers; DB::BindableVarrayString m_is_publics; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class CellObjectQuerySelect : public DB::Query @@ -189,7 +189,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class CityObjectQuerySelect : public DB::Query @@ -274,7 +274,7 @@ private: DB::BindableVarrayNumber m_ws_xs; DB::BindableVarrayNumber m_ws_ys; DB::BindableVarrayNumber m_ws_zs; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class CreatureObjectQuerySelect : public DB::Query @@ -320,7 +320,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class FactoryObjectQuerySelect : public DB::Query @@ -366,7 +366,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class GuildObjectQuerySelect : public DB::Query @@ -419,7 +419,7 @@ private: DB::BindableVarrayString m_hopper_resources; DB::BindableVarrayNumber m_hopper_amounts; DB::BindableVarrayString m_resource_types; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class HarvesterInstallationObjectQuerySelect : public DB::Query @@ -471,7 +471,7 @@ private: DB::BindableVarrayNumber m_activate_start_times; DB::BindableVarrayNumber m_powers; DB::BindableVarrayNumber m_power_rates; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class InstallationObjectQuerySelect : public DB::Query @@ -518,7 +518,7 @@ public: private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayNumber m_counts; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class IntangibleObjectQuerySelect : public DB::Query @@ -569,7 +569,7 @@ private: DB::BindableVarrayNumber m_items_per_containers; DB::BindableVarrayNumber m_manufacture_times; DB::BindableVarrayNumber m_draft_schematics; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class ManufactureSchematicObjectQuerySelect : public DB::Query @@ -615,7 +615,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class ManufactureInstallationObjectQuerySelect : public DB::Query @@ -684,7 +684,7 @@ private: DB::BindableVarrayNumber m_mission_types; DB::BindableVarrayNumber m_target_appearances; DB::BindableVarrayString m_target_names; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class MissionObjectQuerySelect : public DB::Query @@ -731,7 +731,7 @@ public: private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayString m_planet_names; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class PlanetObjectQuerySelect : public DB::Query @@ -813,7 +813,7 @@ private: DB::BindableVarrayString m_show_backpacks; DB::BindableVarrayString m_show_helmets; DB::BindableVarrayString m_collections2s; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class PlayerObjectQuerySelect : public DB::Query @@ -888,7 +888,7 @@ private: DB::BindableVarrayString m_task_description11s; DB::BindableVarrayString m_task_title12s; DB::BindableVarrayString m_task_description12s; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class PlayerQuestObjectQuerySelect : public DB::Query @@ -937,7 +937,7 @@ private: DB::BindableVarrayString m_resource_types; DB::BindableVarrayNumber m_quantitys; DB::BindableVarrayString m_sources; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class ResourceContainerObjectQuerySelect : public DB::Query @@ -1034,7 +1034,7 @@ private: DB::BindableVarrayNumber m_cargo_hold_contents_maximums; DB::BindableVarrayNumber m_cargo_hold_contents_currents; DB::BindableVarrayString m_cargo_hold_contentss; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class ShipObjectQuerySelect : public DB::Query @@ -1080,7 +1080,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class StaticObjectQuerySelect : public DB::Query @@ -1139,7 +1139,7 @@ private: DB::BindableVarrayNumber m_conditions; DB::BindableVarrayString m_creator_ids; DB::BindableVarrayNumber m_source_draft_schematics; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class TangibleObjectQuerySelect : public DB::Query @@ -1189,7 +1189,7 @@ private: DB::BindableVarrayString m_target_server_template_names; DB::BindableVarrayString m_target_shared_template_names; DB::BindableVarrayString m_waypoints; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class TokenObjectQuerySelect : public DB::Query @@ -1235,7 +1235,7 @@ public: private: DB::BindableVarrayString m_object_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class UniverseObjectQuerySelect : public DB::Query @@ -1282,7 +1282,7 @@ public: private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayNumber m_boguss; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class VehicleObjectQuerySelect : public DB::Query @@ -1340,7 +1340,7 @@ private: DB::BindableVarrayNumber m_damage_radiuss; DB::BindableVarrayNumber m_min_ranges; DB::BindableVarrayNumber m_max_ranges; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class WeaponObjectQuerySelect : public DB::Query diff --git a/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template b/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template index 7297cfd7..9d4989a0 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template +++ b/game/server/application/SwgDatabaseServer/src/shared/generated/Schema_h.template @@ -23,38 +23,38 @@ struct PlayerObjectRow : public DB::Row enum {QUEST_DATA_SIZE=4000}; DB::BindableNetworkId object_id; - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId house_id; - DB::BindableLong account_num_lots; + DB::BindableInt32 account_num_lots; DB::BindableBool account_is_outcast; DB::BindableDouble account_cheater_level; - DB::BindableLong account_max_lots_adjustment; + DB::BindableInt32 account_max_lots_adjustment; DB::BindableString<200> personal_profile_id; DB::BindableString<200> character_profile_id; DB::BindableString<200> skill_title; - DB::BindableLong born_date; - DB::BindableLong played_time; + DB::BindableInt32 born_date; + DB::BindableInt32 played_time; DB::BindableDouble force_regen_rate; - DB::BindableLong force_power; - DB::BindableLong max_force_power; + DB::BindableInt32 force_power; + DB::BindableInt32 max_force_power; DB::BindableBitArray<2047> active_quests; DB::BindableBitArray<2047> completed_quests; - DB::BindableLong current_quest; + DB::BindableInt32 current_quest; DB::BindableString quests; - DB::BindableLong role_icon_choice; + DB::BindableInt32 role_icon_choice; DB::BindableString quests2; DB::BindableString quests3; DB::BindableString quests4; DB::BindableString<200> skill_template; DB::BindableString<200> working_skill; - DB::BindableLong current_gcw_points; - DB::BindableLong current_gcw_rating; - DB::BindableLong current_pvp_kills; + DB::BindableInt32 current_gcw_points; + DB::BindableInt32 current_gcw_rating; + DB::BindableInt32 current_pvp_kills; DB::BindableInt64 lifetime_gcw_points; - DB::BindableLong max_gcw_imperial_rating; - DB::BindableLong max_gcw_rebel_rating; - DB::BindableLong lifetime_pvp_kills; - DB::BindableLong next_gcw_rating_calc_time; + DB::BindableInt32 max_gcw_imperial_rating; + DB::BindableInt32 max_gcw_rebel_rating; + DB::BindableInt32 lifetime_pvp_kills; + DB::BindableInt32 next_gcw_rating_calc_time; DB::BindableBitArray<16000> collections; DB::BindableBool show_backpack; DB::BindableBool show_helmet; @@ -80,38 +80,38 @@ struct PlayerObjectRow : public DB::Row struct PlayerObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong station_id; + DB::BindableInt32 station_id; DB::BindableNetworkId house_id; - DB::BindableLong account_num_lots; + DB::BindableInt32 account_num_lots; DB::BindableBool account_is_outcast; DB::BindableDouble account_cheater_level; - DB::BindableLong account_max_lots_adjustment; + DB::BindableInt32 account_max_lots_adjustment; DB::BufferString personal_profile_id; DB::BufferString character_profile_id; DB::BufferString skill_title; - DB::BindableLong born_date; - DB::BindableLong played_time; + DB::BindableInt32 born_date; + DB::BindableInt32 played_time; DB::BindableDouble force_regen_rate; - DB::BindableLong force_power; - DB::BindableLong max_force_power; + DB::BindableInt32 force_power; + DB::BindableInt32 max_force_power; DB::BindableBitArray<2047> active_quests; DB::BindableBitArray<2047> completed_quests; - DB::BindableLong current_quest; + DB::BindableInt32 current_quest; DB::BufferString quests; - DB::BindableLong role_icon_choice; + DB::BindableInt32 role_icon_choice; DB::BufferString quests2; DB::BufferString quests3; DB::BufferString quests4; DB::BufferString skill_template; DB::BufferString working_skill; - DB::BindableLong current_gcw_points; - DB::BindableLong current_gcw_rating; - DB::BindableLong current_pvp_kills; + DB::BindableInt32 current_gcw_points; + DB::BindableInt32 current_gcw_rating; + DB::BindableInt32 current_pvp_kills; DB::BindableInt64 lifetime_gcw_points; - DB::BindableLong max_gcw_imperial_rating; - DB::BindableLong max_gcw_rebel_rating; - DB::BindableLong lifetime_pvp_kills; - DB::BindableLong next_gcw_rating_calc_time; + DB::BindableInt32 max_gcw_imperial_rating; + DB::BindableInt32 max_gcw_rebel_rating; + DB::BindableInt32 lifetime_pvp_kills; + DB::BindableInt32 next_gcw_rating_calc_time; DB::BindableBitArray<16000> collections; DB::BindableBool show_backpack; DB::BindableBool show_helmet; @@ -219,10 +219,10 @@ struct PlayerObjectBufferRow : public DB::Row struct ObjectVariableRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong name_id; - DB::BindableLong type; + DB::BindableInt32 name_id; + DB::BindableInt32 type; DB::BindableString<1000> value; - DB::BindableLong detached; + DB::BindableInt32 detached; virtual void copy(const DB::Row &rhs) { @@ -234,14 +234,14 @@ struct WaypointRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableNetworkId waypoint_id; - DB::BindableLong appearance_name_crc; + DB::BindableInt32 appearance_name_crc; DB::BindableDouble location_x; DB::BindableDouble location_y; DB::BindableDouble location_z; DB::BindableNetworkId location_cell; - DB::BindableLong location_scene; + DB::BindableInt32 location_scene; DB::BindableUnicode<512> name; - DB::BindableLong color; + DB::BindableInt32 color; DB::BindableBool active; DB::BindableBool detached; @@ -255,19 +255,19 @@ struct WaypointRow : public DB::Row struct ArmorRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong layer; - DB::BindableLong effectiveness; - DB::BindableLong integrity; + DB::BindableInt32 layer; + DB::BindableInt32 effectiveness; + DB::BindableInt32 integrity; DB::BindableString<1000> special_protections; - DB::BindableLong encumberance_0; - DB::BindableLong encumberance_1; - DB::BindableLong encumberance_2; - DB::BindableLong encumberance_3; - DB::BindableLong encumberance_4; - DB::BindableLong encumberance_5; - DB::BindableLong encumberance_6; - DB::BindableLong encumberance_7; - DB::BindableLong encumberance_8; + DB::BindableInt32 encumberance_0; + DB::BindableInt32 encumberance_1; + DB::BindableInt32 encumberance_2; + DB::BindableInt32 encumberance_3; + DB::BindableInt32 encumberance_4; + DB::BindableInt32 encumberance_5; + DB::BindableInt32 encumberance_6; + DB::BindableInt32 encumberance_7; + DB::BindableInt32 encumberance_8; DB::BindableString<255> object_template; virtual void copy(const DB::Row &rhs) @@ -279,19 +279,19 @@ struct ArmorRow : public DB::Row struct ArmorBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong layer; - DB::BindableLong effectiveness; - DB::BindableLong integrity; + DB::BindableInt32 layer; + DB::BindableInt32 effectiveness; + DB::BindableInt32 integrity; DB::BufferString special_protections; - DB::BindableLong encumberance_0; - DB::BindableLong encumberance_1; - DB::BindableLong encumberance_2; - DB::BindableLong encumberance_3; - DB::BindableLong encumberance_4; - DB::BindableLong encumberance_5; - DB::BindableLong encumberance_6; - DB::BindableLong encumberance_7; - DB::BindableLong encumberance_8; + DB::BindableInt32 encumberance_0; + DB::BindableInt32 encumberance_1; + DB::BindableInt32 encumberance_2; + DB::BindableInt32 encumberance_3; + DB::BindableInt32 encumberance_4; + DB::BindableInt32 encumberance_5; + DB::BindableInt32 encumberance_6; + DB::BindableInt32 encumberance_7; + DB::BindableInt32 encumberance_8; DB::BufferString object_template; ArmorBufferRow() : @@ -396,7 +396,7 @@ struct BattlefieldParticipantRow : public DB::Row { DB::BindableNetworkId region_object_id; DB::BindableNetworkId character_object_id; - DB::BindableLong faction_id; + DB::BindableInt32 faction_id; virtual void copy(const DB::Row &rhs) { @@ -408,7 +408,7 @@ struct BattlefieldParticipantBufferRow : public DB::Row { DB::BindableNetworkId region_object_id; DB::BindableNetworkId character_object_id; - DB::BindableLong faction_id; + DB::BindableInt32 faction_id; BattlefieldParticipantBufferRow() : region_object_id(), @@ -467,10 +467,10 @@ struct BountyHunterTargetBufferRow : public DB::Row struct BuildingObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong maintenance_cost; + DB::BindableInt32 maintenance_cost; DB::BindableDouble time_last_checked; DB::BindableBool is_public; - DB::BindableLong city_id; + DB::BindableInt32 city_id; virtual void copy(const DB::Row &rhs) { @@ -491,10 +491,10 @@ struct BuildingObjectRow : public DB::Row struct BuildingObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong maintenance_cost; + DB::BindableInt32 maintenance_cost; DB::BindableDouble time_last_checked; DB::BindableBool is_public; - DB::BindableLong city_id; + DB::BindableInt32 city_id; BuildingObjectBufferRow() : object_id(), @@ -533,7 +533,7 @@ struct BuildingObjectBufferRow : public DB::Row struct CellObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong cell_number; + DB::BindableInt32 cell_number; DB::BindableBool is_public; virtual void copy(const DB::Row &rhs) @@ -555,7 +555,7 @@ struct CellObjectRow : public DB::Row struct CellObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong cell_number; + DB::BindableInt32 cell_number; DB::BindableBool is_public; CellObjectBufferRow() : @@ -640,7 +640,7 @@ struct CityObjectBufferRow : public DB::Row struct ClockRow : public DB::Row { - DB::BindableLong last_save_time; + DB::BindableInt32 last_save_time; virtual void copy(const DB::Row &rhs) { @@ -650,7 +650,7 @@ struct ClockRow : public DB::Row struct ClockBufferRow : public DB::Row { - DB::BindableLong last_save_time; + DB::BindableInt32 last_save_time; ClockBufferRow() : last_save_time() @@ -673,39 +673,39 @@ struct CreatureObjectRow : public DB::Row DB::BindableNetworkId object_id; DB::BindableDouble scale_factor; DB::BindableInt64 states; - DB::BindableLong posture; - DB::BindableLong shock_wounds; + DB::BindableInt32 posture; + DB::BindableInt32 shock_wounds; DB::BindableNetworkId master_id; - DB::BindableLong rank; + DB::BindableInt32 rank; DB::BindableDouble base_walk_speed; DB::BindableDouble base_run_speed; - DB::BindableLong attribute_0; - DB::BindableLong attribute_1; - DB::BindableLong attribute_2; - DB::BindableLong attribute_3; - DB::BindableLong attribute_4; - DB::BindableLong attribute_5; - DB::BindableLong attribute_6; - DB::BindableLong attribute_7; - DB::BindableLong attribute_8; - DB::BindableLong attribute_9; - DB::BindableLong attribute_10; - DB::BindableLong attribute_11; - DB::BindableLong attribute_12; - DB::BindableLong attribute_13; - DB::BindableLong attribute_14; - DB::BindableLong attribute_15; - DB::BindableLong attribute_16; - DB::BindableLong attribute_17; - DB::BindableLong attribute_18; - DB::BindableLong attribute_19; - DB::BindableLong attribute_20; - DB::BindableLong attribute_21; - DB::BindableLong attribute_22; - DB::BindableLong attribute_23; - DB::BindableLong attribute_24; - DB::BindableLong attribute_25; - DB::BindableLong attribute_26; + DB::BindableInt32 attribute_0; + DB::BindableInt32 attribute_1; + DB::BindableInt32 attribute_2; + DB::BindableInt32 attribute_3; + DB::BindableInt32 attribute_4; + DB::BindableInt32 attribute_5; + DB::BindableInt32 attribute_6; + DB::BindableInt32 attribute_7; + DB::BindableInt32 attribute_8; + DB::BindableInt32 attribute_9; + DB::BindableInt32 attribute_10; + DB::BindableInt32 attribute_11; + DB::BindableInt32 attribute_12; + DB::BindableInt32 attribute_13; + DB::BindableInt32 attribute_14; + DB::BindableInt32 attribute_15; + DB::BindableInt32 attribute_16; + DB::BindableInt32 attribute_17; + DB::BindableInt32 attribute_18; + DB::BindableInt32 attribute_19; + DB::BindableInt32 attribute_20; + DB::BindableInt32 attribute_21; + DB::BindableInt32 attribute_22; + DB::BindableInt32 attribute_23; + DB::BindableInt32 attribute_24; + DB::BindableInt32 attribute_25; + DB::BindableInt32 attribute_26; DB::BindableString<1000> persisted_buffs; DB::BindableDouble ws_x; DB::BindableDouble ws_y; @@ -732,39 +732,39 @@ struct CreatureObjectBufferRow : public DB::Row DB::BindableNetworkId object_id; DB::BindableDouble scale_factor; DB::BindableInt64 states; - DB::BindableLong posture; - DB::BindableLong shock_wounds; + DB::BindableInt32 posture; + DB::BindableInt32 shock_wounds; DB::BindableNetworkId master_id; - DB::BindableLong rank; + DB::BindableInt32 rank; DB::BindableDouble base_walk_speed; DB::BindableDouble base_run_speed; - DB::BindableLong attribute_0; - DB::BindableLong attribute_1; - DB::BindableLong attribute_2; - DB::BindableLong attribute_3; - DB::BindableLong attribute_4; - DB::BindableLong attribute_5; - DB::BindableLong attribute_6; - DB::BindableLong attribute_7; - DB::BindableLong attribute_8; - DB::BindableLong attribute_9; - DB::BindableLong attribute_10; - DB::BindableLong attribute_11; - DB::BindableLong attribute_12; - DB::BindableLong attribute_13; - DB::BindableLong attribute_14; - DB::BindableLong attribute_15; - DB::BindableLong attribute_16; - DB::BindableLong attribute_17; - DB::BindableLong attribute_18; - DB::BindableLong attribute_19; - DB::BindableLong attribute_20; - DB::BindableLong attribute_21; - DB::BindableLong attribute_22; - DB::BindableLong attribute_23; - DB::BindableLong attribute_24; - DB::BindableLong attribute_25; - DB::BindableLong attribute_26; + DB::BindableInt32 attribute_0; + DB::BindableInt32 attribute_1; + DB::BindableInt32 attribute_2; + DB::BindableInt32 attribute_3; + DB::BindableInt32 attribute_4; + DB::BindableInt32 attribute_5; + DB::BindableInt32 attribute_6; + DB::BindableInt32 attribute_7; + DB::BindableInt32 attribute_8; + DB::BindableInt32 attribute_9; + DB::BindableInt32 attribute_10; + DB::BindableInt32 attribute_11; + DB::BindableInt32 attribute_12; + DB::BindableInt32 attribute_13; + DB::BindableInt32 attribute_14; + DB::BindableInt32 attribute_15; + DB::BindableInt32 attribute_16; + DB::BindableInt32 attribute_17; + DB::BindableInt32 attribute_18; + DB::BindableInt32 attribute_19; + DB::BindableInt32 attribute_20; + DB::BindableInt32 attribute_21; + DB::BindableInt32 attribute_22; + DB::BindableInt32 attribute_23; + DB::BindableInt32 attribute_24; + DB::BindableInt32 attribute_25; + DB::BindableInt32 attribute_26; DB::BufferString persisted_buffs; DB::BindableDouble ws_x; DB::BindableDouble ws_y; @@ -878,7 +878,7 @@ struct ExperiencePointRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableString<500> experience_type; - DB::BindableLong points; + DB::BindableInt32 points; virtual void copy(const DB::Row &rhs) { @@ -890,7 +890,7 @@ struct ExperiencePointBufferRow : public DB::Row { DB::BindableNetworkId object_id; DB::BufferString experience_type; - DB::BindableLong points; + DB::BindableInt32 points; ExperiencePointBufferRow() : object_id(), @@ -964,8 +964,8 @@ struct FactoryObjectBufferRow : public DB::Row struct FreeObjectIdRow : public DB::Row { - DB::BindableLong start_id; - DB::BindableLong end_id; + DB::BindableInt32 start_id; + DB::BindableInt32 end_id; virtual void copy(const DB::Row &rhs) { @@ -975,8 +975,8 @@ struct FreeObjectIdRow : public DB::Row struct FreeObjectIdBufferRow : public DB::Row { - DB::BindableLong start_id; - DB::BindableLong end_id; + DB::BindableInt32 start_id; + DB::BindableInt32 end_id; FreeObjectIdBufferRow() : start_id(), @@ -1050,9 +1050,9 @@ struct HarvesterInstallationObjectRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableDouble installed_efficiency; - DB::BindableLong max_extraction_rate; + DB::BindableInt32 max_extraction_rate; DB::BindableDouble current_extraction_rate; - DB::BindableLong max_hopper_amount; + DB::BindableInt32 max_hopper_amount; DB::BindableNetworkId hopper_resource; DB::BindableDouble hopper_amount; DB::BindableNetworkId resource_type; @@ -1077,9 +1077,9 @@ struct HarvesterInstallationObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableDouble installed_efficiency; - DB::BindableLong max_extraction_rate; + DB::BindableInt32 max_extraction_rate; DB::BindableDouble current_extraction_rate; - DB::BindableLong max_hopper_amount; + DB::BindableInt32 max_hopper_amount; DB::BindableNetworkId hopper_resource; DB::BindableDouble hopper_amount; DB::BindableNetworkId resource_type; @@ -1127,7 +1127,7 @@ struct HarvesterInstallationObjectBufferRow : public DB::Row struct InstallationObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong installation_type; + DB::BindableInt32 installation_type; DB::BindableBool activated; DB::BindableDouble tick_count; DB::BindableDouble activate_start_time; @@ -1153,7 +1153,7 @@ struct InstallationObjectRow : public DB::Row struct InstallationObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong installation_type; + DB::BindableInt32 installation_type; DB::BindableBool activated; DB::BindableDouble tick_count; DB::BindableDouble activate_start_time; @@ -1201,7 +1201,7 @@ struct InstallationObjectBufferRow : public DB::Row struct IntangibleObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong count; + DB::BindableInt32 count; virtual void copy(const DB::Row &rhs) { @@ -1222,7 +1222,7 @@ struct IntangibleObjectRow : public DB::Row struct IntangibleObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong count; + DB::BindableInt32 count; IntangibleObjectBufferRow() : object_id(), @@ -1255,8 +1255,8 @@ struct IntangibleObjectBufferRow : public DB::Row struct LoadbeaconServerMapRow : public DB::Row { DB::BindableString<255> object_template; - DB::BindableLong server_id; - DB::BindableLong secondary_server_id; + DB::BindableInt32 server_id; + DB::BindableInt32 secondary_server_id; virtual void copy(const DB::Row &rhs) { @@ -1267,8 +1267,8 @@ struct LoadbeaconServerMapRow : public DB::Row struct LoadbeaconServerMapBufferRow : public DB::Row { DB::BufferString object_template; - DB::BindableLong server_id; - DB::BindableLong secondary_server_id; + DB::BindableInt32 server_id; + DB::BindableInt32 secondary_server_id; LoadbeaconServerMapBufferRow() : object_template(255), @@ -1345,9 +1345,9 @@ struct ManufactureSchematicObjectRow : public DB::Row DB::BindableNetworkId object_id; DB::BindableNetworkId creator_id; DB::BindableString<127> creator_name; - DB::BindableLong items_per_container; + DB::BindableInt32 items_per_container; DB::BindableDouble manufacture_time; - DB::BindableLong draft_schematic; + DB::BindableInt32 draft_schematic; virtual void copy(const DB::Row &rhs) { @@ -1370,9 +1370,9 @@ struct ManufactureSchematicObjectBufferRow : public DB::Row DB::BindableNetworkId object_id; DB::BindableNetworkId creator_id; DB::BufferString creator_name; - DB::BindableLong items_per_container; + DB::BindableInt32 items_per_container; DB::BindableDouble manufacture_time; - DB::BindableLong draft_schematic; + DB::BindableInt32 draft_schematic; ManufactureSchematicObjectBufferRow() : object_id(), @@ -1416,9 +1416,9 @@ struct MessageRow : public DB::Row DB::BindableNetworkId target; DB::BindableString<50> method; DB::BindableString<4000> data; - DB::BindableLong call_time; + DB::BindableInt32 call_time; DB::BindableBool guaranteed; - DB::BindableLong delivery_type; + DB::BindableInt32 delivery_type; virtual void copy(const DB::Row &rhs) { @@ -1437,9 +1437,9 @@ struct MessageBufferRow : public DB::Row DB::BindableNetworkId target; DB::BufferString method; DB::BufferString data; - DB::BindableLong call_time; + DB::BindableInt32 call_time; DB::BindableBool guaranteed; - DB::BindableLong delivery_type; + DB::BindableInt32 delivery_type; MessageBufferRow() : message_id(), @@ -1477,28 +1477,28 @@ struct MessageBufferRow : public DB::Row struct MissionObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong difficulty; + DB::BindableInt32 difficulty; DB::BindableDouble end_x; DB::BindableDouble end_y; DB::BindableDouble end_z; DB::BindableNetworkId end_cell; - DB::BindableLong end_scene; + DB::BindableInt32 end_scene; DB::BindableString<127> mission_creator; - DB::BindableLong reward; + DB::BindableInt32 reward; DB::BindableString<100> root_script_name; DB::BindableDouble start_x; DB::BindableDouble start_y; DB::BindableDouble start_z; DB::BindableNetworkId start_cell; - DB::BindableLong start_scene; + DB::BindableInt32 start_scene; DB::BindableString<100> description_table; DB::BindableString<100> description_text; DB::BindableString<100> title_table; DB::BindableString<100> title_text; DB::BindableNetworkId mission_holder_id; - DB::BindableLong status; - DB::BindableLong mission_type; - DB::BindableLong target_appearance; + DB::BindableInt32 status; + DB::BindableInt32 mission_type; + DB::BindableInt32 target_appearance; DB::BindableString<127> target_name; virtual void copy(const DB::Row &rhs) @@ -1520,28 +1520,28 @@ struct MissionObjectRow : public DB::Row struct MissionObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong difficulty; + DB::BindableInt32 difficulty; DB::BindableDouble end_x; DB::BindableDouble end_y; DB::BindableDouble end_z; DB::BindableNetworkId end_cell; - DB::BindableLong end_scene; + DB::BindableInt32 end_scene; DB::BufferString mission_creator; - DB::BindableLong reward; + DB::BindableInt32 reward; DB::BufferString root_script_name; DB::BindableDouble start_x; DB::BindableDouble start_y; DB::BindableDouble start_z; DB::BindableNetworkId start_cell; - DB::BindableLong start_scene; + DB::BindableInt32 start_scene; DB::BufferString description_table; DB::BufferString description_text; DB::BufferString title_table; DB::BufferString title_text; DB::BindableNetworkId mission_holder_id; - DB::BindableLong status; - DB::BindableLong mission_type; - DB::BindableLong target_appearance; + DB::BindableInt32 status; + DB::BindableInt32 mission_type; + DB::BindableInt32 target_appearance; DB::BufferString target_name; MissionObjectBufferRow() : @@ -1626,93 +1626,93 @@ struct ObjectRow : public DB::Row DB::BindableDouble quaternion_x; DB::BindableDouble quaternion_y; DB::BindableDouble quaternion_z; - DB::BindableLong node_x; - DB::BindableLong node_y; - DB::BindableLong node_z; - DB::BindableLong type_id; + DB::BindableInt32 node_x; + DB::BindableInt32 node_y; + DB::BindableInt32 node_z; + DB::BindableInt32 type_id; DB::BindableString<50> scene_id; - DB::BindableLong controller_type; - DB::BindableLong deleted; + DB::BindableInt32 controller_type; + DB::BindableInt32 deleted; DB::BindableString<127> object_name; - DB::BindableLong volume; + DB::BindableInt32 volume; DB::BindableNetworkId contained_by; - DB::BindableLong slot_arrangement; + DB::BindableInt32 slot_arrangement; DB::BindableBool player_controlled; - DB::BindableLong cache_version; + DB::BindableInt32 cache_version; DB::BindableBool load_contents; - DB::BindableLong cash_balance; - DB::BindableLong bank_balance; + DB::BindableInt32 cash_balance; + DB::BindableInt32 bank_balance; DB::BindableDouble complexity; DB::BindableString<500> name_string_table; DB::BindableString<500> name_string_text; - DB::BindableLong object_template_id; + DB::BindableInt32 object_template_id; DB::BindableString<128> static_item_name; - DB::BindableLong static_item_version; - DB::BindableLong conversion_id; + DB::BindableInt32 static_item_version; + DB::BindableInt32 conversion_id; DB::BindableNetworkId load_with; DB::BindableString<50> objvar_0_name; - DB::BindableLong objvar_0_type; + DB::BindableInt32 objvar_0_type; DB::BindableString<50> objvar_0_value; DB::BindableString<50> objvar_1_name; - DB::BindableLong objvar_1_type; + DB::BindableInt32 objvar_1_type; DB::BindableString<50> objvar_1_value; DB::BindableString<50> objvar_2_name; - DB::BindableLong objvar_2_type; + DB::BindableInt32 objvar_2_type; DB::BindableString<50> objvar_2_value; DB::BindableString<50> objvar_3_name; - DB::BindableLong objvar_3_type; + DB::BindableInt32 objvar_3_type; DB::BindableString<50> objvar_3_value; DB::BindableString<50> objvar_4_name; - DB::BindableLong objvar_4_type; + DB::BindableInt32 objvar_4_type; DB::BindableString<50> objvar_4_value; DB::BindableString<50> objvar_5_name; - DB::BindableLong objvar_5_type; + DB::BindableInt32 objvar_5_type; DB::BindableString<50> objvar_5_value; DB::BindableString<50> objvar_6_name; - DB::BindableLong objvar_6_type; + DB::BindableInt32 objvar_6_type; DB::BindableString<50> objvar_6_value; DB::BindableString<50> objvar_7_name; - DB::BindableLong objvar_7_type; + DB::BindableInt32 objvar_7_type; DB::BindableString<50> objvar_7_value; DB::BindableString<50> objvar_8_name; - DB::BindableLong objvar_8_type; + DB::BindableInt32 objvar_8_type; DB::BindableString<50> objvar_8_value; DB::BindableString<50> objvar_9_name; - DB::BindableLong objvar_9_type; + DB::BindableInt32 objvar_9_type; DB::BindableString<50> objvar_9_value; DB::BindableString<50> objvar_10_name; - DB::BindableLong objvar_10_type; + DB::BindableInt32 objvar_10_type; DB::BindableString<50> objvar_10_value; DB::BindableString<50> objvar_11_name; - DB::BindableLong objvar_11_type; + DB::BindableInt32 objvar_11_type; DB::BindableString<50> objvar_11_value; DB::BindableString<50> objvar_12_name; - DB::BindableLong objvar_12_type; + DB::BindableInt32 objvar_12_type; DB::BindableString<50> objvar_12_value; DB::BindableString<50> objvar_13_name; - DB::BindableLong objvar_13_type; + DB::BindableInt32 objvar_13_type; DB::BindableString<50> objvar_13_value; DB::BindableString<50> objvar_14_name; - DB::BindableLong objvar_14_type; + DB::BindableInt32 objvar_14_type; DB::BindableString<50> objvar_14_value; DB::BindableString<50> objvar_15_name; - DB::BindableLong objvar_15_type; + DB::BindableInt32 objvar_15_type; DB::BindableString<50> objvar_15_value; DB::BindableString<50> objvar_16_name; - DB::BindableLong objvar_16_type; + DB::BindableInt32 objvar_16_type; DB::BindableString<50> objvar_16_value; DB::BindableString<50> objvar_17_name; - DB::BindableLong objvar_17_type; + DB::BindableInt32 objvar_17_type; DB::BindableString<50> objvar_17_value; DB::BindableString<50> objvar_18_name; - DB::BindableLong objvar_18_type; + DB::BindableInt32 objvar_18_type; DB::BindableString<50> objvar_18_value; DB::BindableString<50> objvar_19_name; - DB::BindableLong objvar_19_type; + DB::BindableInt32 objvar_19_type; DB::BindableString<50> objvar_19_value; DB::BindableString<2000> script_list; - DB::BindableLong container_level; + DB::BindableInt32 container_level; virtual void copy(const DB::Row &rhs) { @@ -1740,89 +1740,89 @@ struct ObjectBufferRow : public DB::Row DB::BindableDouble quaternion_x; DB::BindableDouble quaternion_y; DB::BindableDouble quaternion_z; - DB::BindableLong node_x; - DB::BindableLong node_y; - DB::BindableLong node_z; - DB::BindableLong type_id; + DB::BindableInt32 node_x; + DB::BindableInt32 node_y; + DB::BindableInt32 node_z; + DB::BindableInt32 type_id; DB::BufferString scene_id; - DB::BindableLong controller_type; - DB::BindableLong deleted; + DB::BindableInt32 controller_type; + DB::BindableInt32 deleted; DB::BufferString object_name; - DB::BindableLong volume; + DB::BindableInt32 volume; DB::BindableNetworkId contained_by; - DB::BindableLong slot_arrangement; + DB::BindableInt32 slot_arrangement; DB::BindableBool player_controlled; - DB::BindableLong cache_version; + DB::BindableInt32 cache_version; DB::BindableBool load_contents; - DB::BindableLong cash_balance; - DB::BindableLong bank_balance; + DB::BindableInt32 cash_balance; + DB::BindableInt32 bank_balance; DB::BindableDouble complexity; DB::BufferString name_string_table; DB::BufferString name_string_text; - DB::BindableLong object_template_id; + DB::BindableInt32 object_template_id; DB::BufferString static_item_name; - DB::BindableLong static_item_version; - DB::BindableLong conversion_id; + DB::BindableInt32 static_item_version; + DB::BindableInt32 conversion_id; DB::BindableNetworkId load_with; DB::BufferString objvar_0_name; - DB::BindableLong objvar_0_type; + DB::BindableInt32 objvar_0_type; DB::BufferString objvar_0_value; DB::BufferString objvar_1_name; - DB::BindableLong objvar_1_type; + DB::BindableInt32 objvar_1_type; DB::BufferString objvar_1_value; DB::BufferString objvar_2_name; - DB::BindableLong objvar_2_type; + DB::BindableInt32 objvar_2_type; DB::BufferString objvar_2_value; DB::BufferString objvar_3_name; - DB::BindableLong objvar_3_type; + DB::BindableInt32 objvar_3_type; DB::BufferString objvar_3_value; DB::BufferString objvar_4_name; - DB::BindableLong objvar_4_type; + DB::BindableInt32 objvar_4_type; DB::BufferString objvar_4_value; DB::BufferString objvar_5_name; - DB::BindableLong objvar_5_type; + DB::BindableInt32 objvar_5_type; DB::BufferString objvar_5_value; DB::BufferString objvar_6_name; - DB::BindableLong objvar_6_type; + DB::BindableInt32 objvar_6_type; DB::BufferString objvar_6_value; DB::BufferString objvar_7_name; - DB::BindableLong objvar_7_type; + DB::BindableInt32 objvar_7_type; DB::BufferString objvar_7_value; DB::BufferString objvar_8_name; - DB::BindableLong objvar_8_type; + DB::BindableInt32 objvar_8_type; DB::BufferString objvar_8_value; DB::BufferString objvar_9_name; - DB::BindableLong objvar_9_type; + DB::BindableInt32 objvar_9_type; DB::BufferString objvar_9_value; DB::BufferString objvar_10_name; - DB::BindableLong objvar_10_type; + DB::BindableInt32 objvar_10_type; DB::BufferString objvar_10_value; DB::BufferString objvar_11_name; - DB::BindableLong objvar_11_type; + DB::BindableInt32 objvar_11_type; DB::BufferString objvar_11_value; DB::BufferString objvar_12_name; - DB::BindableLong objvar_12_type; + DB::BindableInt32 objvar_12_type; DB::BufferString objvar_12_value; DB::BufferString objvar_13_name; - DB::BindableLong objvar_13_type; + DB::BindableInt32 objvar_13_type; DB::BufferString objvar_13_value; DB::BufferString objvar_14_name; - DB::BindableLong objvar_14_type; + DB::BindableInt32 objvar_14_type; DB::BufferString objvar_14_value; DB::BufferString objvar_15_name; - DB::BindableLong objvar_15_type; + DB::BindableInt32 objvar_15_type; DB::BufferString objvar_15_value; DB::BufferString objvar_16_name; - DB::BindableLong objvar_16_type; + DB::BindableInt32 objvar_16_type; DB::BufferString objvar_16_value; DB::BufferString objvar_17_name; - DB::BindableLong objvar_17_type; + DB::BindableInt32 objvar_17_type; DB::BufferString objvar_17_value; DB::BufferString objvar_18_name; - DB::BindableLong objvar_18_type; + DB::BindableInt32 objvar_18_type; DB::BufferString objvar_18_value; DB::BufferString objvar_19_name; - DB::BindableLong objvar_19_type; + DB::BindableInt32 objvar_19_type; DB::BufferString objvar_19_value; DB::BufferString script_list; @@ -2096,8 +2096,8 @@ struct PlayerQuestObjectRow : public DB::Row DB::BindableString<256> title; DB::BindableString<4000> description; DB::BindableNetworkId creator; - DB::BindableLong total_tasks; - DB::BindableLong difficulty; + DB::BindableInt32 total_tasks; + DB::BindableInt32 difficulty; DB::BindableString<128> task_title1; DB::BindableString<4000> task_description1; DB::BindableString<128> task_title2; @@ -2145,8 +2145,8 @@ struct PlayerQuestObjectBufferRow : public DB::Row DB::BufferString title; DB::BufferString description; DB::BindableNetworkId creator; - DB::BindableLong total_tasks; - DB::BindableLong difficulty; + DB::BindableInt32 total_tasks; + DB::BindableInt32 difficulty; DB::BufferString task_title1; DB::BufferString task_description1; DB::BufferString task_title2; @@ -2259,7 +2259,7 @@ struct PlayerQuestObjectBufferRow : public DB::Row struct PropertyListRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong list_id; + DB::BindableInt32 list_id; DB::BindableString<500> value; virtual void copy(const DB::Row &rhs) @@ -2271,7 +2271,7 @@ struct PropertyListRow : public DB::Row struct PropertyListBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong list_id; + DB::BindableInt32 list_id; DB::BufferString value; PropertyListBufferRow() : @@ -2298,7 +2298,7 @@ struct ResourceContainerObjectRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableNetworkId resource_type; - DB::BindableLong quantity; + DB::BindableInt32 quantity; DB::BindableNetworkId source; virtual void copy(const DB::Row &rhs) @@ -2321,7 +2321,7 @@ struct ResourceContainerObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; DB::BindableNetworkId resource_type; - DB::BindableLong quantity; + DB::BindableInt32 quantity; DB::BindableNetworkId source; ResourceContainerObjectBufferRow() : @@ -2363,7 +2363,7 @@ struct ResourceTypeRow : public DB::Row DB::BindableString<100> resource_class; DB::BindableString<1024> attributes; DB::BindableString<1024> fractal_seeds; - DB::BindableLong depleted_timestamp; + DB::BindableInt32 depleted_timestamp; virtual void copy(const DB::Row &rhs) { @@ -2378,7 +2378,7 @@ struct ResourceTypeBufferRow : public DB::Row DB::BufferString resource_class; DB::BufferString attributes; DB::BufferString fractal_seeds; - DB::BindableLong depleted_timestamp; + DB::BindableInt32 depleted_timestamp; ResourceTypeBufferRow() : resource_id(), @@ -2409,9 +2409,9 @@ struct ResourceTypeBufferRow : public DB::Row struct ScriptRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong sequence_no; + DB::BindableInt32 sequence_no; DB::BindableString<100> script; - DB::BindableLong detached; + DB::BindableInt32 detached; virtual void copy(const DB::Row &rhs) { @@ -2422,9 +2422,9 @@ struct ScriptRow : public DB::Row struct ScriptBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong sequence_no; + DB::BindableInt32 sequence_no; DB::BufferString script; - DB::BindableLong detached; + DB::BindableInt32 detached; ScriptBufferRow() : object_id(), @@ -2454,7 +2454,7 @@ struct ShipObjectRow : public DB::Row DB::BindableDouble slide_dampener; DB::BindableDouble current_chassis_hit_points; DB::BindableDouble maximum_chassis_hit_points; - DB::BindableLong chassis_type; + DB::BindableInt32 chassis_type; DB::BindableString<400> cmp_armor_hp_maximum; DB::BindableString<400> cmp_armor_hp_current; DB::BindableString<400> cmp_efficiency_general; @@ -2499,8 +2499,8 @@ struct ShipObjectRow : public DB::Row DB::BindableNetworkId installed_dcd; DB::BindableDouble chassis_cmp_mass_maximum; DB::BindableString<400> cmp_creators; - DB::BindableLong cargo_hold_contents_maximum; - DB::BindableLong cargo_hold_contents_current; + DB::BindableInt32 cargo_hold_contents_maximum; + DB::BindableInt32 cargo_hold_contents_current; DB::BindableString<500> cargo_hold_contents; virtual void copy(const DB::Row &rhs) @@ -2525,7 +2525,7 @@ struct ShipObjectBufferRow : public DB::Row DB::BindableDouble slide_dampener; DB::BindableDouble current_chassis_hit_points; DB::BindableDouble maximum_chassis_hit_points; - DB::BindableLong chassis_type; + DB::BindableInt32 chassis_type; DB::BufferString cmp_armor_hp_maximum; DB::BufferString cmp_armor_hp_current; DB::BufferString cmp_efficiency_general; @@ -2570,8 +2570,8 @@ struct ShipObjectBufferRow : public DB::Row DB::BindableNetworkId installed_dcd; DB::BindableDouble chassis_cmp_mass_maximum; DB::BufferString cmp_creators; - DB::BindableLong cargo_hold_contents_maximum; - DB::BindableLong cargo_hold_contents_current; + DB::BindableInt32 cargo_hold_contents_maximum; + DB::BindableInt32 cargo_hold_contents_current; DB::BufferString cargo_hold_contents; ShipObjectBufferRow() : @@ -2755,19 +2755,19 @@ struct StaticObjectBufferRow : public DB::Row struct TangibleObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong max_hit_points; + DB::BindableInt32 max_hit_points; DB::BindableNetworkId owner_id; DB::BindableBool visible; DB::BindableString<2000> appearance_data; - DB::BindableLong interest_radius; - DB::BindableLong pvp_type; - DB::BindableLong pvp_faction; - DB::BindableLong damage_taken; + DB::BindableInt32 interest_radius; + DB::BindableInt32 pvp_type; + DB::BindableInt32 pvp_faction; + DB::BindableInt32 damage_taken; DB::BindableString<2000> custom_appearance; - DB::BindableLong count; - DB::BindableLong condition; + DB::BindableInt32 count; + DB::BindableInt32 condition; DB::BindableNetworkId creator_id; - DB::BindableLong source_draft_schematic; + DB::BindableInt32 source_draft_schematic; virtual void copy(const DB::Row &rhs) { @@ -2788,19 +2788,19 @@ struct TangibleObjectRow : public DB::Row struct TangibleObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong max_hit_points; + DB::BindableInt32 max_hit_points; DB::BindableNetworkId owner_id; DB::BindableBool visible; DB::BufferString appearance_data; - DB::BindableLong interest_radius; - DB::BindableLong pvp_type; - DB::BindableLong pvp_faction; - DB::BindableLong damage_taken; + DB::BindableInt32 interest_radius; + DB::BindableInt32 pvp_type; + DB::BindableInt32 pvp_faction; + DB::BindableInt32 damage_taken; DB::BufferString custom_appearance; - DB::BindableLong count; - DB::BindableLong condition; + DB::BindableInt32 count; + DB::BindableInt32 condition; DB::BindableNetworkId creator_id; - DB::BindableLong source_draft_schematic; + DB::BindableInt32 source_draft_schematic; TangibleObjectBufferRow() : object_id(), @@ -2973,7 +2973,7 @@ struct UniverseObjectBufferRow : public DB::Row struct VehicleObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong bogus; + DB::BindableInt32 bogus; virtual void copy(const DB::Row &rhs) { @@ -2994,7 +2994,7 @@ struct VehicleObjectRow : public DB::Row struct VehicleObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong bogus; + DB::BindableInt32 bogus; VehicleObjectBufferRow() : object_id(), @@ -3027,15 +3027,15 @@ struct VehicleObjectBufferRow : public DB::Row struct WeaponObjectRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong min_damage; - DB::BindableLong max_damage; - DB::BindableLong damage_type; - DB::BindableLong elemental_type; - DB::BindableLong elemental_value; + DB::BindableInt32 min_damage; + DB::BindableInt32 max_damage; + DB::BindableInt32 damage_type; + DB::BindableInt32 elemental_type; + DB::BindableInt32 elemental_value; DB::BindableDouble attack_speed; DB::BindableDouble wound_chance; - DB::BindableLong accuracy; - DB::BindableLong attack_cost; + DB::BindableInt32 accuracy; + DB::BindableInt32 attack_cost; DB::BindableDouble damage_radius; DB::BindableDouble min_range; DB::BindableDouble max_range; @@ -3059,15 +3059,15 @@ struct WeaponObjectRow : public DB::Row struct WeaponObjectBufferRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong min_damage; - DB::BindableLong max_damage; - DB::BindableLong damage_type; - DB::BindableLong elemental_type; - DB::BindableLong elemental_value; + DB::BindableInt32 min_damage; + DB::BindableInt32 max_damage; + DB::BindableInt32 damage_type; + DB::BindableInt32 elemental_type; + DB::BindableInt32 elemental_value; DB::BindableDouble attack_speed; DB::BindableDouble wound_chance; - DB::BindableLong accuracy; - DB::BindableLong attack_cost; + DB::BindableInt32 accuracy; + DB::BindableInt32 attack_cost; DB::BindableDouble damage_radius; DB::BindableDouble min_range; DB::BindableDouble max_range; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/BountyHunterTargetQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/BountyHunterTargetQuery.h index 0284094b..3f2a06ed 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/BountyHunterTargetQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/BountyHunterTargetQuery.h @@ -41,7 +41,7 @@ namespace DBQuery private: DB::BindableVarrayString m_object_ids; DB::BindableVarrayString m_target_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h index 55469272..7f50272c 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h @@ -51,7 +51,7 @@ private: DB::BindableVarrayNumber m_status; DB::BindableVarrayString m_search_enabled; DB::BindableVarrayNumber m_entrance_charge; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class AuctionLocationsQuerySelect : public DB::Query @@ -114,7 +114,7 @@ private: DB::BindableVarrayNumber m_actives; DB::BindableVarrayNumber m_item_sizes; DB::BindableVarrayNumber m_object_template_ids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class MarketAuctionsQuerySelect : public DB::Query @@ -165,7 +165,7 @@ private: DB::BindableVarrayString m_bidder_ids; DB::BindableVarrayNumber m_bids; DB::BindableVarrayNumber m_max_proxy_bids; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class MarketAuctionBidsQuerySelect : public DB::Query @@ -215,7 +215,7 @@ private: DB::BindableVarrayString m_item_ids; DB::BindableVarrayString m_attribute_names; DB::BindableVarrayString m_attribute_values; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; // ====================================================================== diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesSchema.h b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesSchema.h index f9ed09f9..0e155ad3 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesSchema.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesSchema.h @@ -23,14 +23,14 @@ struct AuctionLocationsRow : public DB::Row DB::BindableNetworkId location_id; DB::BindableString<256> location_name; DB::BindableNetworkId owner_id; - DB::BindableLong sales_tax; + DB::BindableInt32 sales_tax; DB::BindableNetworkId sales_tax_bank_id; - DB::BindableLong empty_date; - DB::BindableLong last_access_date; - DB::BindableLong inactive_date; - DB::BindableLong status; + DB::BindableInt32 empty_date; + DB::BindableInt32 last_access_date; + DB::BindableInt32 inactive_date; + DB::BindableInt32 status; DB::BindableBool search_enabled; - DB::BindableLong entrance_charge; + DB::BindableInt32 entrance_charge; virtual void copy(const DB::Row &rhs) { @@ -71,17 +71,17 @@ struct MarketAuctionsRow : public DB::Row DB::BindableNetworkId owner_id; DB::BindableNetworkId creator_id; DB::BindableNetworkId location_id; - DB::BindableLong min_bid; - DB::BindableLong buy_now_price; - DB::BindableLong auction_timer; + DB::BindableInt32 min_bid; + DB::BindableInt32 buy_now_price; + DB::BindableInt32 auction_timer; DB::BindableString<4000> oob; DB::BindableUnicode<1024>user_description; - DB::BindableLong category; + DB::BindableInt32 category; DB::BindableUnicode<1024>item_name; - DB::BindableLong item_timer; - DB::BindableLong active; - DB::BindableLong item_size; - DB::BindableLong object_template_id; + DB::BindableInt32 item_timer; + DB::BindableInt32 active; + DB::BindableInt32 item_size; + DB::BindableInt32 object_template_id; virtual void copy(const DB::Row &rhs) { @@ -155,7 +155,7 @@ struct MarketAuctionsRowUpdate : public DB::Row DB::BindableNetworkId item_id; DB::BindableNetworkId owner_id; - DB::BindableLong active; + DB::BindableInt32 active; virtual void copy(const DB::Row &rhs) { @@ -193,8 +193,8 @@ struct MarketAuctionBidsRow : public DB::Row DB::BindableNetworkId item_id; DB::BindableNetworkId bidder_id; - DB::BindableLong bid; - DB::BindableLong max_proxy_bid; + DB::BindableInt32 bid; + DB::BindableInt32 max_proxy_bid; virtual void copy(const DB::Row &rhs) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/DeleteDemandLoadedContainerQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/DeleteDemandLoadedContainerQuery.h index 614e36ca..44fe7b1c 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/DeleteDemandLoadedContainerQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/DeleteDemandLoadedContainerQuery.h @@ -38,7 +38,7 @@ namespace DBQuery private: DB::BindableVarrayString object_ids; DB::BindableVarrayNumber reasons; - DB::BindableLong num_items; + DB::BindableInt32 num_items; private: DeleteDemandLoadedContainerQuery(const DeleteDemandLoadedContainerQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/LocationQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/LocationQuery.h index 21eb81f1..188ff1df 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/LocationQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/LocationQuery.h @@ -32,9 +32,9 @@ namespace DBQuery public: DB::BindableNetworkId object_id; - DB::BindableLong list_id; - DB::BindableLong index; - DB::BindableLong action; + DB::BindableInt32 list_id; + DB::BindableInt32 index; + DB::BindableInt32 action; DB::BindableUnicode<255> name; DB::BindableString<50> scene; DB::BindableDouble x; @@ -55,8 +55,8 @@ namespace DBQuery struct LocationRow { DB::BindableNetworkId object_id; - DB::BindableLong list_id; - DB::BindableLong index; + DB::BindableInt32 list_id; + DB::BindableInt32 index; DB::BindableUnicode<255> name; DB::BindableString<50> scene; DB::BindableDouble x; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h index 61fa760e..517cfea6 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h @@ -21,7 +21,7 @@ namespace DBSchema struct ManufactureSchematicAttributeRow : public DB::Row { DB::BindableNetworkId object_id; - DB::BindableLong action; + DB::BindableInt32 action; DB::BindableString<500> attribute_type; DB::BindableDouble value; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/MessageQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/MessageQuery.h index dcd9cf55..2f52712b 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/MessageQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/MessageQuery.h @@ -46,8 +46,8 @@ namespace DBQuery DB::BindableVarrayNumber m_call_times; DB::BindableVarrayString m_guaranteeds; DB::BindableVarrayNumber m_delivery_types; - DB::BindableLong m_numItems; - DB::BindableLong m_enableDatabaseLogging; + DB::BindableInt32 m_numItems; + DB::BindableInt32 m_enableDatabaseLogging; private: SaveMessageQuery(const SaveMessageQuery&); // disable @@ -74,8 +74,8 @@ namespace DBQuery private: DB::BindableVarrayString m_message_ids; - DB::BindableLong m_numItems; - DB::BindableLong m_enableDatabaseLogging; + DB::BindableInt32 m_numItems; + DB::BindableInt32 m_enableDatabaseLogging; private: AckMessageQuery(const AckMessageQuery&); // disable @@ -94,9 +94,9 @@ namespace DBQuery DB::BindableNetworkId object_id; DB::BindableString<50> method; DB::BindableString<4000> packed_data; - DB::BindableLong call_time; + DB::BindableInt32 call_time; DB::BindableBool guaranteed; - DB::BindableLong delivery_type; + DB::BindableInt32 delivery_type; }; public: diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h b/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h index 44aef98f..aeec7b3c 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h @@ -47,7 +47,7 @@ namespace DBQuery DB::BindableVarrayNumber m_nameIds; DB::BindableVarrayNumber m_types; DB::BindableVarrayString m_values; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class AddObjectVariableQuery : public GenericObjectVariableQuery @@ -93,7 +93,7 @@ namespace DBQuery private: DB::BindableVarrayString m_objectIds; DB::BindableVarrayNumber m_nameIds; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; /** diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h index 2817fe3d..d3640f9f 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h @@ -135,7 +135,7 @@ namespace DBQuery DB::BindableVarrayString m_objvar_19_values; DB::BindableVarrayString m_script_lists; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; class ObjectsTableQuerySelect : public DB::Query diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/OfflineMoneyCustomPersistStep.cpp b/game/server/application/SwgDatabaseServer/src/shared/queries/OfflineMoneyCustomPersistStep.cpp index e70e9a61..d1d2b1e5 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/OfflineMoneyCustomPersistStep.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/OfflineMoneyCustomPersistStep.cpp @@ -49,7 +49,7 @@ namespace OfflineMoneyCustomPersistStepNamespace private: DB::BindableNetworkId m_sourceObject; - DB::BindableLong m_amount; + DB::BindableInt32 m_amount; DB::BindableBool m_result; private: diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h index 32a49ffa..76e363d4 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h @@ -30,8 +30,8 @@ namespace DBSchema }; DB::BindableNetworkId object_id; - DB::BindableLong list_id; - DB::BindableLong operation; + DB::BindableInt32 list_id; + DB::BindableInt32 operation; DB::BindableString<500> value; //TODO: size virtual void copy(const DB::Row &rhs) @@ -67,9 +67,9 @@ namespace DBQuery DB::BindableVarrayString m_object_ids; DB::BindableVarrayNumber m_list_ids; DB::BindableVarrayString m_values; - DB::BindableLong m_operations; - DB::BindableLong m_numItems; - DB::BindableLong m_enableDatabaseLogging; + DB::BindableInt32 m_operations; + DB::BindableInt32 m_numItems; + DB::BindableInt32 m_enableDatabaseLogging; PropertyListQuery(const PropertyListQuery&); // disable PropertyListQuery& operator=(const PropertyListQuery&); // disable diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/ResourceTypeQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/ResourceTypeQuery.h index 3a364ddf..5b1103fa 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/ResourceTypeQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/ResourceTypeQuery.h @@ -45,7 +45,7 @@ namespace DBQuery DB::BindableVarrayString m_attributes; DB::BindableVarrayString m_fractal_seeds; DB::BindableVarrayNumber m_depleted_timestamps; - DB::BindableLong m_numItems; + DB::BindableInt32 m_numItems; }; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h b/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h index b0514a7e..66b950e7 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h @@ -28,8 +28,8 @@ namespace DBSchema }; DB::BindableNetworkId object_id; - DB::BindableLong index; - DB::BindableLong operation; + DB::BindableInt32 index; + DB::BindableInt32 operation; DB::BindableString<500> skill; //TODO: size virtual void copy(const DB::Row &rhs) diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetAuctionList.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetAuctionList.h index 418710df..0ca44a37 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetAuctionList.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetAuctionList.h @@ -28,20 +28,20 @@ namespace DBSchema struct AuctionRow : public DB::Row { DB::BindableNetworkId creatorId; - DB::BindableLong minBid; - DB::BindableLong auctionTimer; - DB::BindableLong buyNowPrice; + DB::BindableInt32 minBid; + DB::BindableInt32 auctionTimer; + DB::BindableInt32 buyNowPrice; DB::BindableUnicode<1024> userDescription; DB::BindableString<4000> oob; DB::BindableNetworkId locationId; DB::BindableNetworkId itemId; - DB::BindableLong category; - DB::BindableLong itemTimer; + DB::BindableInt32 category; + DB::BindableInt32 itemTimer; DB::BindableUnicode<1024> itemName; DB::BindableNetworkId ownerId; - DB::BindableLong active; - DB::BindableLong itemSize; - DB::BindableLong itemTemplateId; + DB::BindableInt32 active; + DB::BindableInt32 itemSize; + DB::BindableInt32 itemTemplateId; virtual void copy(const DB::Row &rhs) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetBidList.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetBidList.h index 021147a3..adb4f6eb 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetBidList.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetBidList.h @@ -27,8 +27,8 @@ namespace DBSchema { DB::BindableNetworkId itemId; DB::BindableNetworkId bidderId; - DB::BindableLong bid; - DB::BindableLong maxProxyBid; + DB::BindableInt32 bid; + DB::BindableInt32 maxProxyBid; virtual void copy(const DB::Row &rhs) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetLocationList.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetLocationList.h index 4529ad90..19871723 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetLocationList.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetLocationList.h @@ -28,14 +28,14 @@ namespace DBSchema DB::BindableNetworkId locationId; DB::BindableNetworkId ownerId; DB::BindableString<256> locationString; - DB::BindableLong salesTax; + DB::BindableInt32 salesTax; DB::BindableNetworkId salesTaxBankId; - DB::BindableLong emptyDate; - DB::BindableLong lastAccessDate; - DB::BindableLong inactiveDate; - DB::BindableLong status; + DB::BindableInt32 emptyDate; + DB::BindableInt32 lastAccessDate; + DB::BindableInt32 inactiveDate; + DB::BindableInt32 status; DB::BindableBool searchEnabled; - DB::BindableLong entranceCharge; + DB::BindableInt32 entranceCharge; virtual void copy(const DB::Row &rhs) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLoadObjvarNames.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLoadObjvarNames.h index 0c85a1d0..3b11d4c7 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLoadObjvarNames.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLoadObjvarNames.h @@ -29,7 +29,7 @@ class TaskLoadObjvarNames : public DB::TaskRequest private: struct ObjvarNameRow { - DB::BindableLong name_id; + DB::BindableInt32 name_id; DB::BindableString<500> name; }; diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLocateStructure.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLocateStructure.h index 9723fe22..e34903d4 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLocateStructure.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLocateStructure.h @@ -42,10 +42,10 @@ class TaskLocateStructure:public DB::TaskRequest DB::BindableNetworkId item_id; //output: - DB::BindableLong x; - DB::BindableLong z; + DB::BindableInt32 x; + DB::BindableInt32 z; DB::BindableString<50> sceneId; - DB::BindableLong found; + DB::BindableInt32 found; private: LocateStructureQuery(const LocateStructureQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskMoveToPlayer.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskMoveToPlayer.h index 9d1ccc69..11543009 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskMoveToPlayer.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskMoveToPlayer.h @@ -43,7 +43,7 @@ class TaskMoveToPlayer:public DB::TaskRequest DB::BindableNetworkId player; //output: - DB::BindableLong result; + DB::BindableInt32 result; private: MoveToPlayerQuery(const MoveToPlayerQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h index 2e043f3d..d0f3eb09 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h @@ -43,10 +43,10 @@ class TaskRestoreCharacter:public DB::TaskRequest DB::BindableNetworkId character_id; //output: - DB::BindableLong result; + DB::BindableInt32 result; DB::BindableString<127> character_name; - DB::BindableLong account; - DB::BindableLong template_id; + DB::BindableInt32 account; + DB::BindableInt32 template_id; private: RestoreCharacterQuery(const RestoreCharacterQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreHouse.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreHouse.h index 8b04e6bd..ffe5bc90 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreHouse.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreHouse.h @@ -42,7 +42,7 @@ class TaskRestoreHouse:public DB::TaskRequest DB::BindableNetworkId house_id; //output: - DB::BindableLong result; + DB::BindableInt32 result; private: RestoreHouseQuery(const RestoreHouseQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.h index 9dcfc58b..e7422d7b 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.h @@ -39,7 +39,7 @@ class TaskSaveObjvarNames : public DB::TaskRequest virtual QueryMode getExecutionMode () const; public: - DB::BindableLong name_id; + DB::BindableInt32 name_id; DB::BindableString<500> name; private: diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskUndeleteItem.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskUndeleteItem.h index c5d08f76..dd5d649f 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskUndeleteItem.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskUndeleteItem.h @@ -42,7 +42,7 @@ class TaskUndeleteItem:public DB::TaskRequest DB::BindableNetworkId item_id; //output: - DB::BindableLong result; + DB::BindableInt32 result; private: UndeleteItemQuery(const UndeleteItemQuery&); diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h index c9d69a69..5da1d837 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h @@ -47,7 +47,7 @@ class TaskVerifyCharacter:public DB::TaskRequest public: // input: - DB::BindableLong station_id; //lint !e1925 public data member Suppresed because it's in a private inner class + DB::BindableInt32 station_id; //lint !e1925 public data member Suppresed because it's in a private inner class DB::BindableNetworkId character_id; //lint !e1925 public data member Suppresed because it's in a private inner class DB::BindableString<50> gold_schema; //lint !e1925 public data member Suppresed because it's in a private inner class @@ -59,7 +59,7 @@ class TaskVerifyCharacter:public DB::TaskRequest DB::BindableDouble x; //lint !e1925 public data member Suppresed because it's in a private inner class DB::BindableDouble y; //lint !e1925 public data member Suppresed because it's in a private inner class DB::BindableDouble z; //lint !e1925 public data member Suppresed because it's in a private inner class - DB::BindableLong containment_flag; + DB::BindableInt32 containment_flag; private: VerifyCharacterQuery(const VerifyCharacterQuery&);