Skip to content

Commit 05ddcd6

Browse files
committed
update natives error
1 parent f277b98 commit 05ddcd6

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

api_player_model.sma

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define VERSION "1.0.0"
88
#define AUTHOR "Hedgehog Fog"
99

10-
#define ERROR_MSG_NOT_CONNECTED "User %d is not connected"
10+
#define NATIVE_ERROR_NOT_CONNECTED(%1) log_error(AMX_ERR_NATIVE, "User %d is not connected", %1)
1111

1212
#define MAX_SEQUENCES 101
1313

@@ -66,8 +66,7 @@ public Native_GetPlayerModel(iPluginId, iArgc) {
6666
new pPlayer = get_param(1);
6767

6868
if (!is_user_connected(pPlayer)) {
69-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
70-
return;
69+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
7170
}
7271

7372
set_string(2, g_rgszCustomPlayerModel[pPlayer], get_param(3));
@@ -77,8 +76,7 @@ public Native_GetCurrentPlayerModel(iPluginId, iArgc) {
7776
new pPlayer = get_param(1);
7877

7978
if (!is_user_connected(pPlayer)) {
80-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
81-
return;
79+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
8280
}
8381

8482
set_string(2, g_rgszCurrentPlayerModel[pPlayer], get_param(3));
@@ -88,8 +86,7 @@ public Native_GetPlayerEntity(iPluginId, iArgc) {
8886
new pPlayer = get_param(1);
8987

9088
if (!is_user_connected(pPlayer)) {
91-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
92-
return 0;
89+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
9390
}
9491

9592
if (g_pPlayerSubModel[pPlayer] && @PlayerSubModel_IsActive(g_pPlayerSubModel[pPlayer])) {
@@ -103,8 +100,7 @@ public bool:Native_HasCustomPlayerModel(iPluginId, iArgc) {
103100
new pPlayer = get_param(1);
104101

105102
if (!is_user_connected(pPlayer)) {
106-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
107-
return false;
103+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
108104
}
109105

110106
return g_rgbPlayerUseCustomModel[pPlayer];
@@ -114,8 +110,7 @@ public Native_SetPlayerModel(iPluginId, iArgc) {
114110
new pPlayer = get_param(1);
115111

116112
if (!is_user_connected(pPlayer)) {
117-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
118-
return;
113+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
119114
}
120115

121116
get_string(2, g_rgszCustomPlayerModel[pPlayer], charsmax(g_rgszCustomPlayerModel[]));
@@ -125,8 +120,7 @@ public Native_ResetPlayerModel(iPluginId, iArgc) {
125120
new pPlayer = get_param(1);
126121

127122
if (!is_user_connected(pPlayer)) {
128-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
129-
return;
123+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
130124
}
131125

132126
@Player_ResetModel(pPlayer);
@@ -136,8 +130,7 @@ public Native_UpdatePlayerModel(iPluginId, iArgc) {
136130
new pPlayer = get_param(1);
137131

138132
if (!is_user_connected(pPlayer)) {
139-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
140-
return;
133+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
141134
}
142135

143136
@Player_UpdateCurrentModel(pPlayer);
@@ -147,8 +140,7 @@ public Native_SetPlayerSequence(iPluginId, iArgc) {
147140
new pPlayer = get_param(1);
148141

149142
if (!is_user_connected(pPlayer)) {
150-
log_error(AMX_ERR_NATIVE, ERROR_MSG_NOT_CONNECTED, pPlayer);
151-
return 0;
143+
NATIVE_ERROR_NOT_CONNECTED(pPlayer);
152144
}
153145

154146
static szSequence[MAX_RESOURCE_PATH_LENGTH];

0 commit comments

Comments
 (0)