From f648fb76aef96a1da608c64346fc65d4dd44caa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Fri, 10 Apr 2020 19:49:20 +0200
Subject: Drop genericobject.{cpp,h} (#9629)

* Drop genericobject.{cpp,h}

This file is not for generic object but for ActiveObject message passing.
Put ownership of the various commands to the right objects and cleanup the related code.

* Protect ServerActiveObject::m_messages_out

* typo fix
---
 src/genericobject.cpp | 207 --------------------------------------------------
 1 file changed, 207 deletions(-)
 delete mode 100644 src/genericobject.cpp

(limited to 'src/genericobject.cpp')

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
deleted file mode 100644
index 49d16001f..000000000
--- a/src/genericobject.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 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
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "genericobject.h"
-#include <sstream>
-#include "util/serialize.h"
-
-std::string gob_cmd_set_properties(const ObjectProperties &prop)
-{
-	std::ostringstream os(std::ios::binary);
-	writeU8(os, GENERIC_CMD_SET_PROPERTIES);
-	prop.serialize(os);
-	return os.str();
-}
-
-ObjectProperties gob_read_set_properties(std::istream &is)
-{
-	ObjectProperties prop;
-	prop.deSerialize(is);
-	return prop;
-}
-
-std::string gob_cmd_update_position(
-	v3f position,
-	v3f velocity,
-	v3f acceleration,
-	v3f rotation,
-	bool do_interpolate,
-	bool is_movement_end,
-	f32 update_interval
-){
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_UPDATE_POSITION);
-	// pos
-	writeV3F32(os, position);
-	// velocity
-	writeV3F32(os, velocity);
-	// acceleration
-	writeV3F32(os, acceleration);
-	// rotation
-	writeV3F32(os, rotation);
-	// do_interpolate
-	writeU8(os, do_interpolate);
-	// is_end_position (for interpolation)
-	writeU8(os, is_movement_end);
-	// update_interval (for interpolation)
-	writeF32(os, update_interval);
-	return os.str();
-}
-
-std::string gob_cmd_set_texture_mod(const std::string &mod)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_TEXTURE_MOD);
-	// parameters
-	os<<serializeString(mod);
-	return os.str();
-}
-
-std::string gob_cmd_set_sprite(
-	v2s16 p,
-	u16 num_frames,
-	f32 framelength,
-	bool select_horiz_by_yawpitch
-){
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_SPRITE);
-	// parameters
-	writeV2S16(os, p);
-	writeU16(os, num_frames);
-	writeF32(os, framelength);
-	writeU8(os, select_horiz_by_yawpitch);
-	return os.str();
-}
-
-std::string gob_cmd_punched(u16 result_hp)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_PUNCHED);
-	// result_hp
-	writeU16(os, result_hp);
-	return os.str();
-}
-
-std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
-{
-	std::ostringstream os(std::ios::binary);
-	writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
-	writeU16(os, armor_groups.size());
-	for (const auto &armor_group : armor_groups) {
-		os<<serializeString(armor_group.first);
-		writeS16(os, armor_group.second);
-	}
-	return os.str();
-}
-
-std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump,
-		float physics_override_gravity, bool sneak, bool sneak_glitch, bool new_move)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
-	// parameters
-	writeF32(os, physics_override_speed);
-	writeF32(os, physics_override_jump);
-	writeF32(os, physics_override_gravity);
-	// these are sent inverted so we get true when the server sends nothing
-	writeU8(os, !sneak);
-	writeU8(os, !sneak_glitch);
-	writeU8(os, !new_move);
-	return os.str();
-}
-
-std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_ANIMATION);
-	// parameters
-	writeV2F32(os, frames);
-	writeF32(os, frame_speed);
-	writeF32(os, frame_blend);
-	// these are sent inverted so we get true when the server sends nothing
-	writeU8(os, !frame_loop);
-	return os.str();
-}
-
-std::string gob_cmd_update_animation_speed(float frame_speed)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_ANIMATION_SPEED);
-	// parameters
-	writeF32(os, frame_speed);
-	return os.str();
-}
-
-std::string gob_cmd_update_bone_position(const std::string &bone, v3f position,
-		v3f rotation)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
-	// parameters
-	os<<serializeString(bone);
-	writeV3F32(os, position);
-	writeV3F32(os, rotation);
-	return os.str();
-}
-
-std::string gob_cmd_update_attachment(int parent_id, const std::string &bone,
-		v3f position, v3f rotation)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_ATTACH_TO);
-	// parameters
-	writeS16(os, parent_id);
-	os<<serializeString(bone);
-	writeV3F32(os, position);
-	writeV3F32(os, rotation);
-	return os.str();
-}
-
-std::string gob_cmd_update_nametag_attributes(video::SColor color)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES);
-	// parameters
-	writeU8(os, 1); // version for forward compatibility
-	writeARGB8(os, color);
-	return os.str();
-}
-
-std::string gob_cmd_update_infant(u16 id, u8 type,
-		const std::string &client_initialization_data)
-{
-	std::ostringstream os(std::ios::binary);
-	// command
-	writeU8(os, GENERIC_CMD_SPAWN_INFANT);
-	// parameters
-	writeU16(os, id);
-	writeU8(os, type);
-	os<<serializeLongString(client_initialization_data);
-	return os.str();
-}
-- 
cgit v1.2.3