Files
@ r28475:11127afc698f
Branch filter:
Location: cpp/openttd-patchpack/source/src/script/api/script_admin.cpp - annotation
r28475:11127afc698f
3.4 KiB
text/x-c
Fix #11785, cf16f45: when bumping aircraft into the air, remove them from the loading vehicle list again
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r21393:f13542d5121d r27904:73387ac1bea0 r27871:5fa5d936a679 r21383:942c32fb8b0e r21383:942c32fb8b0e r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r27871:5fa5d936a679 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r21639:04805e592ebb r21639:04805e592ebb r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r27871:5fa5d936a679 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r27871:5fa5d936a679 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r21642:d4ee019baf14 r18765:0c8917c89d77 r18765:0c8917c89d77 r21642:d4ee019baf14 r18765:0c8917c89d77 r18765:0c8917c89d77 r27866:3f9e6f663ed1 r27871:5fa5d936a679 r27846:a902f22a5d7d r27846:a902f22a5d7d r27846:a902f22a5d7d r18765:0c8917c89d77 r27866:3f9e6f663ed1 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 r18765:0c8917c89d77 | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD 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 General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file script_admin.cpp Implementation of ScriptAdmin. */
#include "../../stdafx.h"
#include "script_admin.hpp"
#include "script_log.hpp"
#include "../../network/network_admin.h"
#include "../script_instance.hpp"
#include "../../string_func.h"
#include "../../3rdparty/nlohmann/json.hpp"
#include "../../safeguards.h"
/**
* Convert a Squirrel structure into a JSON object.
*
* This function is not "static", so it can be tested in unittests.
*
* @param json The resulting JSON object.
* @param vm The VM to operate on.
* @param index The index we are currently working for.
* @param depth The current depth in the squirrel struct.
* @return True iff the conversion was successful.
*/
bool ScriptAdminMakeJSON(nlohmann::json &json, HSQUIRRELVM vm, SQInteger index, int depth = 0)
{
if (depth == SQUIRREL_MAX_DEPTH) {
ScriptLog::Error("Send parameters can only be nested to 25 deep. No data sent."); // SQUIRREL_MAX_DEPTH = 25
return false;
}
switch (sq_gettype(vm, index)) {
case OT_INTEGER: {
SQInteger res;
sq_getinteger(vm, index, &res);
json = res;
return true;
}
case OT_STRING: {
const SQChar *buf;
sq_getstring(vm, index, &buf);
json = std::string(buf);
return true;
}
case OT_ARRAY: {
json = nlohmann::json::array();
sq_pushnull(vm);
while (SQ_SUCCEEDED(sq_next(vm, index - 1))) {
nlohmann::json tmp;
bool res = ScriptAdminMakeJSON(tmp, vm, -1, depth + 1);
sq_pop(vm, 2);
if (!res) {
sq_pop(vm, 1);
return false;
}
json.push_back(tmp);
}
sq_pop(vm, 1);
return true;
}
case OT_TABLE: {
json = nlohmann::json::object();
sq_pushnull(vm);
while (SQ_SUCCEEDED(sq_next(vm, index - 1))) {
/* Squirrel ensure the key is a string. */
assert(sq_gettype(vm, -2) == OT_STRING);
const SQChar *buf;
sq_getstring(vm, -2, &buf);
std::string key = std::string(buf);
nlohmann::json value;
bool res = ScriptAdminMakeJSON(value, vm, -1, depth + 1);
sq_pop(vm, 2);
if (!res) {
sq_pop(vm, 1);
return false;
}
json[key] = value;
}
sq_pop(vm, 1);
return true;
}
case OT_BOOL: {
SQBool res;
sq_getbool(vm, index, &res);
json = res ? true : false;
return true;
}
case OT_NULL: {
json = nullptr;
return true;
}
default:
ScriptLog::Error("You tried to send an unsupported type. No data sent.");
return false;
}
}
/* static */ SQInteger ScriptAdmin::Send(HSQUIRRELVM vm)
{
if (sq_gettop(vm) - 1 != 1) return sq_throwerror(vm, "wrong number of parameters");
if (sq_gettype(vm, 2) != OT_TABLE) {
return sq_throwerror(vm, "ScriptAdmin::Send requires a table as first parameter. No data sent.");
}
nlohmann::json json;
if (!ScriptAdminMakeJSON(json, vm, -1)) {
sq_pushinteger(vm, 0);
return 1;
}
NetworkAdminGameScript(json.dump());
sq_pushinteger(vm, 1);
return 1;
}
|