69 changes: 34 additions & 35 deletions src/guiFormSpecMenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ std::vector<std::string>* GUIFormSpecMenu::getDropDownValues(const std::string &
return NULL;
}

void GUIFormSpecMenu::parseSize(parserData* data,std::string element)
void GUIFormSpecMenu::parseSize(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,',');

Expand All @@ -278,7 +278,7 @@ void GUIFormSpecMenu::parseSize(parserData* data,std::string element)
errorstream<< "Invalid size element (" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseContainer(parserData* data, std::string element)
void GUIFormSpecMenu::parseContainer(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element, ',');

Expand All @@ -304,7 +304,7 @@ void GUIFormSpecMenu::parseContainerEnd(parserData* data)
}
}

void GUIFormSpecMenu::parseList(parserData* data,std::string element)
void GUIFormSpecMenu::parseList(parserData* data, const std::string &element)
{
if (m_client == 0) {
warningstream<<"invalid use of 'list' with m_client==0"<<std::endl;
Expand Down Expand Up @@ -359,7 +359,7 @@ void GUIFormSpecMenu::parseList(parserData* data,std::string element)
errorstream<< "Invalid list element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseListRing(parserData* data, std::string element)
void GUIFormSpecMenu::parseListRing(parserData* data, const std::string &element)
{
if (m_client == 0) {
errorstream << "WARNING: invalid use of 'listring' with m_client==0" << std::endl;
Expand Down Expand Up @@ -394,7 +394,7 @@ void GUIFormSpecMenu::parseListRing(parserData* data, std::string element)
<< m_inventorylists.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element)
void GUIFormSpecMenu::parseCheckbox(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -450,7 +450,7 @@ void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element)
errorstream<< "Invalid checkbox element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element)
void GUIFormSpecMenu::parseScrollBar(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -509,7 +509,7 @@ void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element)
errorstream<< "Invalid scrollbar element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseImage(parserData* data,std::string element)
void GUIFormSpecMenu::parseImage(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -553,7 +553,7 @@ void GUIFormSpecMenu::parseImage(parserData* data,std::string element)
errorstream<< "Invalid image element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseItemImage(parserData* data,std::string element)
void GUIFormSpecMenu::parseItemImage(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -583,8 +583,8 @@ void GUIFormSpecMenu::parseItemImage(parserData* data,std::string element)
errorstream<< "Invalid ItemImage element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseButton(parserData* data,std::string element,
std::string type)
void GUIFormSpecMenu::parseButton(parserData* data, const std::string &element,
const std::string &type)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -638,7 +638,7 @@ void GUIFormSpecMenu::parseButton(parserData* data,std::string element,
errorstream<< "Invalid button element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseBackground(parserData* data,std::string element)
void GUIFormSpecMenu::parseBackground(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -676,7 +676,7 @@ void GUIFormSpecMenu::parseBackground(parserData* data,std::string element)
errorstream<< "Invalid background element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseTableOptions(parserData* data,std::string element)
void GUIFormSpecMenu::parseTableOptions(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand All @@ -688,7 +688,7 @@ void GUIFormSpecMenu::parseTableOptions(parserData* data,std::string element)
}
}

void GUIFormSpecMenu::parseTableColumns(parserData* data,std::string element)
void GUIFormSpecMenu::parseTableColumns(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand All @@ -708,7 +708,7 @@ void GUIFormSpecMenu::parseTableColumns(parserData* data,std::string element)
}
}

void GUIFormSpecMenu::parseTable(parserData* data,std::string element)
void GUIFormSpecMenu::parseTable(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -776,7 +776,7 @@ void GUIFormSpecMenu::parseTable(parserData* data,std::string element)
errorstream<< "Invalid table element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseTextList(parserData* data,std::string element)
void GUIFormSpecMenu::parseTextList(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -849,7 +849,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element)
}


void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element)
void GUIFormSpecMenu::parseDropDown(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -913,8 +913,7 @@ void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element)
<< element << "'" << std::endl;
}

void GUIFormSpecMenu::parseFieldCloseOnEnter(parserData *data,
const std::string &element)
void GUIFormSpecMenu::parseFieldCloseOnEnter(parserData *data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');
if (parts.size() == 2 ||
Expand All @@ -923,7 +922,7 @@ void GUIFormSpecMenu::parseFieldCloseOnEnter(parserData *data,
}
}

void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element)
void GUIFormSpecMenu::parsePwdField(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1084,8 +1083,8 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
m_fields.push_back(spec);
}

void GUIFormSpecMenu::parseTextArea(parserData* data,
std::vector<std::string>& parts,std::string type)
void GUIFormSpecMenu::parseTextArea(parserData* data, std::vector<std::string>& parts,
const std::string &type)
{

std::vector<std::string> v_pos = split(parts[0],',');
Expand Down Expand Up @@ -1196,8 +1195,8 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
m_fields.push_back(spec);
}

void GUIFormSpecMenu::parseField(parserData* data,std::string element,
std::string type)
void GUIFormSpecMenu::parseField(parserData* data, const std::string &element,
const std::string &type)
{
std::vector<std::string> parts = split(element,';');

Expand All @@ -1215,7 +1214,7 @@ void GUIFormSpecMenu::parseField(parserData* data,std::string element,
errorstream<< "Invalid field element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseLabel(parserData* data,std::string element)
void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1271,7 +1270,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element)
errorstream<< "Invalid label element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element)
void GUIFormSpecMenu::parseVertLabel(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1321,8 +1320,8 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element)
errorstream<< "Invalid vertlabel element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,
std::string type)
void GUIFormSpecMenu::parseImageButton(parserData* data, const std::string &element,
const std::string &type)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1410,7 +1409,7 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element,
errorstream<< "Invalid imagebutton element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element)
void GUIFormSpecMenu::parseTabHeader(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1482,7 +1481,7 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element)
<< element << "'" << std::endl;
}

void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element)
void GUIFormSpecMenu::parseItemImageButton(parserData* data, const std::string &element)
{

if (m_client == 0) {
Expand Down Expand Up @@ -1556,7 +1555,7 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element)
errorstream<< "Invalid ItemImagebutton element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseBox(parserData* data,std::string element)
void GUIFormSpecMenu::parseBox(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1592,7 +1591,7 @@ void GUIFormSpecMenu::parseBox(parserData* data,std::string element)
errorstream<< "Invalid Box element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseBackgroundColor(parserData* data,std::string element)
void GUIFormSpecMenu::parseBackgroundColor(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand All @@ -1610,7 +1609,7 @@ void GUIFormSpecMenu::parseBackgroundColor(parserData* data,std::string element)
errorstream<< "Invalid bgcolor element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseListColors(parserData* data,std::string element)
void GUIFormSpecMenu::parseListColors(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');

Expand Down Expand Up @@ -1638,7 +1637,7 @@ void GUIFormSpecMenu::parseListColors(parserData* data,std::string element)
errorstream<< "Invalid listcolors element(" << parts.size() << "): '" << element << "'" << std::endl;
}

void GUIFormSpecMenu::parseTooltip(parserData* data, std::string element)
void GUIFormSpecMenu::parseTooltip(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');
if (parts.size() == 2) {
Expand All @@ -1658,7 +1657,7 @@ void GUIFormSpecMenu::parseTooltip(parserData* data, std::string element)
errorstream<< "Invalid tooltip element(" << parts.size() << "): '" << element << "'" << std::endl;
}

bool GUIFormSpecMenu::parseVersionDirect(std::string data)
bool GUIFormSpecMenu::parseVersionDirect(const std::string &data)
{
//some prechecks
if (data == "")
Expand All @@ -1682,7 +1681,7 @@ bool GUIFormSpecMenu::parseVersionDirect(std::string data)
return false;
}

bool GUIFormSpecMenu::parseSizeDirect(parserData* data, std::string element)
bool GUIFormSpecMenu::parseSizeDirect(parserData* data, const std::string &element)
{
if (element == "")
return false;
Expand Down
60 changes: 31 additions & 29 deletions src/guiFormSpecMenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,39 +471,41 @@ class GUIFormSpecMenu : public GUIModalMenu

void parseElement(parserData* data, std::string element);

void parseSize(parserData* data, std::string element);
void parseContainer(parserData* data, std::string element);
void parseSize(parserData* data, const std::string &element);
void parseContainer(parserData* data, const std::string &element);
void parseContainerEnd(parserData* data);
void parseList(parserData* data, std::string element);
void parseListRing(parserData* data, std::string element);
void parseCheckbox(parserData* data, std::string element);
void parseImage(parserData* data, std::string element);
void parseItemImage(parserData* data,std::string element);
void parseButton(parserData* data,std::string element,std::string typ);
void parseBackground(parserData* data,std::string element);
void parseTableOptions(parserData* data,std::string element);
void parseTableColumns(parserData* data,std::string element);
void parseTable(parserData* data,std::string element);
void parseTextList(parserData* data,std::string element);
void parseDropDown(parserData* data,std::string element);
void parseList(parserData* data, const std::string &element);
void parseListRing(parserData* data, const std::string &element);
void parseCheckbox(parserData* data, const std::string &element);
void parseImage(parserData* data, const std::string &element);
void parseItemImage(parserData* data, const std::string &element);
void parseButton(parserData* data, const std::string &element,
const std::string &typ);
void parseBackground(parserData* data, const std::string &element);
void parseTableOptions(parserData* data, const std::string &element);
void parseTableColumns(parserData* data, const std::string &element);
void parseTable(parserData* data, const std::string &element);
void parseTextList(parserData* data, const std::string &element);
void parseDropDown(parserData* data, const std::string &element);
void parseFieldCloseOnEnter(parserData *data, const std::string &element);
void parsePwdField(parserData* data,std::string element);
void parseField(parserData* data,std::string element,std::string type);
void parsePwdField(parserData* data, const std::string &element);
void parseField(parserData* data, const std::string &element, const std::string &type);
void parseSimpleField(parserData* data,std::vector<std::string> &parts);
void parseTextArea(parserData* data,std::vector<std::string>& parts,
std::string type);
void parseLabel(parserData* data,std::string element);
void parseVertLabel(parserData* data,std::string element);
void parseImageButton(parserData* data,std::string element,std::string type);
void parseItemImageButton(parserData* data,std::string element);
void parseTabHeader(parserData* data,std::string element);
void parseBox(parserData* data,std::string element);
void parseBackgroundColor(parserData* data,std::string element);
void parseListColors(parserData* data,std::string element);
void parseTooltip(parserData* data,std::string element);
bool parseVersionDirect(std::string data);
bool parseSizeDirect(parserData* data, std::string element);
void parseScrollBar(parserData* data, std::string element);
const std::string &type);
void parseLabel(parserData* data, const std::string &element);
void parseVertLabel(parserData* data, const std::string &element);
void parseImageButton(parserData* data, const std::string &element,
const std::string &type);
void parseItemImageButton(parserData* data, const std::string &element);
void parseTabHeader(parserData* data, const std::string &element);
void parseBox(parserData* data, const std::string &element);
void parseBackgroundColor(parserData* data, const std::string &element);
void parseListColors(parserData* data, const std::string &element);
void parseTooltip(parserData* data, const std::string &element);
bool parseVersionDirect(const std::string &data);
bool parseSizeDirect(parserData* data, const std::string &element);
void parseScrollBar(parserData* data, const std::string &element);
bool parsePositionDirect(parserData *data, const std::string &element);
void parsePosition(parserData *data, const std::string &element);
bool parseAnchorDirect(parserData *data, const std::string &element);
Expand Down
9 changes: 4 additions & 5 deletions src/guiTable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ class GUITable : public gui::IGUIElement
std::string name;
std::string value;

Option(const std::string &name_, const std::string &value_)
{
name = name_;
value = value_;
}
Option(const std::string &name_, const std::string &value_) :
name(name_),
value(value_)
{}
};

/*
Expand Down
17 changes: 8 additions & 9 deletions src/httpfetch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ Mutex g_httpfetch_mutex;
std::map<unsigned long, std::queue<HTTPFetchResult> > g_httpfetch_results;
PcgRandom g_callerid_randomness;

HTTPFetchRequest::HTTPFetchRequest()
HTTPFetchRequest::HTTPFetchRequest() :
url(""),
caller(HTTPFETCH_DISCARD),
request_id(0),
timeout(g_settings->getS32("curl_timeout")),
connect_timeout(timeout),
multipart(false),
useragent(std::string(PROJECT_NAME_C "/") + g_version_hash + " (" + porting::get_sysinfo() + ")")
{
url = "";
caller = HTTPFETCH_DISCARD;
request_id = 0;
timeout = g_settings->getS32("curl_timeout");
connect_timeout = timeout;
multipart = false;

useragent = std::string(PROJECT_NAME_C "/") + g_version_hash + " (" + porting::get_sysinfo() + ")";
}


Expand Down
36 changes: 17 additions & 19 deletions src/httpfetch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,23 @@ struct HTTPFetchResult
unsigned long caller;
unsigned long request_id;

HTTPFetchResult()
{
succeeded = false;
timeout = false;
response_code = 0;
data = "";
caller = HTTPFETCH_DISCARD;
request_id = 0;
}

HTTPFetchResult(const HTTPFetchRequest &fetch_request)
{
succeeded = false;
timeout = false;
response_code = 0;
data = "";
caller = fetch_request.caller;
request_id = fetch_request.request_id;
}
HTTPFetchResult() :
succeeded(false),
timeout(false),
response_code(0),
data(""),
caller(HTTPFETCH_DISCARD),
request_id(0)
{}

HTTPFetchResult(const HTTPFetchRequest &fetch_request) :
succeeded(false),
timeout(false),
response_code(0),
data(""),
caller(fetch_request.caller),
request_id(fetch_request.request_id)
{}

};

Expand Down
5 changes: 2 additions & 3 deletions src/map.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2347,16 +2347,15 @@ bool ServerMap::saveBlock(MapBlock *block, Database *db)
return ret;
}

void ServerMap::loadBlock(std::string sectordir, std::string blockfile,
void ServerMap::loadBlock(const std::string &sectordir, const std::string &blockfile,
MapSector *sector, bool save_after_load)
{
DSTACK(FUNCTION_NAME);

std::string fullpath = sectordir + DIR_DELIM + blockfile;
try {

std::ifstream is(fullpath.c_str(), std::ios_base::binary);
if(is.good() == false)
if (!is.good())
throw FileNotGoodException("Cannot open block file");

v3s16 p3d = getBlockPos(sectordir, blockfile);
Expand Down
10 changes: 2 additions & 8 deletions src/map.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,17 +456,11 @@ class ServerMap : public Map
MapSector* loadSectorMeta(std::string dirname, bool save_after_load);
bool loadSectorMeta(v2s16 p2d);

// Full load of a sector including all blocks.
// returns true on success, false on failure.
bool loadSectorFull(v2s16 p2d);
// If sector is not found in memory, try to load it from disk.
// Returns true if sector now resides in memory
//bool deFlushSector(v2s16 p2d);

bool saveBlock(MapBlock *block);
static bool saveBlock(MapBlock *block, Database *db);
// This will generate a sector with getSector if not found.
void loadBlock(std::string sectordir, std::string blockfile, MapSector *sector, bool save_after_load=false);
void loadBlock(const std::string &sectordir, const std::string &blockfile,
MapSector *sector, bool save_after_load=false);
MapBlock* loadBlock(v3s16 p);
// Database version
void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
Expand Down
10 changes: 5 additions & 5 deletions src/network/connection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ struct OutgoingPacket
bool reliable;
bool ack;

OutgoingPacket(u16 peer_id_, u8 channelnum_, SharedBuffer<u8> data_,
OutgoingPacket(u16 peer_id_, u8 channelnum_, const SharedBuffer<u8> &data_,
bool reliable_,bool ack_=false):
peer_id(peer_id_),
channelnum(channelnum_),
Expand Down Expand Up @@ -448,7 +448,7 @@ struct ConnectionCommand
reliable = reliable_;
}

void ack(u16 peer_id_, u8 channelnum_, SharedBuffer<u8> data_)
void ack(u16 peer_id_, u8 channelnum_, const SharedBuffer<u8> &data_)
{
type = CONCMD_ACK;
peer_id = peer_id_;
Expand All @@ -457,7 +457,7 @@ struct ConnectionCommand
reliable = false;
}

void createPeer(u16 peer_id_, SharedBuffer<u8> data_)
void createPeer(u16 peer_id_, const SharedBuffer<u8> &data_)
{
type = CONCMD_CREATE_PEER;
peer_id = peer_id_;
Expand All @@ -467,7 +467,7 @@ struct ConnectionCommand
raw = true;
}

void disableLegacy(u16 peer_id_, SharedBuffer<u8> data_)
void disableLegacy(u16 peer_id_, const SharedBuffer<u8> &data_)
{
type = CONCMD_DISABLE_LEGACY;
peer_id = peer_id_;
Expand Down Expand Up @@ -874,7 +874,7 @@ struct ConnectionEvent
return "Invalid ConnectionEvent";
}

void dataReceived(u16 peer_id_, SharedBuffer<u8> data_)
void dataReceived(u16 peer_id_, const SharedBuffer<u8> &data_)
{
type = CONNEVENT_DATA_RECEIVED;
peer_id = peer_id_;
Expand Down
14 changes: 7 additions & 7 deletions src/nodedef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ struct TileDef

struct TileAnimationParams animation;

TileDef()
TileDef() :
name(""),
backface_culling(true),
tileable_horizontal(true),
tileable_vertical(true),
has_color(false),
color(video::SColor(0xFFFFFFFF))
{
name = "";
backface_culling = true;
tileable_horizontal = true;
tileable_vertical = true;
has_color = false;
color = video::SColor(0xFFFFFFFF);
animation.type = TAT_NONE;
}

Expand Down
4 changes: 2 additions & 2 deletions src/pathfinder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class PathGridnode {
* @param dir direction to set cost for
* @cost cost to set
*/
void setCost(v3s16 dir, PathCost cost);
void setCost(v3s16 dir, const PathCost &cost);

bool valid; /**< node is on surface */
bool target; /**< node is target position */
Expand Down Expand Up @@ -496,7 +496,7 @@ PathCost PathGridnode::getCost(v3s16 dir)
}

/******************************************************************************/
void PathGridnode::setCost(v3s16 dir, PathCost cost)
void PathGridnode::setCost(v3s16 dir, const PathCost &cost)
{
if (dir.X > 0) {
directions[DIR_XP] = cost;
Expand Down
2 changes: 1 addition & 1 deletion src/porting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ bool setSystemPaths()
#endif

for (std::list<std::string>::const_iterator
i = trylist.begin(); i != trylist.end(); i++) {
i = trylist.begin(); i != trylist.end(); ++i) {
const std::string &trypath = *i;
if (!fs::PathExists(trypath) ||
!fs::PathExists(trypath + DIR_DELIM + "builtin")) {
Expand Down
8 changes: 4 additions & 4 deletions src/script/cpp_api/s_async.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ void AsyncEngine::initialize(unsigned int numEngines)
}

/******************************************************************************/
unsigned int AsyncEngine::queueAsyncJob(std::string func, std::string params)
unsigned int AsyncEngine::queueAsyncJob(const std::string &func,
const std::string &params)
{
jobQueueMutex.lock();
LuaJobInfo toAdd;
Expand All @@ -124,7 +125,6 @@ LuaJobInfo AsyncEngine::getJob()
jobQueueMutex.lock();

LuaJobInfo retval;
retval.valid = false;

if (!jobQueue.empty()) {
retval = jobQueue.front();
Expand All @@ -137,7 +137,7 @@ LuaJobInfo AsyncEngine::getJob()
}

/******************************************************************************/
void AsyncEngine::putJobResult(LuaJobInfo result)
void AsyncEngine::putJobResult(const LuaJobInfo &result)
{
resultQueueMutex.lock();
resultQueue.push_back(result);
Expand Down Expand Up @@ -264,7 +264,7 @@ void* AsyncWorkerThread::run()
// Wait for job
LuaJobInfo toProcess = jobDispatcher->getJob();

if (toProcess.valid == false || stopRequested()) {
if (!toProcess.valid || stopRequested()) {
continue;
}

Expand Down
15 changes: 12 additions & 3 deletions src/script/cpp_api/s_async.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ class AsyncEngine;
// Declarations

// Data required to queue a job
struct LuaJobInfo {
struct LuaJobInfo
{
LuaJobInfo() :
serializedFunction(""),
serializedParams(""),
serializedResult(""),
id(0),
valid(false)
{}

// Function to be called in async environment
std::string serializedFunction;
// Parameter to be passed to function
Expand Down Expand Up @@ -89,7 +98,7 @@ class AsyncEngine {
* @param params Serialized parameters
* @return jobid The job is queued
*/
unsigned int queueAsyncJob(std::string func, std::string params);
unsigned int queueAsyncJob(const std::string &func, const std::string &params);

/**
* Engine step to process finished jobs
Expand All @@ -116,7 +125,7 @@ class AsyncEngine {
* Put a Job result back to result queue
* @param result result of completed job
*/
void putJobResult(LuaJobInfo result);
void putJobResult(const LuaJobInfo &result);

/**
* Initialize environment with current registred functions
Expand Down
8 changes: 5 additions & 3 deletions src/script/scripting_mainmenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,15 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
}

/******************************************************************************/
void MainMenuScripting::step() {
void MainMenuScripting::step()
{
asyncEngine.step(getStack());
}

/******************************************************************************/
unsigned int MainMenuScripting::queueAsync(std::string serialized_func,
std::string serialized_param) {
unsigned int MainMenuScripting::queueAsync(const std::string &serialized_func,
const std::string &serialized_param)
{
return asyncEngine.queueAsyncJob(serialized_func, serialized_param);
}

4 changes: 2 additions & 2 deletions src/script/scripting_mainmenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class MainMenuScripting
void step();

// Pass async events from engine to async threads
unsigned int queueAsync(std::string serialized_func,
std::string serialized_params);
unsigned int queueAsync(const std::string &serialized_func,
const std::string &serialized_params);
private:
void initializeModApi(lua_State *L, int top);

Expand Down
12 changes: 7 additions & 5 deletions src/sound.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ class OnDemandSoundFetcher

struct SimpleSoundSpec
{
SimpleSoundSpec(const std::string &name = "", float gain = 1.0) :
name(name),
gain(gain)
{}

bool exists() const { return name != ""; }

std::string name;
float gain;
SimpleSoundSpec(std::string name = "", float gain = 1.0) : name(name), gain(gain)
{
}
bool exists() { return name != ""; }
// Serialization intentionally left out
};

class ISoundManager
Expand Down
2 changes: 1 addition & 1 deletion src/util/string.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ inline std::vector<std::basic_string<T> > str_split(
*/
inline std::string lowercase(const std::string &str)
{
std::string s2;
std::string s2 = "";

s2.reserve(str.size());

Expand Down
14 changes: 4 additions & 10 deletions src/util/thread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "container.h"

template<typename T>
class MutexedVariable {
class MutexedVariable
{
public:
MutexedVariable(T value):
MutexedVariable(const T &value):
m_value(value)
{}

Expand All @@ -41,21 +42,14 @@ class MutexedVariable {
return m_value;
}

void set(T value)
void set(const T &value)
{
MutexAutoLock lock(m_mutex);
m_value = value;
}

// You'll want to grab this in a SharedPtr
MutexAutoLock *getLock()
{
return new MutexAutoLock(m_mutex);
}

// You pretty surely want to grab the lock when accessing this
T m_value;

private:
Mutex m_mutex;
};
Expand Down