diff --git a/.efrocachemap b/.efrocachemap
index 1826e6f9..42ec3c4d 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -420,7 +420,7 @@
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/a9/71/9286d55c45c37877f3267850f90b",
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/2f/09/36e691de67eb8f155449a7170861",
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/fd/a8/ad50785ce206e8dc3dcc7358b173",
- "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/16/4d/53c97486d0669727b400beecefec",
+ "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/d3/ac/c9ea9fa822efd364afa707011ed7",
"assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/ac/3e/c50dc4e98df47f858c3a73ac4272",
"assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/44/ed/5b972fa848cffb73723533c2ccb7",
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/9d/63/d360eeff63bc64e098427498880d",
@@ -447,7 +447,7 @@
"assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/71/db/e23447c97d40b8a0d83f185f4bba",
"assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/e1/22/5471375791f8825a63e06371df29",
"assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/15/01/cab2f74365e69216a7eeeef51f98",
- "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/d6/2d/260aa8d8cd7050f2d9a131d062ca",
+ "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/bd/be/7bf759c649d8a4e263e19c31b217",
"assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0",
"assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/5b/c4/2173bc10edea17ed3734f08a8c94",
"assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/3e/f3/4e9003c88e959d0d75a225c7a87e",
@@ -3932,40 +3932,40 @@
"assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450",
"assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e",
"assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
- "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cc/c6/de49df32988ff2af73ab9a4c6571",
- "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/95/97/f6a1324ee16fbc9337914ca0bc97",
- "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bf/f5/1e86cc48dc80b6a45d3093307572",
- "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/06/42/56e114de5a1cd3be38ced2a22e7c",
- "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/03/9e/7b98f72572f805d9724cb2ac02a8",
- "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/06/41db5f80a6128bbb92b2800579f6",
- "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cb/d8/8f9d77f8ade2019501c8bcf706e0",
- "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/df/bf/7a286415b507c22b6da1e97ab2b4",
- "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/79/c9/99354d0a28813886a68449ef0f40",
- "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b3/23/8ead101743fd137405caea8ea33d",
- "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d1/4e/d8437a12814e44cd8931bf7461e6",
- "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a0/25/197f33995e67f51582644bce5b46",
- "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a5/b0/a49e7890c4316e80384ee8dd51bb",
- "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/01/968ae8a880fefe27a78c8ebf17e6",
- "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/80/6a/5e1770f3d515ce187cc0e2826f13",
- "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/51/ca/e1d9bb4a34edf86b7da4da881ff0",
- "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/89/c8/8b189db0198c5da280c40cd93478",
- "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/d9/53/7aa5bc4721c5059e7e389e14881d",
- "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/79/33/5eaf44c0165e4b159ffc72c2b8db",
- "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/74/ff/4d34e2d4e06279628719eaee0d00",
- "build/prefab/lib/linux_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/77/82/a686d8e79268f3eedc6b9df19823",
- "build/prefab/lib/linux_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e7/87/02c66778dde288509a5277ba69a5",
- "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/79/a5/46f07164fcdbe1b91717e243b892",
- "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6d/fa/ec0729da657c4e32ad9b7003f35a",
- "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/41/84/e054c6fb551d59403c26041e1ee4",
- "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/63/ee/26d31df7b2bb9eb5e95370b3059a",
- "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e4/74/49599bc0fea61ee417abc05998d5",
- "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d2/42/8e9d71c5f5dd25c9f3373bb7f2ee",
- "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a7/2b/db6827b70fb75cb0b704728549c3",
- "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0b/6d/da598c70d9fd5b5004522cb87cd2",
- "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ca/14/bb5df712ab66a7710a4849365d17",
- "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/20/a2/d7b2b231652c77b91c07015842c0",
- "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/30/f9/9ccccb3e0a58ad6b53c142110f24",
- "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d5/82/5d3db5a8c366c92593bcda4da166",
- "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/36/c9/16437744fe29aea7970ccb8420a8",
- "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6e/c0/a1a3df106f5cc0216f3dcebf1181"
+ "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/05/97/c75696243a0e63432d7a07b9e541",
+ "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4f/f4/58b1276d799f260a917151942188",
+ "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4a/27/83c7019c59300c2aca4f5a754051",
+ "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2b/38/ce62f31635fe2e55878a64fe83cd",
+ "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cb/7e/c443e2cbfe0e801b55052884f439",
+ "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/83/a6/c12fd0f06e2d4a1fd321e7167cca",
+ "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bd/23/b1d1778ecf9b94fc2f0dbae16871",
+ "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/16/42/b1f3e1e5402b678803a2293b4bca",
+ "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f0/a8/be099908c78b407dfc9b09124ee6",
+ "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/72/04/18d03c9d9f77c44c16d088fbb70b",
+ "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/da/f1/727f2ac37aa51173dc5e3015644d",
+ "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/94/1b/4f45419c394074d8f5c1e047c96f",
+ "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/68/2d/9c107b87643a661f096c044ab8ef",
+ "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7a/29/18fcde057dc0e188216378155bba",
+ "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d5/e2/d243cb95d5311bbfe1f1e0b98243",
+ "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e3/4e/1ff439845d41e434797237c66d50",
+ "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/15/ab/01a1b43e6cecc51996bb767a5a60",
+ "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/56/19/5616c88a0027a1d55cf1b13311aa",
+ "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/1f/24/3bf3efb77893fe8a3bf5e67a7df2",
+ "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/19/b2/01519693dc088ba6b2024ff14890",
+ "build/prefab/lib/linux_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f1/c8/a4a550a865921406b9ff2200b4e9",
+ "build/prefab/lib/linux_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/64/d2/d78ca40dfa9160204852a285cbcb",
+ "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/2e/71b22e2c2215ab9c23f48bf865bc",
+ "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8c/e8/3216f8d6ee4a579bcfbd8328006c",
+ "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0c/09/c000299176fa0befab116264bc0f",
+ "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ab/b4/cceb8aebfe34ff004c1d5d731e82",
+ "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/a7/5770e8eb3dfd4aa9eab8d5d21140",
+ "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/56/13/c0b33bddae9718f8f6a08b232fbb",
+ "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f2/54/c06d0c7be96d8189bcb9f1f973ee",
+ "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e6/9f/d454ad6d0a929cf50a25e00fbb1c",
+ "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c4/34/5547240bb2426fef6f94f86c56f4",
+ "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5e/df/35bc323b5d93d7b87072962b1c42",
+ "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5e/cb/2a6a8335774f4fba807f0b76c80e",
+ "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b1/2a/70248a9b34e2ff29ee755698f3b4",
+ "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/73/12/ad5165079a5a7a6617cd7754d90d",
+ "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1c/a9/8a27edf168183efb6aa0b8284862"
}
\ No newline at end of file
diff --git a/docs/ba_module.md b/docs/ba_module.md
index e95c0401..667d9e75 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2021-04-14 for Ballistica version 1.6.0 build 20335
+last updated on 2021-04-15 for Ballistica version 1.6.0 build 20337
This page documents the Python classes and functions in the 'ba' module,
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!
diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc
index b789e123..8d4adbfc 100644
--- a/src/ballistica/ballistica.cc
+++ b/src/ballistica/ballistica.cc
@@ -21,7 +21,7 @@
namespace ballistica {
// These are set automatically via script; don't change here.
-const int kAppBuildNumber = 20336;
+const int kAppBuildNumber = 20338;
const char* kAppVersion = "1.6.0";
// Our standalone globals.
diff --git a/src/ballistica/python/methods/python_methods_input.cc b/src/ballistica/python/methods/python_methods_input.cc
index 18440a43..f523bd40 100644
--- a/src/ballistica/python/methods/python_methods_input.cc
+++ b/src/ballistica/python/methods/python_methods_input.cc
@@ -60,42 +60,6 @@ auto PyStopListeningForWiiRemotes(PyObject* self, PyObject* args) -> PyObject* {
BA_PYTHON_CATCH;
}
-auto PySetDeviceAccount(PyObject* self, PyObject* args, PyObject* keywds)
- -> PyObject* {
- BA_PYTHON_TRY;
- Platform::SetLastPyCall("set_device_account");
- std::string name;
- PyObject* name_obj;
- static const char* kwlist[] = {"name", nullptr};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "O",
- const_cast(kwlist), &name_obj)) {
- return nullptr;
- }
- name = Python::GetPyString(name_obj);
- AccountType account_type;
-
- // on headless builds we keep these distinct from regular
- // device accounts (so we get a 'ServerXXX' name, etc)
-#if BA_HEADLESS_BUILD
- account_type = AccountType::kServer;
-#else
- account_type = AccountType::kDevice;
-#endif
- g_game->PushSetAccountCall(account_type, AccountState::kSignedIn, name,
- g_platform->GetDeviceAccountID());
- Py_RETURN_NONE;
- BA_PYTHON_CATCH;
-}
-
-auto PyGetDeviceLoginID(PyObject* self, PyObject* args, PyObject* keywds)
- -> PyObject* {
- BA_PYTHON_TRY;
- Platform::SetLastPyCall("get_device_login_id");
- assert(Utils::IsValidUTF8(g_platform->GetDeviceAccountID()));
- return PyUnicode_FromString(g_platform->GetDeviceAccountID().c_str());
- BA_PYTHON_CATCH;
-}
-
auto PySetTouchscreenEditing(PyObject* self, PyObject* args) -> PyObject* {
BA_PYTHON_TRY;
Platform::SetLastPyCall("set_touchscreen_editing");
@@ -350,12 +314,6 @@ auto PythonMethodsInput::GetMethods() -> std::vector {
"\n"
"(internal)"},
- {"get_device_login_id", (PyCFunction)PyGetDeviceLoginID,
- METH_VARARGS | METH_KEYWORDS, "internal"},
-
- {"set_device_account", (PyCFunction)PySetDeviceAccount,
- METH_VARARGS | METH_KEYWORDS, "internal"},
-
{"stop_listening_for_wii_remotes", PyStopListeningForWiiRemotes,
METH_VARARGS,
"stop_listening_for_wii_remotes() -> None\n"
diff --git a/src/ballistica/python/python_command.cc b/src/ballistica/python/python_command.cc
index bf13f7f7..187bde06 100644
--- a/src/ballistica/python/python_command.cc
+++ b/src/ballistica/python/python_command.cc
@@ -144,7 +144,11 @@ auto PythonCommand::RunReturnObj(bool print_errors, PyObject* context)
if (context == nullptr) {
context = g_python->main_dict();
}
+
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "RedundantCast"
assert(PyDict_Check(context));
+#pragma clang diagnostic pop
if (!eval_code_obj_.get()) {
CompileForEval(print_errors);