Skip to content

Commit ff6682b

Browse files
DoxohOlegT
authored and
OlegT
committed
ALTV-626 make playerDimensionChange shared (#344)
1 parent 86ade52 commit ff6682b

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

server/src/events/Player.cpp

-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "cpp-sdk/events/CPlayerWeaponChangeEvent.h"
1717
#include "cpp-sdk/events/CLocalMetaDataChangeEvent.h"
1818
#include "cpp-sdk/events/CPlayerRequestControlEvent.h"
19-
#include "cpp-sdk/events/CPlayerDimensionChangeEvent.h"
2019

2120
using alt::CEvent;
2221
using EventType = CEvent::Type;
@@ -185,18 +184,6 @@ V8_LOCAL_EVENT_HANDLER requestControl(EventType::PLAYER_REQUEST_CONTROL,
185184
args.push_back(resource->GetBaseObjectOrNull(ev->GetTarget()));
186185
});
187186

188-
V8_LOCAL_EVENT_HANDLER playerDimensionChange(EventType::PLAYER_DIMENSION_CHANGE,
189-
"playerDimensionChange",
190-
[](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args)
191-
{
192-
auto ev = static_cast<const alt::CPlayerDimensionChangeEvent*>(e);
193-
v8::Isolate* isolate = resource->GetIsolate();
194-
195-
args.push_back(resource->GetBaseObjectOrNull(ev->GetTarget()));
196-
args.push_back(V8Helpers::JSValue(ev->GetOldDimension()));
197-
args.push_back(V8Helpers::JSValue(ev->GetNewDimension()));
198-
});
199-
200187
V8_LOCAL_EVENT_HANDLER playerSpawn(EventType::PLAYER_SPAWN,
201188
"playerSpawn",
202189
[](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args)

shared/events/Player.cpp

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "cpp-sdk/events/CPlayerChangeAnimationEvent.h"
55
#include "cpp-sdk/events/CPlayerChangeInteriorEvent.h"
6+
#include "cpp-sdk/events/CPlayerDimensionChangeEvent.h"
67

78
using EventType = alt::CEvent::Type;
89

@@ -20,7 +21,6 @@ V8_LOCAL_EVENT_HANDLER animationChange(EventType::PLAYER_CHANGE_ANIMATION_EVENT,
2021
args.emplace_back(V8Helpers::JSValue(ev->GetNewAnimationName()));
2122
});
2223

23-
2424
V8_LOCAL_EVENT_HANDLER playerInteriorChange(EventType::PLAYER_CHANGE_INTERIOR_EVENT,
2525
"playerInteriorChange",
2626
[](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args)
@@ -32,3 +32,15 @@ V8_LOCAL_EVENT_HANDLER playerInteriorChange(EventType::PLAYER_CHANGE_INTERIOR_EV
3232
args.emplace_back(V8Helpers::JSValue(ev->GetOldInteriorLocation()));
3333
args.emplace_back(V8Helpers::JSValue(ev->GetNewInteriorLocation()));
3434
});
35+
36+
V8_LOCAL_EVENT_HANDLER playerDimensionChange(EventType::PLAYER_DIMENSION_CHANGE,
37+
"playerDimensionChange",
38+
[](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args)
39+
{
40+
auto ev = static_cast<const alt::CPlayerDimensionChangeEvent*>(e);
41+
v8::Isolate* isolate = resource->GetIsolate();
42+
43+
args.push_back(resource->GetBaseObjectOrNull(ev->GetTarget()));
44+
args.push_back(V8Helpers::JSValue(ev->GetOldDimension()));
45+
args.push_back(V8Helpers::JSValue(ev->GetNewDimension()));
46+
});

0 commit comments

Comments
 (0)