#include "itemdef.h"
-#include "gamedef.h"
#include "nodedef.h"
#include "tool.h"
#include "inventory.h"
#ifndef SERVER
-#include "mapblock_mesh.h"
-#include "mesh.h"
-#include "tile.h"
+#include "client/mapblock_mesh.h"
+#include "client/mesh.h"
+#include "client/wieldmesh.h"
+#include "client/tile.h"
+#include "client/client.h"
#endif
#include "log.h"
-#include "main.h" // g_settings
#include "settings.h"
#include "util/serialize.h"
#include "util/container.h"
type = def.type;
name = def.name;
description = def.description;
+ short_description = def.short_description;
inventory_image = def.inventory_image;
+ inventory_overlay = def.inventory_overlay;
wield_image = def.wield_image;
+ wield_overlay = def.wield_overlay;
wield_scale = def.wield_scale;
stack_max = def.stack_max;
usable = def.usable;
liquids_pointable = def.liquids_pointable;
- if(def.tool_capabilities)
- {
- tool_capabilities = new ToolCapabilities(
- *def.tool_capabilities);
- }
+ if (def.tool_capabilities)
+ tool_capabilities = new ToolCapabilities(*def.tool_capabilities);
groups = def.groups;
node_placement_prediction = def.node_placement_prediction;
+ place_param2 = def.place_param2;
+ has_on_place = def.has_on_place;
+ has_on_secondary_use = def.has_on_secondary_use;
sound_place = def.sound_place;
+ sound_place_failed = def.sound_place_failed;
+ sound_use = def.sound_use;
+ sound_use_air = def.sound_use_air;
range = def.range;
+ palette_image = def.palette_image;
+ color = def.color;
return *this;
}
void ItemDefinition::reset()
{
type = ITEM_NONE;
- name = "";
- description = "";
- inventory_image = "";
- wield_image = "";
+ name.clear();
+ description.clear();
+ short_description.clear();
+ inventory_image.clear();
+ inventory_overlay.clear();
+ wield_image.clear();
+ wield_overlay.clear();
+ palette_image.clear();
+ color = video::SColor(0xFFFFFFFF);
wield_scale = v3f(1.0, 1.0, 1.0);
stack_max = 99;
usable = false;
liquids_pointable = false;
- if(tool_capabilities)
- {
- delete tool_capabilities;
- tool_capabilities = NULL;
- }
+ delete tool_capabilities;
+ tool_capabilities = NULL;
groups.clear();
sound_place = SimpleSoundSpec();
+ sound_place_failed = SimpleSoundSpec();
+ sound_use = SimpleSoundSpec();
+ sound_use_air = SimpleSoundSpec();
range = -1;
-
- node_placement_prediction = "";
+ node_placement_prediction.clear();
+ place_param2 = 0;
+ has_on_place = false;
+ has_on_secondary_use = false;
}
void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
{
- if(protocol_version <= 17)
- writeU8(os, 1); // version
- else if(protocol_version <= 20)
- writeU8(os, 2); // version
- else
- writeU8(os, 3); // version
+ // protocol_version >= 37
+ u8 version = 6;
+ writeU8(os, version);
writeU8(os, type);
- os<<serializeString(name);
- os<<serializeString(description);
- os<<serializeString(inventory_image);
- os<<serializeString(wield_image);
- writeV3F1000(os, wield_scale);
+ os << serializeString16(name);
+ os << serializeString16(description);
+ os << serializeString16(inventory_image);
+ os << serializeString16(wield_image);
+ writeV3F32(os, wield_scale);
writeS16(os, stack_max);
writeU8(os, usable);
writeU8(os, liquids_pointable);
- std::string tool_capabilities_s = "";
- if(tool_capabilities){
+
+ std::string tool_capabilities_s;
+ if (tool_capabilities) {
std::ostringstream tmp_os(std::ios::binary);
tool_capabilities->serialize(tmp_os, protocol_version);
tool_capabilities_s = tmp_os.str();
}
- os<<serializeString(tool_capabilities_s);
+ os << serializeString16(tool_capabilities_s);
+
writeU16(os, groups.size());
- for(std::map<std::string, int>::const_iterator
- i = groups.begin(); i != groups.end(); i++){
- os<<serializeString(i->first);
- writeS16(os, i->second);
- }
- os<<serializeString(node_placement_prediction);
- if(protocol_version > 17){
- //serializeSimpleSoundSpec(sound_place, os);
- os<<serializeString(sound_place.name);
- writeF1000(os, sound_place.gain);
- }
- if(protocol_version > 20){
- writeF1000(os, range);
+ for (const auto &group : groups) {
+ os << serializeString16(group.first);
+ writeS16(os, group.second);
}
+
+ os << serializeString16(node_placement_prediction);
+
+ // Version from ContentFeatures::serialize to keep in sync
+ sound_place.serialize(os, protocol_version);
+ sound_place_failed.serialize(os, protocol_version);
+
+ writeF32(os, range);
+ os << serializeString16(palette_image);
+ writeARGB8(os, color);
+ os << serializeString16(inventory_overlay);
+ os << serializeString16(wield_overlay);
+
+ os << serializeString16(short_description);
+
+ os << place_param2;
+
+ sound_use.serialize(os, protocol_version);
+ sound_use_air.serialize(os, protocol_version);
+
+ writeU8(os, has_on_place);
+ writeU8(os, has_on_secondary_use);
}
-void ItemDefinition::deSerialize(std::istream &is)
+void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version)
{
// Reset everything
reset();
// Deserialize
int version = readU8(is);
- if(version < 1 || version > 3)
+ if (version < 6)
throw SerializationError("unsupported ItemDefinition version");
+
type = (enum ItemType)readU8(is);
- name = deSerializeString(is);
- description = deSerializeString(is);
- inventory_image = deSerializeString(is);
- wield_image = deSerializeString(is);
- wield_scale = readV3F1000(is);
+ name = deSerializeString16(is);
+ description = deSerializeString16(is);
+ inventory_image = deSerializeString16(is);
+ wield_image = deSerializeString16(is);
+ wield_scale = readV3F32(is);
stack_max = readS16(is);
usable = readU8(is);
liquids_pointable = readU8(is);
- std::string tool_capabilities_s = deSerializeString(is);
- if(!tool_capabilities_s.empty())
- {
+
+ std::string tool_capabilities_s = deSerializeString16(is);
+ if (!tool_capabilities_s.empty()) {
std::istringstream tmp_is(tool_capabilities_s, std::ios::binary);
tool_capabilities = new ToolCapabilities;
tool_capabilities->deSerialize(tmp_is);
}
+
groups.clear();
u32 groups_size = readU16(is);
for(u32 i=0; i<groups_size; i++){
- std::string name = deSerializeString(is);
+ std::string name = deSerializeString16(is);
int value = readS16(is);
groups[name] = value;
}
- if(version == 1){
- // We cant be sure that node_placement_prediction is send in version 1
- try{
- node_placement_prediction = deSerializeString(is);
- }catch(SerializationError &e) {};
- // Set the old default sound
- sound_place.name = "default_place_node";
- sound_place.gain = 0.5;
- } else if(version >= 2) {
- node_placement_prediction = deSerializeString(is);
- //deserializeSimpleSoundSpec(sound_place, is);
- sound_place.name = deSerializeString(is);
- sound_place.gain = readF1000(is);
- }
- if(version == 3) {
- range = readF1000(is);
- }
- // If you add anything here, insert it primarily inside the try-catch
+
+ node_placement_prediction = deSerializeString16(is);
+
+ sound_place.deSerialize(is, protocol_version);
+ sound_place_failed.deSerialize(is, protocol_version);
+
+ range = readF32(is);
+ palette_image = deSerializeString16(is);
+ color = readARGB8(is);
+ inventory_overlay = deSerializeString16(is);
+ wield_overlay = deSerializeString16(is);
+
+ // If you add anything here, insert it inside the try-catch
// block to not need to increase the version.
- try{
- }catch(SerializationError &e) {};
+ try {
+ short_description = deSerializeString16(is);
+
+ place_param2 = readU8(is); // 0 if missing
+
+ sound_use.deSerialize(is, protocol_version);
+ sound_use_air.deSerialize(is, protocol_version);
+
+ has_on_place = readU8(is);
+ has_on_secondary_use = readU8(is);
+ } catch(SerializationError &e) {};
}
+
/*
CItemDefManager
*/
struct ClientCached
{
video::ITexture *inventory_texture;
- scene::IMesh *wield_mesh;
+ ItemMesh wield_mesh;
+ Palette *palette;
ClientCached():
inventory_texture(NULL),
- wield_mesh(NULL)
+ palette(NULL)
{}
};
#endif
{
#ifndef SERVER
- m_main_thread = get_current_thread_id();
+ m_main_thread = std::this_thread::get_id();
#endif
clear();
}
virtual ~CItemDefManager()
{
#ifndef SERVER
- const std::list<ClientCached*> &values = m_clientcached.getValues();
- for(std::list<ClientCached*>::const_iterator
- i = values.begin(); i != values.end(); ++i)
- {
- ClientCached *cc = *i;
- if (cc->wield_mesh)
- cc->wield_mesh->drop();
+ const std::vector<ClientCached*> &values = m_clientcached.getValues();
+ for (ClientCached *cc : values) {
+ if (cc->wield_mesh.mesh)
+ cc->wield_mesh.mesh->drop();
delete cc;
}
#endif
- for (std::map<std::string, ItemDefinition*>::iterator iter =
- m_item_definitions.begin(); iter != m_item_definitions.end();
- iter ++) {
- delete iter->second;
+ for (auto &item_definition : m_item_definitions) {
+ delete item_definition.second;
}
m_item_definitions.clear();
}
// Convert name according to possible alias
std::string name = getAlias(name_);
// Get the definition
- std::map<std::string, ItemDefinition*>::const_iterator i;
- i = m_item_definitions.find(name);
- if(i == m_item_definitions.end())
+ auto i = m_item_definitions.find(name);
+ if (i == m_item_definitions.cend())
i = m_item_definitions.find("unknown");
- assert(i != m_item_definitions.end());
+ assert(i != m_item_definitions.cend());
return *(i->second);
}
- virtual std::string getAlias(const std::string &name) const
+ virtual const std::string &getAlias(const std::string &name) const
{
- std::map<std::string, std::string>::const_iterator i;
- i = m_aliases.find(name);
- if(i != m_aliases.end())
- return i->second;
+ auto it = m_aliases.find(name);
+ if (it != m_aliases.cend())
+ return it->second;
return name;
}
- virtual std::set<std::string> getAll() const
+ virtual void getAll(std::set<std::string> &result) const
{
- std::set<std::string> result;
- for(std::map<std::string, ItemDefinition*>::const_iterator
- i = m_item_definitions.begin();
- i != m_item_definitions.end(); i++)
- {
- result.insert(i->first);
+ result.clear();
+ for (const auto &item_definition : m_item_definitions) {
+ result.insert(item_definition.first);
}
- for(std::map<std::string, std::string>::const_iterator
- i = m_aliases.begin();
- i != m_aliases.end(); i++)
- {
- result.insert(i->first);
+
+ for (const auto &alias : m_aliases) {
+ result.insert(alias.first);
}
- return result;
}
virtual bool isKnown(const std::string &name_) const
{
// Convert name according to possible alias
std::string name = getAlias(name_);
// Get the definition
- std::map<std::string, ItemDefinition*>::const_iterator i;
- return m_item_definitions.find(name) != m_item_definitions.end();
+ return m_item_definitions.find(name) != m_item_definitions.cend();
}
#ifndef SERVER
public:
ClientCached* createClientCachedDirect(const std::string &name,
- IGameDef *gamedef) const
+ Client *client) const
{
infostream<<"Lazily creating item texture and mesh for \""
<<name<<"\""<<std::endl;
// This is not thread-safe
- assert(get_current_thread_id() == m_main_thread);
+ sanity_check(std::this_thread::get_id() == m_main_thread);
// Skip if already in cache
ClientCached *cc = NULL;
if(cc)
return cc;
- ITextureSource *tsrc = gamedef->getTextureSource();
- INodeDefManager *nodedef = gamedef->getNodeDefManager();
- IrrlichtDevice *device = tsrc->getDevice();
- video::IVideoDriver *driver = device->getVideoDriver();
- const ItemDefinition *def = &get(name);
+ ITextureSource *tsrc = client->getTextureSource();
+ const ItemDefinition &def = get(name);
// Create new ClientCached
cc = new ClientCached();
- bool need_node_mesh = false;
-
// Create an inventory texture
cc->inventory_texture = NULL;
- if(def->inventory_image != "")
- {
- cc->inventory_texture = tsrc->getTexture(def->inventory_image);
- }
- else if(def->type == ITEM_NODE)
- {
- need_node_mesh = true;
- }
+ if (!def.inventory_image.empty())
+ cc->inventory_texture = tsrc->getTexture(def.inventory_image);
- // Create a wield mesh
- assert(cc->wield_mesh == NULL);
- if(def->type == ITEM_NODE && def->wield_image == "")
- {
- need_node_mesh = true;
- }
- else if(def->wield_image != "" || def->inventory_image != "")
- {
- // Extrude the wield image into a mesh
-
- std::string imagename;
- if(def->wield_image != "")
- imagename = def->wield_image;
- else
- imagename = def->inventory_image;
-
- cc->wield_mesh = createExtrudedMesh(
- tsrc->getTexture(imagename),
- driver,
- def->wield_scale * v3f(40.0, 40.0, 4.0));
- if(cc->wield_mesh == NULL)
- {
- infostream<<"ItemDefManager: WARNING: "
- <<"updateTexturesAndMeshes(): "
- <<"Unable to create extruded mesh for item "
- <<def->name<<std::endl;
- }
- }
+ ItemStack item = ItemStack();
+ item.name = def.name;
- if(need_node_mesh)
- {
- /*
- Get node properties
- */
- content_t id = nodedef->getId(def->name);
- const ContentFeatures &f = nodedef->get(id);
-
- u8 param1 = 0;
- if(f.param_type == CPT_LIGHT)
- param1 = 0xee;
-
- /*
- Make a mesh from the node
- */
- bool reenable_shaders = false;
- if(g_settings->getBool("enable_shaders")){
- reenable_shaders = true;
- g_settings->setBool("enable_shaders",false);
- }
- MeshMakeData mesh_make_data(gamedef);
- MapNode mesh_make_node(id, param1, 0);
- mesh_make_data.fillSingleNode(&mesh_make_node);
- MapBlockMesh mapblock_mesh(&mesh_make_data);
- scene::IMesh *node_mesh = mapblock_mesh.getMesh();
- assert(node_mesh);
- video::SColor c(255, 255, 255, 255);
- setMeshColor(node_mesh, c);
-
- /*
- Scale and translate the mesh so it's a unit cube
- centered on the origin
- */
- scaleMesh(node_mesh, v3f(1.0/BS, 1.0/BS, 1.0/BS));
- translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0));
-
- /*
- Draw node mesh into a render target texture
- */
- if(cc->inventory_texture == NULL)
- {
- TextureFromMeshParams params;
- params.mesh = node_mesh;
- params.dim.set(64, 64);
- params.rtt_texture_name = "INVENTORY_"
- + def->name + "_RTT";
- params.delete_texture_on_shutdown = true;
- params.camera_position.set(0, 1.0, -1.5);
- params.camera_position.rotateXZBy(45);
- params.camera_lookat.set(0, 0, 0);
- // Set orthogonal projection
- params.camera_projection_matrix.buildProjectionMatrixOrthoLH(
- 1.65, 1.65, 0, 100);
- params.ambient_light.set(1.0, 0.2, 0.2, 0.2);
- params.light_position.set(10, 100, -50);
- params.light_color.set(1.0, 0.5, 0.5, 0.5);
- params.light_radius = 1000;
-
- cc->inventory_texture =
- tsrc->generateTextureFromMesh(params);
-
- // render-to-target didn't work
- if(cc->inventory_texture == NULL)
- {
- cc->inventory_texture =
- tsrc->getTexture(f.tiledef[0].name);
- }
- }
-
- /*
- Use the node mesh as the wield mesh
- */
-
- // Scale to proper wield mesh proportions
- scaleMesh(node_mesh, v3f(30.0, 30.0, 30.0)
- * def->wield_scale);
+ getItemMesh(client, item, &(cc->wield_mesh));
- cc->wield_mesh = node_mesh;
- cc->wield_mesh->grab();
-
- //no way reference count can be smaller than 2 in this place!
- assert(cc->wield_mesh->getReferenceCount() >= 2);
-
- if (reenable_shaders)
- g_settings->setBool("enable_shaders",true);
- }
+ cc->palette = tsrc->getPalette(def.palette_image);
// Put in cache
m_clientcached.set(name, cc);
return cc;
}
ClientCached* getClientCached(const std::string &name,
- IGameDef *gamedef) const
+ Client *client) const
{
ClientCached *cc = NULL;
m_clientcached.get(name, &cc);
- if(cc)
+ if (cc)
return cc;
- if(get_current_thread_id() == m_main_thread)
- {
- return createClientCachedDirect(name, gamedef);
+ if (std::this_thread::get_id() == m_main_thread) {
+ return createClientCachedDirect(name, client);
}
- else
- {
- // We're gonna ask the result to be put into here
- static ResultQueue<std::string, ClientCached*, u8, u8> result_queue;
-
- // Throw a request in
- m_get_clientcached_queue.add(name, 0, 0, &result_queue);
- try{
- while(true) {
- // Wait result for a second
- GetResult<std::string, ClientCached*, u8, u8>
- result = result_queue.pop_front(1000);
-
- if (result.key == name) {
- return result.item;
- }
+
+ // We're gonna ask the result to be put into here
+ static ResultQueue<std::string, ClientCached*, u8, u8> result_queue;
+
+ // Throw a request in
+ m_get_clientcached_queue.add(name, 0, 0, &result_queue);
+ try {
+ while(true) {
+ // Wait result for a second
+ GetResult<std::string, ClientCached*, u8, u8>
+ result = result_queue.pop_front(1000);
+
+ if (result.key == name) {
+ return result.item;
}
}
- catch(ItemNotFoundException &e)
- {
- errorstream<<"Waiting for clientcached " << name << " timed out."<<std::endl;
- return &m_dummy_clientcached;
- }
+ } catch(ItemNotFoundException &e) {
+ errorstream << "Waiting for clientcached " << name
+ << " timed out." << std::endl;
+ return &m_dummy_clientcached;
}
}
// Get item inventory texture
virtual video::ITexture* getInventoryTexture(const std::string &name,
- IGameDef *gamedef) const
+ Client *client) const
{
- ClientCached *cc = getClientCached(name, gamedef);
+ ClientCached *cc = getClientCached(name, client);
if(!cc)
return NULL;
return cc->inventory_texture;
}
// Get item wield mesh
- virtual scene::IMesh* getWieldMesh(const std::string &name,
- IGameDef *gamedef) const
+ virtual ItemMesh* getWieldMesh(const std::string &name,
+ Client *client) const
+ {
+ ClientCached *cc = getClientCached(name, client);
+ if(!cc)
+ return NULL;
+ return &(cc->wield_mesh);
+ }
+
+ // Get item palette
+ virtual Palette* getPalette(const std::string &name,
+ Client *client) const
{
- ClientCached *cc = getClientCached(name, gamedef);
+ ClientCached *cc = getClientCached(name, client);
if(!cc)
return NULL;
- return cc->wield_mesh;
+ return cc->palette;
+ }
+
+ virtual video::SColor getItemstackColor(const ItemStack &stack,
+ Client *client) const
+ {
+ // Look for direct color definition
+ const std::string &colorstring = stack.metadata.getString("color", 0);
+ video::SColor directcolor;
+ if (!colorstring.empty() && parseColorString(colorstring, directcolor, true))
+ return directcolor;
+ // See if there is a palette
+ Palette *palette = getPalette(stack.name, client);
+ const std::string &index = stack.metadata.getString("palette_index", 0);
+ if (palette && !index.empty())
+ return (*palette)[mystoi(index, 0, 255)];
+ // Fallback color
+ return get(stack.name).color;
}
#endif
+ void applyTextureOverrides(const std::vector<TextureOverride> &overrides)
+ {
+ infostream << "ItemDefManager::applyTextureOverrides(): Applying "
+ "overrides to textures" << std::endl;
+
+ for (const TextureOverride& texture_override : overrides) {
+ if (m_item_definitions.find(texture_override.id) == m_item_definitions.end()) {
+ continue; // Ignore unknown item
+ }
+
+ ItemDefinition* itemdef = m_item_definitions[texture_override.id];
+
+ if (texture_override.hasTarget(OverrideTarget::INVENTORY))
+ itemdef->inventory_image = texture_override.texture;
+
+ if (texture_override.hasTarget(OverrideTarget::WIELD))
+ itemdef->wield_image = texture_override.texture;
+ }
+ }
void clear()
{
- for(std::map<std::string, ItemDefinition*>::const_iterator
- i = m_item_definitions.begin();
- i != m_item_definitions.end(); i++)
+ for (auto &i : m_item_definitions)
{
- delete i->second;
+ delete i.second;
}
m_item_definitions.clear();
m_aliases.clear();
// "ignore" is the ignore node
ItemDefinition* hand_def = new ItemDefinition;
- hand_def->name = "";
+ hand_def->name.clear();
hand_def->wield_image = "wieldhand.png";
hand_def->tool_capabilities = new ToolCapabilities;
m_item_definitions.insert(std::make_pair("", hand_def));
}
virtual void registerItem(const ItemDefinition &def)
{
- verbosestream<<"ItemDefManager: registering \""<<def.name<<"\""<<std::endl;
+ TRACESTREAM(<< "ItemDefManager: registering " << def.name << std::endl);
// Ensure that the "" item (the hand) always has ToolCapabilities
- if(def.name == "")
- assert(def.tool_capabilities != NULL);
+ if (def.name.empty())
+ FATAL_ERROR_IF(!def.tool_capabilities, "Hand does not have ToolCapabilities");
if(m_item_definitions.count(def.name) == 0)
m_item_definitions[def.name] = new ItemDefinition(def);
infostream<<"ItemDefManager: erased alias "<<def.name
<<" because item was defined"<<std::endl;
}
+ virtual void unregisterItem(const std::string &name)
+ {
+ verbosestream<<"ItemDefManager: unregistering \""<<name<<"\""<<std::endl;
+
+ delete m_item_definitions[name];
+ m_item_definitions.erase(name);
+ }
virtual void registerAlias(const std::string &name,
const std::string &convert_to)
{
- if(m_item_definitions.find(name) == m_item_definitions.end())
- {
- verbosestream<<"ItemDefManager: setting alias "<<name
- <<" -> "<<convert_to<<std::endl;
+ if (m_item_definitions.find(name) == m_item_definitions.end()) {
+ TRACESTREAM(<< "ItemDefManager: setting alias " << name
+ << " -> " << convert_to << std::endl);
m_aliases[name] = convert_to;
}
}
writeU8(os, 0); // version
u16 count = m_item_definitions.size();
writeU16(os, count);
- for(std::map<std::string, ItemDefinition*>::const_iterator
- i = m_item_definitions.begin();
- i != m_item_definitions.end(); i++)
- {
- ItemDefinition *def = i->second;
+
+ for (const auto &it : m_item_definitions) {
+ ItemDefinition *def = it.second;
// Serialize ItemDefinition and write wrapped in a string
std::ostringstream tmp_os(std::ios::binary);
def->serialize(tmp_os, protocol_version);
- os<<serializeString(tmp_os.str());
+ os << serializeString16(tmp_os.str());
}
+
writeU16(os, m_aliases.size());
- for(std::map<std::string, std::string>::const_iterator
- i = m_aliases.begin(); i != m_aliases.end(); i++)
- {
- os<<serializeString(i->first);
- os<<serializeString(i->second);
+
+ for (const auto &it : m_aliases) {
+ os << serializeString16(it.first);
+ os << serializeString16(it.second);
}
}
- void deSerialize(std::istream &is)
+ void deSerialize(std::istream &is, u16 protocol_version)
{
// Clear everything
clear();
- // Deserialize
- int version = readU8(is);
- if(version != 0)
+
+ if(readU8(is) != 0)
throw SerializationError("unsupported ItemDefManager version");
+
u16 count = readU16(is);
for(u16 i=0; i<count; i++)
{
// Deserialize a string and grab an ItemDefinition from it
- std::istringstream tmp_is(deSerializeString(is), std::ios::binary);
+ std::istringstream tmp_is(deSerializeString16(is), std::ios::binary);
ItemDefinition def;
- def.deSerialize(tmp_is);
+ def.deSerialize(tmp_is, protocol_version);
// Register
registerItem(def);
}
u16 num_aliases = readU16(is);
for(u16 i=0; i<num_aliases; i++)
{
- std::string name = deSerializeString(is);
- std::string convert_to = deSerializeString(is);
+ std::string name = deSerializeString16(is);
+ std::string convert_to = deSerializeString16(is);
registerAlias(name, convert_to);
}
}
void processQueue(IGameDef *gamedef)
{
#ifndef SERVER
+ //NOTE this is only thread safe for ONE consumer thread!
while(!m_get_clientcached_queue.empty())
{
GetRequest<std::string, ClientCached*, u8, u8>
request = m_get_clientcached_queue.pop();
m_get_clientcached_queue.pushResult(request,
- createClientCachedDirect(request.key, gamedef));
+ createClientCachedDirect(request.key, (Client *)gamedef));
}
#endif
}
// Key is name
std::map<std::string, ItemDefinition*> m_item_definitions;
// Aliases
- std::map<std::string, std::string> m_aliases;
+ StringMap m_aliases;
#ifndef SERVER
// The id of the thread that is allowed to use irrlicht directly
- threadid_t m_main_thread;
+ std::thread::id m_main_thread;
// A reference to this can be returned when nothing is found, to avoid NULLs
mutable ClientCached m_dummy_clientcached;
// Cached textures and meshes
projects / minetest.git / blobdiff