Skip to content

add support for multiple callbacks as a fix #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zorono wants to merge 5 commits into
base: omp
Choose a base branch
from
Open

add support for multiple callbacks as a fix #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad5c028
Update Pawn.RakNet.inc
Zorono Jun 15, 2025
6a14d28
Update script.h
Zorono Jun 15, 2025
6886f59
restore support for old syntax for compatabillity
Zorono Jun 15, 2025
9e61477
Update Pawn.RakNet.inc
Zorono Jun 15, 2025
4e8ead4
reversing this addition to add backward compatabillity
Zorono Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions src/Pawn.RakNet.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,23 @@
#define PR_BITS_TO_BYTES(%0) (((%0)+7)>>3)
#define PR_BYTES_TO_BITS(%0) ((%0)<<3)

#define PR_Handler<%0,%1>:%2(%3) \
forward pr_r%1_%2(); \
public pr_r%1_%2() PR_RegHandler(%2,"pr_"#%1"_"#%2,%0); \
forward pr_%1_%2(%3); \
public pr_%1_%2(%3)

#define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0(%1)
#define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0(%1)
#define OPacket:%0(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0(%1)
#define ORPC:%0(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0(%1)
#define ICustomRPC:%0(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0(%1)
#define PR_Handler<%0,%1>:%2@%4(%3) \
forward pr_r%1_%2@%4(); \
public pr_r%1_%2@%4() PR_RegHandler(%2,"pr_"#%1"_"#%2"@"#%4,%0); \
forward pr_%1_%2@%4(%3); \
public pr_%1_%2@%4(%3)

#define IPacket:%0(%1)<%2> PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
#define IRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
#define OPacket:%0(%1)<%2> PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
#define ORPC:%0(%1)<%2> PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
#define ICustomRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)

#define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@default(%1)
#define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@default(%1)
#define OPacket:%0(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0@default(%1)
#define ORPC:%0(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0@default(%1)
#define ICustomRPC:%0(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@default(%1)

#define IncomingPacket IPacket
#define IncomingRPC IRPC
Expand Down
2 changes: 1 addition & 1 deletion src/script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class Script : public ptl::AbstractScript<Script> {

private:
const std::regex regex_reg_handler_public_name_{
R"(^pr_r(?:ip|ir|op|or|irp|iip|oip|icr)_\w+$)"};
R"(^pr_r(?:ip|ir|op|or|irp|iip|oip|icr)_\w+@[a-zA-Z0-9]+$)"};

std::shared_ptr<Config> config_;

Expand Down