projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node definition manager refactor (#7016)
[oweals/minetest.git]
/
src
/
staticobject.h
diff --git
a/src/staticobject.h
b/src/staticobject.h
index fb73befd38f3b405d321e64a90822e0f8453b09a..43f542632298a981ec2c3989f0c69009511f6508 100644
(file)
--- a/
src/staticobject.h
+++ b/
src/staticobject.h
@@
-17,8
+17,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef STATICOBJECT_HEADER
-#define STATICOBJECT_HEADER
+#pragma once
#include "irrlichttypes_bloated.h"
#include <string>
#include "irrlichttypes_bloated.h"
#include <string>
@@
-33,8
+32,8
@@
struct StaticObject
v3f pos;
std::string data;
v3f pos;
std::string data;
- StaticObject()
{}
- StaticObject(u8 type_,
v3f
pos_, const std::string &data_):
+ StaticObject()
= default;
+ StaticObject(u8 type_,
const v3f &
pos_, const std::string &data_):
type(type_),
pos(pos_),
data(data_)
type(type_),
pos(pos_),
data(data_)
@@
-52,7
+51,7
@@
public:
Inserts an object to the container.
Id must be unique (active) or 0 (stored).
*/
Inserts an object to the container.
Id must be unique (active) or 0 (stored).
*/
- void insert(u16 id,
StaticObject
obj)
+ void insert(u16 id,
const StaticObject &
obj)
{
if(id == 0)
{
{
if(id == 0)
{
@@
-95,6
+94,3
@@
public:
private:
};
private:
};
-
-#endif
-