aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api/l_client.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
commit6ccb5835ff55d85156be91473c598eca9d6cb9a6 (patch)
tree7f1eaf8b94694c8e24e206909ba8f55a1ebfbb3e /src/script/lua_api/l_client.cpp
parent244713971a976e43e8740b6a9d9d122e37020ef2 (diff)
downloaddragonfireclient-6ccb5835ff55d85156be91473c598eca9d6cb9a6.tar.xz
Revert "Make Lint Happy"
This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
Diffstat (limited to 'src/script/lua_api/l_client.cpp')
-rw-r--r--src/script/lua_api/l_client.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 1bc4829d4..9961471ff 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -38,12 +38,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "client/keycode.h"
-#define checkCSMRestrictionFlag(flag) \
- (getClient(L)->checkCSMRestrictionFlag(CSMRestrictionFlags::flag))
+#define checkCSMRestrictionFlag(flag) \
+ ( getClient(L)->checkCSMRestrictionFlag(CSMRestrictionFlags::flag) )
// Not the same as FlagDesc, which contains an `u32 flag`
-struct CSMFlagDesc
-{
+struct CSMFlagDesc {
const char *name;
u64 flag;
};
@@ -54,12 +53,14 @@ struct CSMFlagDesc
in network/networkprotocol.h
*/
const static CSMFlagDesc flagdesc_csm_restriction[] = {
- {"load_client_mods", CSM_RF_LOAD_CLIENT_MODS},
- {"chat_messages", CSM_RF_CHAT_MESSAGES},
- {"read_itemdefs", CSM_RF_READ_ITEMDEFS},
- {"read_nodedefs", CSM_RF_READ_NODEDEFS},
- {"lookup_nodes", CSM_RF_LOOKUP_NODES},
- {"read_playerinfo", CSM_RF_READ_PLAYERINFO}, {NULL, 0}};
+ {"load_client_mods", CSM_RF_LOAD_CLIENT_MODS},
+ {"chat_messages", CSM_RF_CHAT_MESSAGES},
+ {"read_itemdefs", CSM_RF_READ_ITEMDEFS},
+ {"read_nodedefs", CSM_RF_READ_NODEDEFS},
+ {"lookup_nodes", CSM_RF_LOOKUP_NODES},
+ {"read_playerinfo", CSM_RF_READ_PLAYERINFO},
+ {NULL, 0}
+};
// get_current_modname()
int ModApiClient::l_get_current_modname(lua_State *L)
@@ -421,7 +422,7 @@ int ModApiClient::l_send_damage(lua_State *L)
{
u16 damage = luaL_checknumber(L, 1);
getClient(L)->sendDamage(damage);
- return 0;
+ return 0;
}
// place_node(pos)
@@ -432,8 +433,7 @@ int ModApiClient::l_place_node(lua_State *L)
LocalPlayer *player = client->getEnv().getLocalPlayer();
ItemStack selected_item, hand_item;
player->getWieldedItem(&selected_item, &hand_item);
- const ItemDefinition &selected_def =
- selected_item.getDefinition(getGameDef(L)->idef());
+ const ItemDefinition &selected_def = selected_item.getDefinition(getGameDef(L)->idef());
v3s16 pos = read_v3s16(L, 1);
PointedThing pointed;
pointed.type = POINTEDTHING_NODE;
@@ -465,7 +465,7 @@ int ModApiClient::l_get_inventory(lua_State *L)
InventoryLocation inventory_location;
Inventory *inventory;
std::string location;
-
+
location = readParam<std::string>(L, 1);
try {
@@ -475,7 +475,7 @@ int ModApiClient::l_get_inventory(lua_State *L)
} catch (SerializationError &) {
lua_pushnil(L);
}
-
+
return 1;
}
@@ -508,17 +508,17 @@ int ModApiClient::l_drop_selected_item(lua_State *L)
int ModApiClient::l_get_objects_inside_radius(lua_State *L)
{
ClientEnvironment &env = getClient(L)->getEnv();
-
+
v3f pos = checkFloatPos(L, 1);
float radius = readParam<float>(L, 2) * BS;
-
+
std::vector<DistanceSortedActiveObject> objs;
env.getActiveObjects(pos, radius, objs);
-
+
int i = 0;
lua_createtable(L, objs.size(), 0);
for (const auto obj : objs) {
- ClientObjectRef::create(L, obj.obj); // TODO: getObjectRefOrCreate
+ ClientObjectRef::create(L, obj.obj); // TODO: getObjectRefOrCreate
lua_rawseti(L, -2, ++i);
}
return 1;