Skip to content

Improve client index consistency in debug mode #3

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

Merged
tabularelf merged 2 commits into from
Aug 18, 2024
Merged

Improve client index consistency in debug mode #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48fc632
Adds animation to confirm which window is being debugged
JujuAdams Jul 29, 2024
20d0dd9
Improves client index consistency in debug mode
JujuAdams Jul 29, 2024
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
1 change: 1 addition & 0 deletions extensions/MultiClient/multiclient.yy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions extensions/MultiClient/post_run_step.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ for /l %%x in (1, %MaxClients%, %NumOfInsts%) do (
if %ShouldProxyClients% EQU True (
if !n_clients! EQU 0 (
if %YYTARGET_runtime% EQU YYC (
start /b cmd /C "%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
start /b cmd /C "%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x —mc-client-number %YYEXTOPT_MultiClient_Number_Of_Clients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
) else (
start /b cmd /C %YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
start /b cmd /C %YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x —mc-client-number %YYEXTOPT_MultiClient_Number_Of_Clients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
)
) else (
set token=""
Expand All @@ -80,16 +80,16 @@ for /l %%x in (1, %MaxClients%, %NumOfInsts%) do (
)
echo Proxying client !n_clients!
if %YYTARGET_runtime% EQU YYC (
"%ProxyPath%" !token!"%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
"%ProxyPath%" !token!"%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x —mc-client-number %MaxClients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
) else (
"%ProxyPath%" !token!%YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
"%ProxyPath%" !token!%YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x —mc-client-number %YYEXTOPT_MultiClient_Number_Of_Clients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
)
)
) else (
if %YYTARGET_runtime% EQU YYC (
start /b cmd /C "%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
start /b cmd /C "%YYoutputFolder%\%YYprojectName%.exe" —mc-window-number %%x -mc-client-number %MaxClients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
) else (
start /b cmd /C %YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x %YYEXTOPT_MultiClient_Additional_Parameters%
start /b cmd /C %YYruntimeLocation%\Windows\x64\runner.exe -game "%YYoutputFolder%\%YYprojectName%.win" —mc-window-number %%x —mc-client-number %YYEXTOPT_MultiClient_Number_Of_Clients% —mc-search-port %YYEXTOPT_MultiClient_Search_Port%" %YYEXTOPT_MultiClient_Additional_Parameters%
)
)
)
Expand Down
5 changes: 4 additions & 1 deletion objects/obj_test/Draw_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/// @description Insert description here
// You can write your code in this editor

draw_text(32,32, "I am " + string(window_num));
var _string = "I am " + string(window_num);
repeat((current_time mod 1000) div 250) _string += ".";

draw_text(32, 32, _string);
7 changes: 6 additions & 1 deletion options/extensions/MultiClient.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
"6d5b035c-3696-4554-a0e9-819187ea6303": null,
"b29b41e4-3d53-4a72-b082-0eb3d51bd81d": null,
"ab4971c8-45fa-4411-a982-e16a3af58307": null,
"e61f4ac7-53ac-46e2-b0c8-a949f1acd862": null
"e61f4ac7-53ac-46e2-b0c8-a949f1acd862": null,
"f506fe0e-5a82-4155-8b2a-69e6e6053844": {
"Default": {
"value": "19839"
}
}
}
}
51 changes: 46 additions & 5 deletions scripts/MultiClientGetID/MultiClientGetID.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,53 @@ function MultiClientGetID(){
++_i;
}
} else {
repeat(parameter_count()) {
if (parameter_string(_i) == "mc-window-number") {
_num = real(parameter_string(_i+1))-1;
break;
if (debug_mode) {
// extract the total number of clients and the search port from the extension
// this works around the native extension_*() functions not working in LTS
var _clientNumber = undefined;
var _searchPort = undefined;

repeat(parameter_count()) {
if (parameter_string(_i) == "mc-client-number") {
_clientNumber = real(parameter_string(_i+1));
}

if (parameter_string(_i) == "mc-search-port") {
_searchPort = real(parameter_string(_i+1));
}

++_i;
}

// use sockets as a way to count how many windows have been initialized
var _i = 0;
repeat(_clientNumber) {
var _socket = network_create_socket_ext(network_socket_tcp, _searchPort);
if (_socket >= 0) {
// ensure that the last client created has an index of 0
// the last client created is the one that'll connect to the debugger
// this means that client index 0 will be the "main" instance hooked up to the debugger
_num = (_clientNumber-1) - _i;

// destroy this socket after a second
call_later(1000, time_source_units_seconds, method({
__socket: _socket,
}, function() {
network_destroy(__socket);
}));
break;
}
++_i;
++_searchPort;
}
} else {
repeat(parameter_count()) {
if (parameter_string(_i) == "mc-window-number") {
_num = real(parameter_string(_i+1))-1;
break;
}
++_i;
}
++_i;
}
}
}
Expand Down