Skip to content

Commit ed1301b

Browse files
botderbotder
committed
Refactor wrong usage of lua_getownerresource
1 parent 6cb9d3e commit ed1301b

File tree

4 files changed

+22
-33
lines changed

4 files changed

+22
-33
lines changed

‎Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ std::variant<CClientRadarMarker*, bool> CLuaBlipDefs::CreateBlip(lua_State* luaV
2525
size = MAX_BLIP_SIZE;
2626
}
2727

28-
CResource* resource = &lua_getownerresource(luaVM);
29-
if (!resource)
30-
return false;
28+
CResource& resource = lua_getownerresource(luaVM);
29+
CClientRadarMarker* radarMarker = CStaticFunctionDefinitions::CreateBlip(resource, vecPosition, icon.value_or(0), size.value_or(2),
30+
SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)),
31+
ordering.value_or(0), visibleDistance.value_or(16383));
3132

32-
CClientRadarMarker* radarMarker = CStaticFunctionDefinitions::CreateBlip(*resource, vecPosition, icon.value_or(0), size.value_or(2), SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)), ordering.value_or(0), visibleDistance.value_or(16383));
3333
if (!radarMarker)
3434
return false;
3535

36-
if (CElementGroup* elementGroup = resource->GetElementGroup())
36+
if (CElementGroup* elementGroup = resource.GetElementGroup())
3737
elementGroup->Add(radarMarker);
3838

3939
return radarMarker;
@@ -50,15 +50,15 @@ std::variant<CClientRadarMarker*, bool> CLuaBlipDefs::CreateBlipAttachedTo(lua_S
5050
size = MAX_BLIP_SIZE;
5151
}
5252

53-
CResource* resource = &lua_getownerresource(luaVM);
54-
if (!resource)
55-
return false;
53+
CResource& resource = lua_getownerresource(luaVM);
54+
CClientRadarMarker* radarMarker = CStaticFunctionDefinitions::CreateBlipAttachedTo(
55+
resource, *entity, icon.value_or(0), size.value_or(2), SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)), ordering.value_or(0),
56+
visibleDistance.value_or(16383));
5657

57-
CClientRadarMarker* radarMarker = CStaticFunctionDefinitions::CreateBlipAttachedTo(*resource, *entity, icon.value_or(0), size.value_or(2), SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)), ordering.value_or(0), visibleDistance.value_or(16383));
5858
if (!radarMarker)
5959
return false;
6060

61-
if (CElementGroup* elementGroup = resource->GetElementGroup())
61+
if (CElementGroup* elementGroup = resource.GetElementGroup())
6262
elementGroup->Add(radarMarker);
6363

6464
return radarMarker;

‎Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,7 @@ std::string CLuaResourceDefs::GetResourceName(lua_State* luaVM, std::optional<CR
227227
if (resourceElement.has_value())
228228
return (*resourceElement)->GetName();
229229

230-
CResource* localResource = &lua_getownerresource(luaVM);
231-
232-
if (!localResource)
233-
throw std::invalid_argument("Couldn't find the resource");
234-
235-
return localResource->GetName();
230+
return lua_getownerresource(luaVM).GetName();
236231
}
237232

238233
int CLuaResourceDefs::GetResourceFromName(lua_State* luaVM)

‎Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ std::variant<CBlip*, bool> CLuaBlipDefs::CreateBlip(lua_State* luaVM, const CVec
2828
size = MAX_BLIP_SIZE;
2929
}
3030

31-
CResource* resource = &lua_getownerresource(luaVM);
32-
if (!resource)
33-
return false;
34-
35-
CBlip* radarMarker = CStaticFunctionDefinitions::CreateBlip(resource, vecPosition, icon.value_or(0), size.value_or(2), SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)), ordering.value_or(0), visibleDistance.value_or(16383), visibleTo.value_or(nullptr));
31+
CResource& resource = lua_getownerresource(luaVM);
32+
CBlip* radarMarker = CStaticFunctionDefinitions::CreateBlip(&resource, vecPosition, icon.value_or(0), size.value_or(2),
33+
SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)),
34+
ordering.value_or(0), visibleDistance.value_or(16383), visibleTo.value_or(nullptr));
3635
if (!radarMarker)
3736
return false;
3837

39-
if (CElementGroup* elementGroup = resource->GetElementGroup())
38+
if (CElementGroup* elementGroup = resource.GetElementGroup())
4039
elementGroup->Add(radarMarker);
4140

4241
return radarMarker;
@@ -53,15 +52,15 @@ std::variant<CBlip*, bool> CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM,
5352
size = MAX_BLIP_SIZE;
5453
}
5554

56-
CResource* resource = &lua_getownerresource(luaVM);
57-
if (!resource)
58-
return false;
55+
CResource& resource = lua_getownerresource(luaVM);
56+
CBlip* radarMarker = CStaticFunctionDefinitions::CreateBlipAttachedTo(&resource, entity, icon.value_or(0), size.value_or(2),
57+
SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)),
58+
ordering.value_or(0), visibleDistance.value_or(16383), visibleTo.value_or(nullptr));
5959

60-
CBlip* radarMarker = CStaticFunctionDefinitions::CreateBlipAttachedTo(resource, entity, icon.value_or(0), size.value_or(2), SColorRGBA(r.value_or(255), g.value_or(0), b.value_or(0), a.value_or(255)), ordering.value_or(0), visibleDistance.value_or(16383), visibleTo.value_or(nullptr));
6160
if (!radarMarker)
6261
return false;
6362

64-
if (CElementGroup* elementGroup = resource->GetElementGroup())
63+
if (CElementGroup* elementGroup = resource.GetElementGroup())
6564
elementGroup->Add(radarMarker);
6665

6766
return radarMarker;

‎Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -903,12 +903,7 @@ std::string CLuaResourceDefs::GetResourceName(lua_State* luaVM, std::optional<CR
903903
if (resourceElement.has_value())
904904
return (*resourceElement)->GetName();
905905

906-
CResource* localResource = &lua_getownerresource(luaVM);
907-
908-
if (!localResource)
909-
throw std::invalid_argument("Couldn't find the resource");
910-
911-
return localResource->GetName();
906+
return lua_getownerresource(luaVM).GetName();
912907
}
913908

914909
int CLuaResourceDefs::getResourceRootElement(lua_State* luaVM)

0 commit comments

Comments
 (0)