Skip to content

Commit 9ab8fa3

Browse files
StrixGStrixG
authored
Move client-side world functions to CLuaWorldDefs (#1731)
Also move fetchRemote related functions to CLuaNetworkDefs on client-side.
1 parent 2bdde45 commit 9ab8fa3

File tree

7 files changed

+646
-582
lines changed

7 files changed

+646
-582
lines changed

‎Client/mods/deathmatch/StdInc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#include <luadefs/CLuaEngineDefs.h>
123123
#include <luadefs/CLuaGUIDefs.h>
124124
#include <luadefs/CLuaMarkerDefs.h>
125+
#include <luadefs/CLuaNetworkDefs.h>
125126
#include <luadefs/CLuaObjectDefs.h>
126127
#include <luadefs/CLuaPointLightDefs.h>
127128
#include <luadefs/CLuaPedDefs.h>
@@ -137,6 +138,7 @@
137138
#include <luadefs/CLuaVehicleDefs.h>
138139
#include <luadefs/CLuaWaterDefs.h>
139140
#include <luadefs/CLuaWeaponDefs.h>
141+
#include <luadefs/CLuaWorldDefs.h>
140142
#include <CRemoteCalls.h>
141143

142144
// Shared includes

‎Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.h

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ class CLuaFunctionDefs
6464
LUA_DECLARE(GetTypeIndexFromClothes);
6565
LUA_DECLARE(GetClothesTypeName);
6666

67-
// Explosion functions
68-
LUA_DECLARE(CreateExplosion);
69-
7067
// Cursor funcs
7168
LUA_DECLARE(GetCursorPosition);
7269
LUA_DECLARE(SetCursorPosition);
@@ -82,107 +79,6 @@ class CLuaFunctionDefs
8279
LUA_DECLARE(SetDevelopmentMode);
8380
LUA_DECLARE(GetDevelopmentMode);
8481

85-
// World functions
86-
LUA_DECLARE(GetTime_);
87-
LUA_DECLARE(GetGroundPosition);
88-
LUA_DECLARE(GetRoofPosition);
89-
LUA_DECLARE(ProcessLineOfSight);
90-
LUA_DECLARE(IsLineOfSightClear);
91-
LUA_DECLARE(GetWorldFromScreenPosition);
92-
LUA_DECLARE(GetScreenFromWorldPosition);
93-
LUA_DECLARE(GetWeather);
94-
LUA_DECLARE(GetZoneName);
95-
LUA_DECLARE(GetGravity);
96-
LUA_DECLARE(GetGameSpeed);
97-
LUA_DECLARE(GetMinuteDuration);
98-
LUA_DECLARE(GetWaveHeight);
99-
LUA_DECLARE(IsGarageOpen);
100-
LUA_DECLARE(GetGaragePosition);
101-
LUA_DECLARE(GetGarageSize);
102-
LUA_DECLARE(GetGarageBoundingBox);
103-
LUA_DECLARE(IsWorldSpecialPropertyEnabled);
104-
LUA_DECLARE(GetBlurLevel);
105-
LUA_DECLARE(GetTrafficLightState);
106-
LUA_DECLARE(AreTrafficLightsLocked);
107-
LUA_DECLARE(GetJetpackMaxHeight);
108-
LUA_DECLARE(GetAircraftMaxHeight);
109-
LUA_DECLARE(GetAircraftMaxVelocity);
110-
LUA_DECLARE(GetOcclusionsEnabled);
111-
112-
LUA_DECLARE(SetTime);
113-
LUA_DECLARE(GetSkyGradient);
114-
LUA_DECLARE(SetSkyGradient);
115-
LUA_DECLARE(ResetSkyGradient);
116-
LUA_DECLARE(GetHeatHaze);
117-
LUA_DECLARE(SetHeatHaze);
118-
LUA_DECLARE(ResetHeatHaze);
119-
LUA_DECLARE(SetWeather);
120-
LUA_DECLARE(SetWeatherBlended);
121-
LUA_DECLARE(SetGravity);
122-
LUA_DECLARE(SetGameSpeed);
123-
LUA_DECLARE(SetMinuteDuration);
124-
LUA_DECLARE(SetWaveHeight);
125-
LUA_DECLARE(SetGarageOpen);
126-
LUA_DECLARE(SetWorldSpecialPropertyEnabled);
127-
LUA_DECLARE(SetBlurLevel);
128-
LUA_DECLARE(ResetBlurLevel);
129-
LUA_DECLARE(SetJetpackMaxHeight);
130-
LUA_DECLARE(SetCloudsEnabled);
131-
LUA_DECLARE(GetCloudsEnabled);
132-
LUA_DECLARE(SetTrafficLightState);
133-
LUA_DECLARE(SetTrafficLightsLocked);
134-
LUA_DECLARE(GetWindVelocity);
135-
LUA_DECLARE(SetWindVelocity);
136-
LUA_DECLARE(ResetWindVelocity);
137-
LUA_DECLARE(GetInteriorSoundsEnabled);
138-
LUA_DECLARE(SetInteriorSoundsEnabled);
139-
LUA_DECLARE(GetInteriorFurnitureEnabled);
140-
LUA_DECLARE(SetInteriorFurnitureEnabled);
141-
LUA_DECLARE(GetRainLevel);
142-
LUA_DECLARE(SetRainLevel);
143-
LUA_DECLARE(ResetRainLevel);
144-
LUA_DECLARE(GetFarClipDistance);
145-
LUA_DECLARE(SetFarClipDistance);
146-
LUA_DECLARE(ResetFarClipDistance);
147-
LUA_DECLARE(GetNearClipDistance);
148-
LUA_DECLARE(SetNearClipDistance);
149-
LUA_DECLARE(ResetNearClipDistance);
150-
LUA_DECLARE(GetVehiclesLODDistance);
151-
LUA_DECLARE(SetVehiclesLODDistance);
152-
LUA_DECLARE(ResetVehiclesLODDistance);
153-
LUA_DECLARE(GetPedsLODDistance);
154-
LUA_DECLARE(SetPedsLODDistance);
155-
LUA_DECLARE(ResetPedsLODDistance);
156-
LUA_DECLARE(GetFogDistance);
157-
LUA_DECLARE(SetFogDistance);
158-
LUA_DECLARE(ResetFogDistance);
159-
LUA_DECLARE(GetSunColor);
160-
LUA_DECLARE(SetSunColor);
161-
LUA_DECLARE(ResetSunColor);
162-
LUA_DECLARE(GetSunSize);
163-
LUA_DECLARE(SetSunSize);
164-
LUA_DECLARE(ResetSunSize);
165-
LUA_DECLARE(RemoveWorldBuilding);
166-
LUA_DECLARE(RestoreWorldBuildings);
167-
LUA_DECLARE(RestoreWorldBuilding);
168-
LUA_DECLARE(SetAircraftMaxHeight);
169-
LUA_DECLARE(SetAircraftMaxVelocity);
170-
LUA_DECLARE(SetOcclusionsEnabled);
171-
LUA_DECLARE(CreateSWATRope);
172-
LUA_DECLARE(SetBirdsEnabled);
173-
LUA_DECLARE(GetBirdsEnabled);
174-
LUA_DECLARE(SetPedTargetingMarkerEnabled);
175-
LUA_DECLARE(IsPedTargetingMarkerEnabled);
176-
LUA_DECLARE(SetMoonSize);
177-
LUA_DECLARE(GetMoonSize);
178-
LUA_DECLARE(ResetMoonSize);
179-
LUA_DECLARE(SetFPSLimit);
180-
LUA_DECLARE(GetFPSLimit);
181-
LUA_DECLARE(FetchRemote);
182-
LUA_DECLARE(GetRemoteRequests);
183-
LUA_DECLARE(GetRemoteRequestInfo);
184-
LUA_DECLARE(AbortRemoteRequest);
185-
18682
// Input functions
18783
LUA_DECLARE(BindKey);
18884
LUA_DECLARE(UnbindKey);

‎Client/mods/deathmatch/logic/lua/CLuaManager.cpp

Lines changed: 1 addition & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@ void CLuaManager::LoadCFunctions()
244244
{"getTypeIndexFromClothes", CLuaFunctionDefs::GetTypeIndexFromClothes},
245245
{"getClothesTypeName", CLuaFunctionDefs::GetClothesTypeName},
246246

247-
// Explosion funcs
248-
{"createExplosion", CLuaFunctionDefs::CreateExplosion},
249-
250247
// Cursor funcs
251248
{"getCursorPosition", CLuaFunctionDefs::GetCursorPosition},
252249
{"setCursorPosition", CLuaFunctionDefs::SetCursorPosition},
@@ -259,106 +256,6 @@ void CLuaManager::LoadCFunctions()
259256
{"getValidPedModels", CLuaFunctionDefs::GetValidPedModels},
260257
{"downloadFile", CLuaFunctionDefs::DownloadFile},
261258

262-
// World get functions
263-
{"getTime", CLuaFunctionDefs::GetTime_},
264-
{"getRoofPosition", CLuaFunctionDefs::GetRoofPosition},
265-
{"getGroundPosition", CLuaFunctionDefs::GetGroundPosition},
266-
{"processLineOfSight", CLuaFunctionDefs::ProcessLineOfSight},
267-
{"getWorldFromScreenPosition", CLuaFunctionDefs::GetWorldFromScreenPosition},
268-
{"getScreenFromWorldPosition", CLuaFunctionDefs::GetScreenFromWorldPosition},
269-
{"getWeather", CLuaFunctionDefs::GetWeather},
270-
{"getZoneName", CLuaFunctionDefs::GetZoneName},
271-
{"getGravity", CLuaFunctionDefs::GetGravity},
272-
{"getGameSpeed", CLuaFunctionDefs::GetGameSpeed},
273-
{"getMinuteDuration", CLuaFunctionDefs::GetMinuteDuration},
274-
{"getWaveHeight", CLuaFunctionDefs::GetWaveHeight},
275-
{"getGaragePosition", CLuaFunctionDefs::GetGaragePosition},
276-
{"getGarageSize", CLuaFunctionDefs::GetGarageSize},
277-
{"getGarageBoundingBox", CLuaFunctionDefs::GetGarageBoundingBox},
278-
{"getBlurLevel", CLuaFunctionDefs::GetBlurLevel},
279-
{"getTrafficLightState", CLuaFunctionDefs::GetTrafficLightState},
280-
{"areTrafficLightsLocked", CLuaFunctionDefs::AreTrafficLightsLocked},
281-
{"getSkyGradient", CLuaFunctionDefs::GetSkyGradient},
282-
{"getHeatHaze", CLuaFunctionDefs::GetHeatHaze},
283-
{"getJetpackMaxHeight", CLuaFunctionDefs::GetJetpackMaxHeight},
284-
{"getWindVelocity", CLuaFunctionDefs::GetWindVelocity},
285-
{"getInteriorSoundsEnabled", CLuaFunctionDefs::GetInteriorSoundsEnabled},
286-
{"getInteriorFurnitureEnabled", CLuaFunctionDefs::GetInteriorFurnitureEnabled},
287-
{"getFarClipDistance", CLuaFunctionDefs::GetFarClipDistance},
288-
{"getNearClipDistance", CLuaFunctionDefs::GetNearClipDistance},
289-
{"getVehiclesLODDistance", CLuaFunctionDefs::GetVehiclesLODDistance},
290-
{"getPedsLODDistance", CLuaFunctionDefs::GetPedsLODDistance},
291-
{"getFogDistance", CLuaFunctionDefs::GetFogDistance},
292-
{"getSunColor", CLuaFunctionDefs::GetSunColor},
293-
{"getSunSize", CLuaFunctionDefs::GetSunSize},
294-
{"getAircraftMaxHeight", CLuaFunctionDefs::GetAircraftMaxHeight},
295-
{"getAircraftMaxVelocity", CLuaFunctionDefs::GetAircraftMaxVelocity},
296-
{"getOcclusionsEnabled", CLuaFunctionDefs::GetOcclusionsEnabled},
297-
{"getCloudsEnabled", CLuaFunctionDefs::GetCloudsEnabled},
298-
{"getRainLevel", CLuaFunctionDefs::GetRainLevel},
299-
{"getMoonSize", CLuaFunctionDefs::GetMoonSize},
300-
{"getFPSLimit", CLuaFunctionDefs::GetFPSLimit},
301-
{"getBirdsEnabled", CLuaFunctionDefs::GetBirdsEnabled},
302-
{"isPedTargetingMarkerEnabled", CLuaFunctionDefs::IsPedTargetingMarkerEnabled},
303-
{"isLineOfSightClear", CLuaFunctionDefs::IsLineOfSightClear},
304-
{"isWorldSpecialPropertyEnabled", CLuaFunctionDefs::IsWorldSpecialPropertyEnabled},
305-
{"isGarageOpen", CLuaFunctionDefs::IsGarageOpen},
306-
307-
// World set funcs
308-
{"setTime", CLuaFunctionDefs::SetTime},
309-
{"setSkyGradient", CLuaFunctionDefs::SetSkyGradient},
310-
{"setHeatHaze", CLuaFunctionDefs::SetHeatHaze},
311-
{"setWeather", CLuaFunctionDefs::SetWeather},
312-
{"setWeatherBlended", CLuaFunctionDefs::SetWeatherBlended},
313-
{"setGravity", CLuaFunctionDefs::SetGravity},
314-
{"setGameSpeed", CLuaFunctionDefs::SetGameSpeed},
315-
{"setWaveHeight", CLuaFunctionDefs::SetWaveHeight},
316-
{"setMinuteDuration", CLuaFunctionDefs::SetMinuteDuration},
317-
{"setGarageOpen", CLuaFunctionDefs::SetGarageOpen},
318-
{"setWorldSpecialPropertyEnabled", CLuaFunctionDefs::SetWorldSpecialPropertyEnabled},
319-
{"setBlurLevel", CLuaFunctionDefs::SetBlurLevel},
320-
{"resetBlurLevel", CLuaFunctionDefs::ResetBlurLevel},
321-
{"setJetpackMaxHeight", CLuaFunctionDefs::SetJetpackMaxHeight},
322-
{"setCloudsEnabled", CLuaFunctionDefs::SetCloudsEnabled},
323-
{"setTrafficLightState", CLuaFunctionDefs::SetTrafficLightState},
324-
{"setTrafficLightsLocked", CLuaFunctionDefs::SetTrafficLightsLocked},
325-
{"setWindVelocity", CLuaFunctionDefs::SetWindVelocity},
326-
{"setInteriorSoundsEnabled", CLuaFunctionDefs::SetInteriorSoundsEnabled},
327-
{"setInteriorFurnitureEnabled", CLuaFunctionDefs::SetInteriorFurnitureEnabled},
328-
{"setRainLevel", CLuaFunctionDefs::SetRainLevel},
329-
{"setFarClipDistance", CLuaFunctionDefs::SetFarClipDistance},
330-
{"setNearClipDistance", CLuaFunctionDefs::SetNearClipDistance},
331-
{"setVehiclesLODDistance", CLuaFunctionDefs::SetVehiclesLODDistance},
332-
{"setPedsLODDistance", CLuaFunctionDefs::SetPedsLODDistance},
333-
{"setFogDistance", CLuaFunctionDefs::SetFogDistance},
334-
{"setSunColor", CLuaFunctionDefs::SetSunColor},
335-
{"setSunSize", CLuaFunctionDefs::SetSunSize},
336-
{"setAircraftMaxHeight", CLuaFunctionDefs::SetAircraftMaxHeight},
337-
{"setAircraftMaxVelocity", CLuaFunctionDefs::SetAircraftMaxVelocity},
338-
{"setOcclusionsEnabled", CLuaFunctionDefs::SetOcclusionsEnabled},
339-
{"setBirdsEnabled", CLuaFunctionDefs::SetBirdsEnabled},
340-
{"setPedTargetingMarkerEnabled", CLuaFunctionDefs::SetPedTargetingMarkerEnabled},
341-
{"setMoonSize", CLuaFunctionDefs::SetMoonSize},
342-
{"setFPSLimit", CLuaFunctionDefs::SetFPSLimit},
343-
{"removeWorldModel", CLuaFunctionDefs::RemoveWorldBuilding},
344-
{"restoreAllWorldModels", CLuaFunctionDefs::RestoreWorldBuildings},
345-
{"restoreWorldModel", CLuaFunctionDefs::RestoreWorldBuilding},
346-
{"createSWATRope", CLuaFunctionDefs::CreateSWATRope},
347-
348-
// World reset funcs
349-
{"resetSkyGradient", CLuaFunctionDefs::ResetSkyGradient},
350-
{"resetHeatHaze", CLuaFunctionDefs::ResetHeatHaze},
351-
{"resetWindVelocity", CLuaFunctionDefs::ResetWindVelocity},
352-
{"resetRainLevel", CLuaFunctionDefs::ResetRainLevel},
353-
{"resetFarClipDistance", CLuaFunctionDefs::ResetFarClipDistance},
354-
{"resetNearClipDistance", CLuaFunctionDefs::ResetNearClipDistance},
355-
{"resetVehiclesLODDistance", CLuaFunctionDefs::ResetVehiclesLODDistance},
356-
{"resetPedsLODDistance", CLuaFunctionDefs::ResetPedsLODDistance},
357-
{"resetFogDistance", CLuaFunctionDefs::ResetFogDistance},
358-
{"resetSunColor", CLuaFunctionDefs::ResetSunColor},
359-
{"resetSunSize", CLuaFunctionDefs::ResetSunSize},
360-
{"resetMoonSize", CLuaFunctionDefs::ResetMoonSize},
361-
362259
// Input functions
363260
{"bindKey", CLuaFunctionDefs::BindKey},
364261
{"unbindKey", CLuaFunctionDefs::UnbindKey},
@@ -389,10 +286,6 @@ void CLuaManager::LoadCFunctions()
389286
{"getDevelopmentMode", CLuaFunctionDefs::GetDevelopmentMode},
390287
{"addDebugHook", CLuaFunctionDefs::AddDebugHook},
391288
{"removeDebugHook", CLuaFunctionDefs::RemoveDebugHook},
392-
{"fetchRemote", CLuaFunctionDefs::FetchRemote},
393-
{"getRemoteRequests", CLuaFunctionDefs::GetRemoteRequests},
394-
{"getRemoteRequestInfo", CLuaFunctionDefs::GetRemoteRequestInfo},
395-
{"abortRemoteRequest", CLuaFunctionDefs::AbortRemoteRequest},
396289

397290
// Version functions
398291
{"getVersion", CLuaFunctionDefs::GetVersion},
@@ -438,5 +331,6 @@ void CLuaManager::LoadCFunctions()
438331
CLuaVehicleDefs::LoadFunctions();
439332
CLuaWaterDefs::LoadFunctions();
440333
CLuaWeaponDefs::LoadFunctions();
334+
CLuaWorldDefs::LoadFunctions();
441335
CLuaXMLDefs::LoadFunctions();
442336
}

0 commit comments

Comments
 (0)