projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mapgens: Rename m_emerge to prevent name collisions
[oweals/minetest.git]
/
src
/
object_properties.h
diff --git
a/src/object_properties.h
b/src/object_properties.h
index 3ab488f92bade29b843425926888dcd5bc225753..4b7f9a5eb4f5c8501bf1d31f497dd73d08e8b24e 100644
(file)
--- a/
src/object_properties.h
+++ b/
src/object_properties.h
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
2
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@
-24,28
+24,29
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h"
#include <iostream>
#include <map>
#include "irrlichttypes_bloated.h"
#include <iostream>
#include <map>
+#include <vector>
struct ObjectProperties
{
// Values are BS=1
s16 hp_max;
bool physical;
struct ObjectProperties
{
// Values are BS=1
s16 hp_max;
bool physical;
+ bool collideWithObjects;
float weight;
core::aabbox3d<f32> collisionbox;
std::string visual;
std::string mesh;
float weight;
core::aabbox3d<f32> collisionbox;
std::string visual;
std::string mesh;
- core::vector2d<int> animation_frames;
- float animation_speed;
- float animation_blend;
- std::map<std::string, v3f> animation_bone_position;
- std::map<std::string, v3f> animation_bone_rotation;
v2f visual_size;
v2f visual_size;
- core::array<std::string> textures;
+ std::vector<std::string> textures;
+ std::vector<video::SColor> colors;
v2s16 spritediv;
v2s16 initial_sprite_basepos;
bool is_visible;
bool makes_footstep_sound;
float automatic_rotate;
v2s16 spritediv;
v2s16 initial_sprite_basepos;
bool is_visible;
bool makes_footstep_sound;
float automatic_rotate;
+ f32 stepheight;
+ bool automatic_face_movement_dir;
+ f32 automatic_face_movement_dir_offset;
ObjectProperties();
ObjectProperties();