diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2022-06-20 21:56:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 21:56:12 +0200 |
| commit | a463620edbe57071a7101297d33226507567ca73 (patch) | |
| tree | 342d433ca55f4e3d1826508c303f2e6229d503f1 /src/itemdef.h | |
| parent | 0b41533763bc9f104a2da2e4191f4654b8d8dab4 (diff) | |
| download | minetest-a463620edbe57071a7101297d33226507567ca73.tar.gz minetest-a463620edbe57071a7101297d33226507567ca73.tar.bz2 minetest-a463620edbe57071a7101297d33226507567ca73.zip | |
Re-order sound-related code (#12382)
Dropped ServerSoundParams -> moved to ServerPlayingSound. This gets rid of the duplicated
'fade' and 'pitch' values on server-side where only one was used anyway.
SimpleSoundSpec is the basic sound without positional information, hence 'loop' is included.
Recursively added PROTOCOL_VERSION to most functions to reduce the versioning mess in the
future. Per-type version numbers are kept for now as a safety rope in a special case.
Diffstat (limited to 'src/itemdef.h')
| -rw-r--r-- | src/itemdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/itemdef.h b/src/itemdef.h index 3e302840f..035717379 100644 --- a/src/itemdef.h +++ b/src/itemdef.h @@ -97,7 +97,7 @@ struct ItemDefinition ~ItemDefinition(); void reset(); void serialize(std::ostream &os, u16 protocol_version) const; - void deSerialize(std::istream &is); + void deSerialize(std::istream &is, u16 protocol_version); private: void resetInitial(); }; @@ -177,7 +177,7 @@ public: const std::string &convert_to)=0; virtual void serialize(std::ostream &os, u16 protocol_version)=0; - virtual void deSerialize(std::istream &is)=0; + virtual void deSerialize(std::istream &is, u16 protocol_version)=0; // Do stuff asked by threads that can only be done in the main thread virtual void processQueue(IGameDef *gamedef)=0; |