#include <sstream>
#include <cmath>
#include <IFileSystem.h>
+#include "client.h"
+#include "network/clientopcodes.h"
+#include "network/networkpacket.h"
#include "threading/mutex_auto_lock.h"
#include "client/renderingengine.h"
#include "util/auth.h"
#include "util/serialize.h"
#include "util/string.h"
#include "util/srp.h"
-#include "client.h"
-#include "network/clientopcodes.h"
#include "filesys.h"
#include "mapblock_mesh.h"
#include "mapblock.h"
#include "minimap.h"
#include "mods.h"
#include "profiler.h"
+#include "shader.h"
#include "gettext.h"
#include "clientmap.h"
#include "clientmedia.h"
#include "guiscalingfilter.h"
#include "script/scripting_client.h"
#include "game.h"
+#include "chatmessage.h"
extern gui::IGUIEnvironment* guienv;
{
std::string full_path = mod_path + DIR_DELIM + mod_subpath;
std::vector<fs::DirListNode> mod = fs::GetDirListing(full_path);
- for (unsigned int j=0; j < mod.size(); j++){
- std::string filename = mod[j].name;
- if (mod[j].dir) {
+ for (const fs::DirListNode &j : mod) {
+ std::string filename = j.name;
+ if (j.dir) {
scanModSubfolder(mod_name, mod_path, mod_subpath
+ filename + DIR_DELIM);
continue;
delete m_inventory_from_server;
// Delete detached inventories
- for (std::unordered_map<std::string, Inventory*>::iterator
- i = m_detached_inventories.begin();
- i != m_detached_inventories.end(); ++i) {
- delete i->second;
+ for (auto &m_detached_inventorie : m_detached_inventories) {
+ delete m_detached_inventorie.second;
}
// cleanup 3d model meshes on client shutdown
// Control local player (0ms)
LocalPlayer *player = m_env.getLocalPlayer();
assert(player);
- player->applyControl(dtime);
+ player->applyControl(dtime, &m_env);
// Step environment
m_env.step(dtime);
Update positions of sounds attached to objects
*/
{
- for(std::unordered_map<int, u16>::iterator i = m_sounds_to_objects.begin();
- i != m_sounds_to_objects.end(); ++i) {
- int client_id = i->first;
- u16 object_id = i->second;
+ for (auto &m_sounds_to_object : m_sounds_to_objects) {
+ int client_id = m_sounds_to_object.first;
+ u16 object_id = m_sounds_to_object.second;
ClientActiveObject *cao = m_env.getActiveObject(object_id);
- if(!cao)
+ if (!cao)
continue;
- v3f pos = cao->getPosition();
- m_sound->updateSoundPosition(client_id, pos);
+ m_sound->updateSoundPosition(client_id, cao->getPosition());
}
}
NULL
};
name = removeStringEnd(filename, image_ext);
- if(name != "")
- {
+ if (!name.empty()) {
verbosestream<<"Client: Attempting to load image "
<<"file \""<<filename<<"\""<<std::endl;
// Read image
video::IImage *img = vdrv->createImageFromFile(rfile);
- if(!img){
+ if (!img) {
errorstream<<"Client: Cannot create image from data of "
<<"file \""<<filename<<"\""<<std::endl;
rfile->drop();
return false;
}
- else {
- m_tsrc->insertSourceImage(filename, img);
- img->drop();
- rfile->drop();
- return true;
- }
+
+ m_tsrc->insertSourceImage(filename, img);
+ img->drop();
+ rfile->drop();
+ return true;
}
const char *sound_ext[] = {
".ogg", NULL
};
name = removeStringEnd(filename, sound_ext);
- if(name != "")
- {
+ if (!name.empty()) {
verbosestream<<"Client: Attempting to load sound "
<<"file \""<<filename<<"\""<<std::endl;
m_sound->loadSoundData(name, data);
".x", ".b3d", ".md2", ".obj",
NULL
};
+
name = removeStringEnd(filename, model_ext);
- if(name != "")
- {
+ if (!name.empty()) {
verbosestream<<"Client: Storing model into memory: "
<<"\""<<filename<<"\""<<std::endl;
if(m_mesh_data.count(filename))
pkt << (u16) (file_requests_size & 0xFFFF);
- for(std::vector<std::string>::const_iterator i = file_requests.begin();
- i != file_requests.end(); ++i) {
- pkt << (*i);
+ for (const std::string &file_request : file_requests) {
+ pkt << file_request;
}
Send(&pkt);
&verifier, &salt);
NetworkPacket resp_pkt(TOSERVER_FIRST_SRP, 0);
- resp_pkt << salt << verifier << (u8)((m_password == "") ? 1 : 0);
+ resp_pkt << salt << verifier << (u8)((m_password.empty()) ? 1 : 0);
Send(&resp_pkt);
break;
pkt << (u8) blocks.size();
- u32 k = 0;
- for(std::vector<v3s16>::iterator
- j = blocks.begin();
- j != blocks.end(); ++j) {
- pkt << *j;
- k++;
+ for (const v3s16 &block : blocks) {
+ pkt << block;
}
Send(&pkt);
pkt << (u16) (server_ids & 0xFFFF);
- for(std::vector<s32>::iterator i = soundList.begin();
- i != soundList.end(); ++i)
- pkt << *i;
+ for (int sound_id : soundList)
+ pkt << sound_id;
Send(&pkt);
}
catch(InvalidPositionException &e) {
}
- for(std::map<v3s16, MapBlock *>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i) {
- addUpdateMeshTaskWithEdge(i->first, false, true);
+ for (const auto &modified_block : modified_blocks) {
+ addUpdateMeshTaskWithEdge(modified_block.first, false, true);
}
}
+/**
+ * Helper function for Client Side Modding
+ * Flavour is applied there, this should not be used for core engine
+ * @param p
+ * @param is_valid_position
+ * @return
+ */
MapNode Client::getNode(v3s16 p, bool *is_valid_position)
{
+ if (checkCSMFlavourLimit(CSMFlavourLimit::CSM_FL_LOOKUP_NODES)) {
+ v3s16 ppos = floatToInt(m_env.getLocalPlayer()->getPosition(), BS);
+ if ((u32) ppos.getDistanceFrom(p) > m_csm_noderange_limit) {
+ *is_valid_position = false;
+ return {};
+ }
+ }
return m_env.getMap().getNodeNoEx(p, is_valid_position);
}
catch(InvalidPositionException &e) {
}
- for(std::map<v3s16, MapBlock *>::iterator
- i = modified_blocks.begin();
- i != modified_blocks.end(); ++i) {
- addUpdateMeshTaskWithEdge(i->first, false, true);
+ for (const auto &modified_block : modified_blocks) {
+ addUpdateMeshTaskWithEdge(modified_block.first, false, true);
}
}
return player->hp;
}
-bool Client::getChatMessage(std::wstring &message)
+bool Client::getChatMessage(std::wstring &res)
{
- if(m_chat_queue.size() == 0)
+ if (m_chat_queue.empty())
return false;
- message = m_chat_queue.front();
+
+ ChatMessage *chatMessage = m_chat_queue.front();
m_chat_queue.pop();
+
+ res = L"";
+
+ switch (chatMessage->type) {
+ case CHATMESSAGE_TYPE_RAW:
+ case CHATMESSAGE_TYPE_ANNOUNCE:
+ case CHATMESSAGE_TYPE_SYSTEM:
+ res = chatMessage->message;
+ break;
+ case CHATMESSAGE_TYPE_NORMAL: {
+ if (!chatMessage->sender.empty())
+ res = L"<" + chatMessage->sender + L"> " + chatMessage->message;
+ else
+ res = chatMessage->message;
+ break;
+ }
+ default:
+ break;
+ }
+
+ delete chatMessage;
return true;
}
void Client::typeChatMessage(const std::wstring &message)
{
// Discard empty line
- if(message == L"")
+ if (message.empty())
return;
// If message was ate by script API, don't send it to server
sendChatMessage(message);
// Show locally
- if (message[0] != L'/')
- {
+ if (message[0] != L'/') {
// compatibility code
if (m_proto_ver < 29) {
LocalPlayer *player = m_env.getLocalPlayer();
assert(player);
std::wstring name = narrow_to_wide(player->getName());
- pushToChatQueue((std::wstring)L"<" + name + L"> " + message);
+ pushToChatQueue(new ChatMessage(CHATMESSAGE_TYPE_NORMAL, message, name));
}
}
}
{
if (m_media_downloader)
return m_media_downloader->getProgress();
- else
- return 1.0; // downloader only exists when not yet done
+
+ return 1.0; // downloader only exists when not yet done
}
typedef struct TextureUpdateArgs {
RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 72);
m_nodedef->updateAliases(m_itemdef);
std::string texture_path = g_settings->get("texture_path");
- if (texture_path != "" && fs::IsDir(texture_path))
+ if (!texture_path.empty() && fs::IsDir(texture_path))
m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt");
m_nodedef->setNodeRegistrationStatus(true);
m_nodedef->runNodeResolveCallbacks();
} else {
sstr << "Failed to save screenshot '" << filename << "'";
}
- pushToChatQueue(narrow_to_wide(sstr.str()));
+ pushToChatQueue(new ChatMessage(CHATMESSAGE_TYPE_SYSTEM,
+ narrow_to_wide(sstr.str())));
infostream << sstr.str() << std::endl;
image->drop();
}
projects / dragonfireclient.git / blobdiff