Skip to content

Commit f78369e

Browse files
FabianTerhorstFabianTerhorst
committed
Some more cleanup and logging
1 parent d2cbe05 commit f78369e

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

‎runtime/src/CSharpResourceImpl.cpp‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
8484
auto key = event->GetKey();
8585
auto value = event->GetVal();
8686
OnMetaChangeDelegate(GetEntityPointer(entity), entity->GetType(), key == nullptr ? "" : key.CStr(), &value);
87-
break;
8887
}
88+
break;
8989
case alt::CEvent::Type::SYNCED_META_CHANGE: {
9090
auto event = ((alt::CSyncedMetaDataChangeEvent*) (ev));
9191
auto entity = event->GetTarget();
@@ -94,8 +94,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
9494
auto value = event->GetVal();
9595
OnSyncedMetaChangeDelegate(GetEntityPointer(entity), entity->GetType(), key == nullptr ? "" : key.CStr(),
9696
&value);
97-
break;
9897
}
98+
break;
9999
case alt::CEvent::Type::CHECKPOINT_EVENT: {
100100
auto entity = ((alt::CCheckpointEvent*) (ev))->GetEntity();
101101
auto entityPtr = GetEntityPointer(entity);
@@ -105,21 +105,21 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
105105
entity->GetType(),
106106
((alt::CCheckpointEvent*) (ev))->GetState());
107107
}
108-
break;
109108
}
109+
break;
110110
case alt::CEvent::Type::CLIENT_SCRIPT_EVENT: {
111111
alt::Array<alt::MValue> clientArgs = (((alt::CClientScriptEvent*) (ev))->GetArgs());
112112
OnClientEventDelegate(((alt::CClientScriptEvent*) (ev))->GetTarget(),
113113
((alt::CClientScriptEvent*) (ev))->GetName().CStr(),
114114
&clientArgs);
115-
break;
116115
}
116+
break;
117117
case alt::CEvent::Type::PLAYER_CONNECT: {
118118
auto connectPlayer = reinterpret_cast<const alt::CPlayerConnectEvent*>(ev)->GetTarget();
119119
OnPlayerConnectDelegate(connectPlayer, connectPlayer->GetID(),
120120
"");//TODO: maybe better solution
121-
break;
122121
}
122+
break;
123123
case alt::CEvent::Type::PLAYER_DAMAGE: {
124124
auto damageEvent = (alt::CPlayerDamageEvent*) ev;
125125
auto entity = damageEvent->GetAttacker();
@@ -132,8 +132,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
132132
damageEvent->GetWeapon(),
133133
damageEvent->GetDamage());
134134
}
135-
break;
136135
}
136+
break;
137137
case alt::CEvent::Type::PLAYER_DEATH: {
138138
auto entity = ((alt::CPlayerDeathEvent*) (ev))->GetKiller();
139139
auto entityPtr = GetEntityPointer(entity);
@@ -143,13 +143,13 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
143143
entity->GetType(),
144144
((alt::CPlayerDeathEvent*) (ev))->GetWeapon());
145145
}
146-
break;
147146
}
147+
break;
148148
case alt::CEvent::Type::FIRE_EVENT: {
149149
//auto fireEvent = ((alt::CFireEvent*) (ev));
150150
//TODO: implement when implemented in cpp sdk
151-
break;
152151
}
152+
break;
153153
case alt::CEvent::Type::EXPLOSION_EVENT: {
154154
auto explosionEvent = ((alt::CExplosionEvent*) (ev));
155155
auto eventPosition = explosionEvent->GetPosition();
@@ -159,8 +159,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
159159
position.z = eventPosition.z;
160160
ExplosionDelegate(explosionEvent->GetSource(), explosionEvent->GetExplosionType(), position,
161161
explosionEvent->GetExplosionFX());
162-
break;
163162
}
163+
break;
164164
case alt::CEvent::Type::WEAPON_DAMAGE_EVENT: {
165165
auto weaponDamageEvent = ((alt::CWeaponDamageEvent*) (ev));
166166
auto targetEntity = weaponDamageEvent->GetTarget();
@@ -173,8 +173,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
173173
WeaponDamageDelegate(weaponDamageEvent->GetSource(), GetEntityPointer(targetEntity),
174174
targetEntity->GetType(), weaponDamageEvent->GetWeaponHash(),
175175
weaponDamageEvent->GetDamageValue(), shotOffset, weaponDamageEvent->GetBodyPart());
176-
break;
177176
}
177+
break;
178178
case alt::CEvent::Type::PLAYER_DISCONNECT: {
179179
auto disconnectEvent = reinterpret_cast<const alt::CPlayerDisconnectEvent*>(ev);
180180
auto disconnectPlayer = disconnectEvent->GetTarget();
@@ -192,8 +192,8 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
192192
OnPlayerDisconnectDelegate(disconnectPlayer,
193193
"");
194194
//}
195-
break;
196195
}
196+
break;
197197
case alt::CEvent::Type::REMOVE_ENTITY_EVENT: {
198198
auto removeEntityEntity = ((alt::CRemoveEntityEvent*) (ev))->GetEntity();
199199
if (removeEntityEntity != nullptr) {
@@ -206,42 +206,42 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
206206
break;
207207
}
208208
}
209-
break;
210209
}
210+
break;
211211
case alt::CEvent::Type::SERVER_SCRIPT_EVENT: {
212212
auto serverScriptEvent = (alt::CServerScriptEvent*) ev;
213213
alt::Array<alt::MValue> serverArgs = serverScriptEvent->GetArgs();
214214
server->LogInfo(serverScriptEvent->GetName());
215215
OnServerEventDelegate(serverScriptEvent->GetName().CStr(), &serverArgs);
216-
break;
217216
}
217+
break;
218218
case alt::CEvent::Type::PLAYER_CHANGE_VEHICLE_SEAT: {
219219
auto changeSeatEvent = (alt::CPlayerChangeVehicleSeatEvent*) ev;
220220
OnPlayerChangeVehicleSeatDelegate(changeSeatEvent->GetTarget(),
221221
changeSeatEvent->GetPlayer(),
222222
changeSeatEvent->GetOldSeat(),
223223
changeSeatEvent->GetNewSeat());
224-
break;
225224
}
225+
break;
226226
case alt::CEvent::Type::PLAYER_ENTER_VEHICLE: {
227227
auto enterEvent = (alt::CPlayerEnterVehicleEvent*) ev;
228228
OnPlayerEnterVehicleDelegate(enterEvent->GetTarget(),
229229
enterEvent->GetPlayer(),
230230
enterEvent->GetSeat());
231-
break;
232231
}
232+
break;
233233
case alt::CEvent::Type::PLAYER_LEAVE_VEHICLE: {
234234
auto leaveEvent = (alt::CPlayerLeaveVehicleEvent*) ev;
235235
OnPlayerLeaveVehicleDelegate(leaveEvent->GetTarget(),
236236
leaveEvent->GetPlayer(),
237237
leaveEvent->GetSeat());
238-
break;
239238
}
239+
break;
240240
case alt::CEvent::Type::CONSOLE_COMMAND_EVENT: {
241241
alt::Array<alt::StringView> args = ((alt::CConsoleCommandEvent*) (ev))->GetArgs();
242242
OnConsoleCommandDelegate(((alt::CConsoleCommandEvent*) (ev))->GetName().CStr(), &args);
243-
break;
244243
}
244+
break;
245245
case alt::CEvent::Type::COLSHAPE_EVENT: {
246246
auto entity = ((alt::CColShapeEvent*) (ev))->GetEntity();
247247
auto entityPointer = GetEntityPointer(entity);
@@ -251,26 +251,28 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
251251
entity->GetType(),
252252
((alt::CColShapeEvent*) (ev))->GetState());
253253
}
254-
break;
255254
}
255+
break;
256256
}
257257
return true;
258258
}
259259

260260
void CSharpResourceImpl::OnCreateBaseObject(alt::IBaseObject* object) {
261261
if (object != nullptr) {
262-
server->LogInfo(alt::String("create: ") + std::to_string((uint8_t)object->GetType()));
262+
server->LogInfo(alt::String("create: ") + std::to_string((uint8_t) object->GetType()));
263+
server->LogInfo(alt::String("vehicle: ") + std::to_string((uint8_t) alt::IBaseObject::Type::VEHICLE));
263264
switch (object->GetType()) {
264265
case alt::IBaseObject::Type::PLAYER: {
265266
auto player = dynamic_cast<alt::IPlayer*>(object);
266267
OnCreatePlayerDelegate(player, player->GetID());
267-
break;
268268
}
269+
break;
269270
case alt::IBaseObject::Type::VEHICLE: {
270271
auto vehicle = dynamic_cast<alt::IVehicle*>(object);
272+
server->LogInfo(alt::String("vehicle-id: ") + std::to_string(vehicle->GetID()));
271273
OnCreateVehicleDelegate(vehicle, vehicle->GetID());
272-
break;
273274
}
275+
break;
274276
case alt::IBaseObject::Type::BLIP:
275277
OnCreateBlipDelegate(dynamic_cast<alt::IBlip*>(object));
276278
break;

0 commit comments

Comments
 (0)