projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove FPS from being next to the version string
[oweals/minetest.git]
/
src
/
itemdef.h
diff --git
a/src/itemdef.h
b/src/itemdef.h
index dd20ba353a403476de70da40d7431af6ab80ff1d..f993fdbac490181ab7627ea00f680e91f145bb4e 100644
(file)
--- a/
src/itemdef.h
+++ b/
src/itemdef.h
@@
-26,6
+26,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream>
#include <set>
#include "itemgroup.h"
#include <iostream>
#include <set>
#include "itemgroup.h"
+#include "sound.h"
class IGameDef;
struct ToolCapabilities;
class IGameDef;
struct ToolCapabilities;
@@
-66,6
+67,8
@@
struct ItemDefinition
// May be NULL. If non-NULL, deleted by destructor
ToolCapabilities *tool_capabilities;
ItemGroupList groups;
// May be NULL. If non-NULL, deleted by destructor
ToolCapabilities *tool_capabilities;
ItemGroupList groups;
+ SimpleSoundSpec sound_place;
+ f32 range;
// Client shall immediately place this node when player places the item.
// Server will update the precise end result a moment later.
// Client shall immediately place this node when player places the item.
// Server will update the precise end result a moment later.
@@
-80,7
+83,7
@@
struct ItemDefinition
ItemDefinition& operator=(const ItemDefinition &def);
~ItemDefinition();
void reset();
ItemDefinition& operator=(const ItemDefinition &def);
~ItemDefinition();
void reset();
- void serialize(std::ostream &os) const;
+ void serialize(std::ostream &os
, u16 protocol_version
) const;
void deSerialize(std::istream &is);
private:
void resetInitial();
void deSerialize(std::istream &is);
private:
void resetInitial();
@@
-109,7
+112,7
@@
public:
IGameDef *gamedef) const=0;
#endif
IGameDef *gamedef) const=0;
#endif
- virtual void serialize(std::ostream &os)=0;
+ virtual void serialize(std::ostream &os
, u16 protocol_version
)=0;
};
class IWritableItemDefManager : public IItemDefManager
};
class IWritableItemDefManager : public IItemDefManager
@@
-146,7
+149,7
@@
public:
virtual void registerAlias(const std::string &name,
const std::string &convert_to)=0;
virtual void registerAlias(const std::string &name,
const std::string &convert_to)=0;
- virtual void serialize(std::ostream &os)=0;
+ virtual void serialize(std::ostream &os
, u16 protocol_version
)=0;
virtual void deSerialize(std::istream &is)=0;
// Do stuff asked by threads that can only be done in the main thread
virtual void deSerialize(std::istream &is)=0;
// Do stuff asked by threads that can only be done in the main thread