Merge pull request #29 from devnexen/further_changes

Non-trivial copiable object fixes, limited to the engine's itself
This commit is contained in:
Amy Ackermann
2018-07-29 11:36:43 -07:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -132,7 +132,7 @@ void Blueprint::create(Object* obj, const Design* design) {
data[i] = new CScriptAny(devices.scripts.server->engine);
memset(effectorStates, 0, design->effectorStateCount * sizeof(double));
memset(effectorTargets, 0, design->effectorCount * sizeof(EffectorTarget));
memset(reinterpret_cast<void *>(effectorTargets), 0, design->effectorCount * sizeof(EffectorTarget));
for(unsigned i = 0; i < cnt; ++i) {
auto& sys = design->subsystems[i];
+1 -1
View File
@@ -913,7 +913,7 @@ public:
type.grab();
states = new double[type.type.stateCount]();
memset(&target, 0, sizeof(EffectorTarget));
memset(reinterpret_cast<void *>(&target), 0, sizeof(EffectorTarget));
target.tracking = vec3d::front();
}
+2 -2
View File
@@ -25,7 +25,7 @@ struct frustum {
}
void operator=(const frustum& other) {
memcpy(this, &other, sizeof(frustum));
memcpy(reinterpret_cast<void *>(this), &other, sizeof(frustum));
}
bool overlaps(const vec3d& center, double radius) const {
@@ -34,4 +34,4 @@ struct frustum {
return false;
return true;
}
};
};