Skip to content

Commit d6f064c

Browse files
author
Y_Less
committed
Use the better _va syntax for all the standard stocks. And move them to be more obvious.
1 parent c085c3f commit d6f064c

File tree

2 files changed

+65
-64
lines changed

2 files changed

+65
-64
lines changed

YSI_Coding/y_va/y_va_entry.inc

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,71 @@ Optional plugins:
8686
#include "y_va_header"
8787
#include "y_va_impl"
8888

89+
stock PlayerText:va_CreatePlayerTextDraw(playerid, Float:x, Float:y, const fmat[], GLOBAL_TAG_TYPES:...)
90+
{
91+
return CreatePlayerTextDraw(playerid, x, y, va_return(fmat, ___(4)));
92+
}
93+
94+
stock Text:va_TextDrawCreate(Float:x, Float:y, const fmat[], GLOBAL_TAG_TYPES:...)
95+
{
96+
return TextDrawCreate(x, y, va_return(fmat, ___(3)));
97+
}
98+
99+
stock va_TextDrawSetString(Text:text, const fmat[], GLOBAL_TAG_TYPES:...)
100+
{
101+
return TextDrawSetString(text, va_return(fmat, ___(2)));
102+
}
103+
104+
stock va_PlayerTextDrawSetString(playerid, PlayerText:text, const fmat[], GLOBAL_TAG_TYPES:...)
105+
{
106+
return PlayerTextDrawSetString(playerid, text, va_return(fmat, ___(3)));
107+
}
108+
109+
stock va_SendClientMessage(playerid, colour, const fmat[], GLOBAL_TAG_TYPES:...)
110+
{
111+
return SendClientMessage(playerid, colour, va_return(fmat, ___(3)));
112+
}
113+
114+
stock va_SendClientMessageToAll(colour, const fmat[], GLOBAL_TAG_TYPES:...)
115+
{
116+
return SendClientMessageToAll(colour, va_return(fmat, ___(2)));
117+
}
118+
119+
stock va_SendPlayerMessageToPlayer(playerid, senderid, const fmat[], GLOBAL_TAG_TYPES:...)
120+
{
121+
return SendPlayerMessageToPlayer(playerid, senderid, va_return(fmat, ___(3)));
122+
}
123+
124+
stock va_SendPlayerMessageToAll(senderid, const fmat[], GLOBAL_TAG_TYPES:...)
125+
{
126+
return SendPlayerMessageToAll(senderid, va_return(fmat, ___(2)));
127+
}
128+
129+
stock va_GameTextForPlayer(playerid, const fmat[], time, style, GLOBAL_TAG_TYPES:...)
130+
{
131+
return GameTextForPlayer(playerid, va_return(fmat, ___(4)), time, style);
132+
}
133+
134+
stock va_GameTextForAll(const fmat[], time, style, GLOBAL_TAG_TYPES:...)
135+
{
136+
return GameTextForAll(va_return(fmat, ___(3)), time, style);
137+
}
138+
139+
stock va_print(const fmat[], GLOBAL_TAG_TYPES:...)
140+
{
141+
return print(va_return(fmat, ___(1)));
142+
}
143+
144+
stock va_fprintf(File:fhnd, const fmat[], GLOBAL_TAG_TYPES:...)
145+
{
146+
return fwrite(fhnd, va_return(fmat, ___(2)));
147+
}
148+
149+
stock va_SendRconCommand(const command[], GLOBAL_TAG_TYPES:...)
150+
{
151+
return SendRconCommand(va_return(command, ___(1)));
152+
}
153+
89154
#if defined YSI_TESTS
90155
#include "y_va_tests"
91156
#endif

YSI_Coding/y_va/y_va_impl.inc

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -695,67 +695,3 @@ stock va_getstring(dest[], arg, len = sizeof (dest))
695695
#emit STACK 16
696696
}
697697

698-
stock PlayerText:va_CreatePlayerTextDraw(playerid, Float:x, Float:y, const fmat[], va_args<>)
699-
{
700-
return CreatePlayerTextDraw(playerid, x, y, va_return(fmat, va_start<4>));
701-
}
702-
703-
stock Text:va_TextDrawCreate(Float:x, Float:y, const fmat[], va_args<>)
704-
{
705-
return TextDrawCreate(x, y, va_return(fmat, va_start<3>));
706-
}
707-
708-
stock va_TextDrawSetString(Text:text, const fmat[], va_args<>)
709-
{
710-
return TextDrawSetString(text, va_return(fmat, va_start<2>));
711-
}
712-
713-
stock va_PlayerTextDrawSetString(playerid, PlayerText:text, const fmat[], va_args<>)
714-
{
715-
return PlayerTextDrawSetString(playerid, text, va_return(fmat, va_start<3>));
716-
}
717-
718-
stock va_SendClientMessage(playerid, colour, const fmat[], va_args<>)
719-
{
720-
return SendClientMessage(playerid, colour, va_return(fmat, va_start<3>));
721-
}
722-
723-
stock va_SendClientMessageToAll(colour, const fmat[], va_args<>)
724-
{
725-
return SendClientMessageToAll(colour, va_return(fmat, va_start<2>));
726-
}
727-
728-
stock va_SendPlayerMessageToPlayer(playerid, senderid, const fmat[], va_args<>)
729-
{
730-
return SendPlayerMessageToPlayer(playerid, senderid, va_return(fmat, va_start<3>));
731-
}
732-
733-
stock va_SendPlayerMessageToAll(senderid, const fmat[], va_args<>)
734-
{
735-
return SendPlayerMessageToAll(senderid, va_return(fmat, va_start<2>));
736-
}
737-
738-
stock va_GameTextForPlayer(playerid, const fmat[], time, style, va_args<>)
739-
{
740-
return GameTextForPlayer(playerid, va_return(fmat, va_start<4>), time, style);
741-
}
742-
743-
stock va_GameTextForAll(const fmat[], time, style, va_args<>)
744-
{
745-
return GameTextForAll(va_return(fmat, va_start<3>), time, style);
746-
}
747-
748-
stock va_print(const fmat[], va_args<>)
749-
{
750-
return print(va_return(fmat, va_start<1>));
751-
}
752-
753-
stock va_fprintf(File:fhnd, const fmat[], va_args<>)
754-
{
755-
return fwrite(fhnd, va_return(fmat, va_start<2>));
756-
}
757-
758-
stock va_SendRconCommand(const command[], va_args<>)
759-
{
760-
return SendRconCommand(va_return(command, va_start<1>));
761-
}

0 commit comments

Comments
 (0)