Skip to content

Commit e0b9124

Browse files
FabianTerhorstFabianTerhorst
committed
Code cleanup
1 parent a7df057 commit e0b9124

File tree

6 files changed

+61
-46
lines changed

6 files changed

+61
-46
lines changed

‎api/AltV.Net/Native/AltV.Resource.cs‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,22 +137,32 @@ internal delegate void WeaponDamageDelegate(IntPtr playerPointer, IntPtr entityP
137137
BaseObjectType entityType, uint weapon, ushort damage, Position shotOffset, BodyPart bodyPart);
138138

139139
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
140-
internal static extern void CSharpResource_SetMain(IntPtr resourcePointer, MainDelegate mainDelegate,
140+
internal static extern void CSharpResource_SetMain(IntPtr resourcePointer,
141+
MainDelegate mainDelegate,
141142
StopDelegate stopDelegate,
142-
TickDelegate tickDelegate, ServerEventDelegate serverEventDelegate,
143+
TickDelegate tickDelegate,
144+
ServerEventDelegate serverEventDelegate,
143145
CheckpointDelegate checkpointDelegate,
144-
ClientEventDelegate clientEventDelegate, PlayerDamageDelegate playerDamageDelegate,
145-
PlayerConnectDelegate playerConnectDelegate, PlayerDeathDelegate playerDeathDelegate,
146-
ExplosionDelegate explosionDelegate, WeaponDamageDelegate weaponDamageDelegate,
147-
PlayerDisconnectDelegate playerDisconnectDelegate, PlayerRemoveDelegate playerRemoveDelegate,
146+
ClientEventDelegate clientEventDelegate,
147+
PlayerDamageDelegate playerDamageDelegate,
148+
PlayerConnectDelegate playerConnectDelegate,
149+
PlayerDeathDelegate playerDeathDelegate,
150+
ExplosionDelegate explosionDelegate,
151+
WeaponDamageDelegate weaponDamageDelegate,
152+
PlayerDisconnectDelegate playerDisconnectDelegate,
153+
PlayerRemoveDelegate playerRemoveDelegate,
148154
VehicleRemoveDelegate vehicleRemoveDelegate,
149155
PlayerChangeVehicleSeatDelegate playerChangeVehicleSeatDelegate,
150156
PlayerEnterVehicleDelegate playerEnterVehicleDelegate,
151157
PlayerLeaveVehicleDelegate playerLeaveVehicleDelegate,
152-
CreatePlayerDelegate createPlayerDelegate, RemovePlayerDelegate removePlayerDelegate,
153-
CreateVehicleDelegate createVehicleDelegate, RemoveVehicleDelegate removeVehicleDelegate,
154-
CreateBlipDelegate createBlipDelegate, RemoveBlipDelegate removeBlipDelegate,
155-
CreateCheckpointDelegate createCheckpointDelegate, RemoveCheckpointDelegate removeCheckpointDelegate,
158+
CreatePlayerDelegate createPlayerDelegate,
159+
RemovePlayerDelegate removePlayerDelegate,
160+
CreateVehicleDelegate createVehicleDelegate,
161+
RemoveVehicleDelegate removeVehicleDelegate,
162+
CreateBlipDelegate createBlipDelegate,
163+
RemoveBlipDelegate removeBlipDelegate,
164+
CreateCheckpointDelegate createCheckpointDelegate,
165+
RemoveCheckpointDelegate removeCheckpointDelegate,
156166
CreateVoiceChannelDelegate createVoiceChannelDelegate,
157167
RemoveVoiceChannelDelegate removeVoiceChannelDelegate,
158168
ConsoleCommandDelegate consoleCommandDelegate,

‎runtime/include/CSharpResourceImpl.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ class CSharpResourceImpl : public alt::IResource::Impl {
224224
alt::IResource* resource;
225225
};
226226

227-
EXPORT void Server_GetCSharpResource(alt::ICore* server, const char* resourceName, CSharpResourceImpl*&resource);
228227
EXPORT void CSharpResource_Reload(CSharpResourceImpl* resource);
229228

230229
EXPORT void CSharpResource_Load(CSharpResourceImpl* resource);

‎runtime/include/CoreClr.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ typedef int (* CoreClrDelegate_t)(void* args, int argsLength);
105105

106106
class CoreClr {
107107
public:
108-
CoreClr(alt::ICore* server);
108+
explicit CoreClr(alt::ICore* server);
109109

110110
~CoreClr();
111111

@@ -132,7 +132,7 @@ class CoreClr {
132132
* @param errorCode
133133
* @return true when error code is known
134134
*/
135-
bool PrintError(alt::ICore* server, int errorCode);
135+
//bool PrintError(alt::ICore* server, int errorCode);
136136

137137
void CreateManagedHost();
138138

‎runtime/src/CSharpResourceImpl.cpp‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,16 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
121121
break;
122122
}
123123
case alt::CEvent::Type::PLAYER_DAMAGE: {
124-
auto entity = ((alt::CPlayerDamageEvent*) (ev))->GetAttacker();
124+
auto damageEvent = (alt::CPlayerDamageEvent*) ev;
125+
auto entity = damageEvent->GetAttacker();
125126
auto entityPtr = GetEntityPointer(entity);
126127
if (entity != nullptr && entityPtr != nullptr) {
127-
OnPlayerDamageDelegate(((alt::CPlayerDamageEvent*) (ev))->GetTarget(),
128+
OnPlayerDamageDelegate(damageEvent->GetTarget(),
128129
entityPtr,
129130
entity->GetType(),
130131
entity->GetID(),
131-
((alt::CPlayerDamageEvent*) (ev))->GetWeapon(),
132-
((alt::CPlayerDamageEvent*) (ev))->GetDamage());
132+
damageEvent->GetWeapon(),
133+
damageEvent->GetDamage());
133134
}
134135
break;
135136
}
@@ -214,22 +215,28 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
214215
OnServerEventDelegate(serverScriptEvent->GetName().CStr(), &serverArgs);
215216
break;
216217
}
217-
case alt::CEvent::Type::PLAYER_CHANGE_VEHICLE_SEAT:
218-
OnPlayerChangeVehicleSeatDelegate(((alt::CPlayerChangeVehicleSeatEvent*) (ev))->GetTarget(),
219-
((alt::CPlayerChangeVehicleSeatEvent*) (ev))->GetPlayer(),
220-
((alt::CPlayerChangeVehicleSeatEvent*) (ev))->GetOldSeat(),
221-
((alt::CPlayerChangeVehicleSeatEvent*) (ev))->GetNewSeat());
218+
case alt::CEvent::Type::PLAYER_CHANGE_VEHICLE_SEAT: {
219+
auto changeSeatEvent = (alt::CPlayerChangeVehicleSeatEvent*) ev;
220+
OnPlayerChangeVehicleSeatDelegate(changeSeatEvent->GetTarget(),
221+
changeSeatEvent->GetPlayer(),
222+
changeSeatEvent->GetOldSeat(),
223+
changeSeatEvent->GetNewSeat());
222224
break;
223-
case alt::CEvent::Type::PLAYER_ENTER_VEHICLE:
224-
OnPlayerEnterVehicleDelegate(((alt::CPlayerEnterVehicleEvent*) (ev))->GetTarget(),
225-
((alt::CPlayerEnterVehicleEvent*) (ev))->GetPlayer(),
226-
((alt::CPlayerEnterVehicleEvent*) (ev))->GetSeat());
225+
}
226+
case alt::CEvent::Type::PLAYER_ENTER_VEHICLE: {
227+
auto enterEvent = (alt::CPlayerEnterVehicleEvent*) ev;
228+
OnPlayerEnterVehicleDelegate(enterEvent->GetTarget(),
229+
enterEvent->GetPlayer(),
230+
enterEvent->GetSeat());
227231
break;
228-
case alt::CEvent::Type::PLAYER_LEAVE_VEHICLE:
229-
OnPlayerLeaveVehicleDelegate(((alt::CPlayerLeaveVehicleEvent*) (ev))->GetTarget(),
230-
((alt::CPlayerLeaveVehicleEvent*) (ev))->GetPlayer(),
231-
((alt::CPlayerLeaveVehicleEvent*) (ev))->GetSeat());
232+
}
233+
case alt::CEvent::Type::PLAYER_LEAVE_VEHICLE: {
234+
auto leaveEvent = (alt::CPlayerLeaveVehicleEvent*) ev;
235+
OnPlayerLeaveVehicleDelegate(leaveEvent->GetTarget(),
236+
leaveEvent->GetPlayer(),
237+
leaveEvent->GetSeat());
232238
break;
239+
}
233240
case alt::CEvent::Type::CONSOLE_COMMAND_EVENT: {
234241
alt::Array<alt::StringView> args = ((alt::CConsoleCommandEvent*) (ev))->GetArgs();
235242
OnConsoleCommandDelegate(((alt::CConsoleCommandEvent*) (ev))->GetName().CStr(), &args);
@@ -253,14 +260,16 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
253260
void CSharpResourceImpl::OnCreateBaseObject(alt::IBaseObject* object) {
254261
if (object != nullptr) {
255262
switch (object->GetType()) {
256-
case alt::IBaseObject::Type::PLAYER:
257-
OnCreatePlayerDelegate(dynamic_cast<alt::IPlayer*>(object),
258-
dynamic_cast<alt::IPlayer*>(object)->GetID());
263+
case alt::IBaseObject::Type::PLAYER: {
264+
auto player = dynamic_cast<alt::IPlayer*>(object);
265+
OnCreatePlayerDelegate(player, player->GetID());
259266
break;
260-
case alt::IBaseObject::Type::VEHICLE:
261-
OnCreateVehicleDelegate(dynamic_cast<alt::IVehicle*>(object),
262-
dynamic_cast<alt::IVehicle*>(object)->GetID());
267+
}
268+
case alt::IBaseObject::Type::VEHICLE: {
269+
auto vehicle = dynamic_cast<alt::IVehicle*>(object);
270+
OnCreateVehicleDelegate(vehicle, vehicle->GetID());
263271
break;
272+
}
264273
case alt::IBaseObject::Type::BLIP:
265274
OnCreateBlipDelegate(dynamic_cast<alt::IBlip*>(object));
266275
break;
@@ -331,11 +340,9 @@ void CSharpResource_Unload(CSharpResourceImpl* resource) {
331340
resource->resource->GetMain().CStr());
332341
}
333342

334-
void Server_GetCSharpResource(alt::ICore* server, const char* resourceName, CSharpResourceImpl*&resource) {
335-
resource = (CSharpResourceImpl*) server->GetResource(resourceName);
336-
}
337-
338-
void CSharpResource_SetMain(CSharpResourceImpl* resource, MainDelegate_t mainDelegate, StopDelegate_t stopDelegate,
343+
void CSharpResource_SetMain(CSharpResourceImpl* resource,
344+
MainDelegate_t mainDelegate,
345+
StopDelegate_t stopDelegate,
339346
TickDelegate_t tickDelegate,
340347
ServerEventDelegate_t serverEventDelegate,
341348
CheckpointDelegate_t checkpointDelegate,

‎runtime/src/CoreClr.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void CoreClr::GetPath(alt::ICore* server, const char* defaultPath) {
381381
}
382382

383383
//TODO: https://github.com/rashiph/DecompliedDotNetLibraries/blob/6056fc6ff7ae8fb3057c936d9ebf36da73f990a6/mscorlib/System/__HResults.cs
384-
bool CoreClr::PrintError(alt::ICore* server, int errorCode) {
384+
/*bool CoreClr::PrintError(alt::ICore* server, int errorCode) {
385385
if (errorCode == -2146234304) {
386386
server->LogInfo(
387387
alt::String(
@@ -400,9 +400,9 @@ bool CoreClr::PrintError(alt::ICore* server, int errorCode) {
400400
alt::String(x_str));
401401
delete[] x_str;
402402
return false;
403-
}
403+
}*/
404404

405-
#ifdef _WIN32
405+
/*#ifdef _WIN32
406406
const char_t *GetWC(const char *c)
407407
{
408408
const size_t cSize = strlen(c)+1;
@@ -411,7 +411,7 @@ const char_t *GetWC(const char *c)
411411
412412
return wc;
413413
}
414-
#endif
414+
#endif*/
415415

416416
struct thread_user_data {
417417
hostfxr_run_app_fn runApp;

‎runtime/src/altv-c-api/server.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <CSharpResourceImpl.h>
21
#include "server.h"
32

43
void Server_LogInfo(alt::ICore* server, const char* str) {

0 commit comments

Comments
 (0)