Fix access control to wagon properties - advtrains.git

diff options

author	Blockhead <jbis1337@hotmail.com>	2020-06-28 23:39:32 +1000
committer	Gabriel Pérez-Cerezo <gabriel@gpcf.eu>	2020-06-29 01:37:35 +0200
commit	eb2e5f4cdf2820a5bdf1a4f516bd9dcc8a2f2ce3 (patch)
tree	452fadbe68f1b6ab0dcb3df54ddf8aaefe62e34e /advtrains_train_subway/textures/advtrains_subway_wagon_line6.png
parent	0b14d8ddb131343a588f27b8c06f1742036d00a7 (diff)
download	advtrains-eb2e5f4cdf2820a5bdf1a4f516bd9dcc8a2f2ce3.tar.gz advtrains-eb2e5f4cdf2820a5bdf1a4f516bd9dcc8a2f2ce3.tar.bz2 advtrains-eb2e5f4cdf2820a5bdf1a4f516bd9dcc8a2f2ce3.zip

Fix access control to wagon properties

Previously, players were able to open the wagon properties of any wagon at all through the wagon properties button on the inventory formspec and through the wagon buttons on the onboard computer. Add a check for ownership before allowing players to open wagon properties.

Diffstat (limited to 'advtrains_train_subway/textures/advtrains_subway_wagon_line6.png')

0 files changed, 0 insertions, 0 deletions

/* Minetest Copyright (C) 2015 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 "profiler.h" #include "porting.h" static Profiler main_profiler; Profiler *g_profiler = &main_profiler; ScopeProfiler::ScopeProfiler( Profiler *profiler, const std::string &name, ScopeProfilerType type) : m_profiler(profiler), m_name(name), m_type(type) { m_name.append(" [ms]"); if (m_profiler) m_timer = new TimeTaker(m_name, nullptr, PRECISION_MILLI); } ScopeProfiler::~ScopeProfiler() { if (!m_timer) return; float duration_ms = m_timer->stop(true); float duration = duration_ms / 1000.0; if (m_profiler) { switch (m_type) { case SPT_ADD: m_profiler->add(m_name, duration); break; case SPT_AVG: m_profiler->avg(m_name, duration); break; case SPT_GRAPH_ADD: m_profiler->graphAdd(m_name, duration); break; } } delete m_timer; } Profiler::Profiler() { m_start_time = porting::getTimeMs(); } void Profiler::add(const std::string &name, float value) { MutexAutoLock lock(m_mutex); { /* No average shall have been used; mark add used as -2 */ std::map<std::string, int>::iterator n = m_avgcounts.find(name); if (n == m_avgcounts.end()) { m_avgcounts[name] = -2; } else { if (n->second == -1) n->second = -2; assert(n->second == -2); } } { std::map<std::string, float>::iterator n = m_data.find(name); if (n == m_data.end()) m_data[name] = value; else n->second += value; } } void Profiler::avg(const std::string &name, float value) { MutexAutoLock lock(m_mutex); int &count = m_avgcounts[name]; assert(count != -2); count = MYMAX(count, 0) + 1; m_data[name] += value; } void Profiler::clear() { MutexAutoLock lock(m_mutex); for (auto &it : m_data) { it.second = 0; } m_avgcounts.clear(); m_start_time = porting::getTimeMs(); } float Profiler::getValue(const std::string &name) const { auto numerator = m_data.find(name); if (numerator == m_data.end()) return 0.f; auto denominator = m_avgcounts.find(name); if (denominator != m_avgcounts.end()) { if (denominator->second >= 1) return numerator->second / denominator->second; } return numerator->second; } int Profiler::getAvgCount(const std::string &name) const { auto n = m_avgcounts.find(name); if (n != m_avgcounts.end() && n->second >= 1) return n->second; return 1; } u64 Profiler::getElapsedMs() const { return porting::getTimeMs() - m_start_time; } int Profiler::print(std::ostream &o, u32 page, u32 pagecount) { GraphValues values; getPage(values, page, pagecount); char num_buf[50]; for (const auto &i : values) { o << " " << i.first << " "; if (i.second == 0) { o << std::endl; continue; } s32 space = 44 - i.first.size(); for (s32 j = 0; j < space; j++) { if ((j & 1) && j < space - 1) o << "."; else o << " "; } porting::mt_snprintf(num_buf, sizeof(num_buf), "% 4ix % 3g", getAvgCount(i.first), i.second); o << num_buf << std::endl; } return values.size(); } void Profiler::getPage(GraphValues &o, u32 page, u32 pagecount) { MutexAutoLock lock(m_mutex); u32 minindex, maxindex; paging(m_data.size(), page, pagecount, minindex, maxindex); for (const auto &i : m_data) { if (maxindex == 0) break; maxindex--; if (minindex != 0) { minindex--; continue; } o[i.first] = i.second / getAvgCount(i.first); } }


context:
space:
mode: