Skip to content

Commit 7adb484

Browse files
hunterwbhunterwb
committed
Update types & identifiers
1 parent ab6e0de commit 7adb484

File tree

1,538 files changed

+8962
-8962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,538 files changed

+8962
-8962
lines changed

‎scripts/[clientscript,1v1arena_clear_opbutton].cs2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 2711
2-
[clientscript,1v1arena_clear_opbutton](component $component0, int $int1, int $int2)
3-
if (.cc_find($component0, $int1) = ^true & cc_find($component0, $int2) = ^true) {
2+
[clientscript,1v1arena_clear_opbutton](component $component0, int $comsubid1, int $comsubid2)
3+
if (.cc_find($component0, $comsubid1) = ^true & cc_find($component0, $comsubid2) = ^true) {
44
sound_synth(synth_2266, 1, 0);
55
cc_setcolour(^red);
66
if_setonmouserepeat(null, $component0);

‎scripts/[clientscript,1v1arena_clear_resetbutton].cs2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// 2712
2-
[clientscript,1v1arena_clear_resetbutton](component $component0, int $int1, int $int2, int $int3)
3-
if (clientclock < $int3) {
2+
[clientscript,1v1arena_clear_resetbutton](component $component0, int $comsubid1, int $comsubid2, int $clock3)
3+
if (clientclock < $clock3) {
44
return;
55
}
6-
if (cc_find($component0, $int2) = ^true) {
6+
if (cc_find($component0, $comsubid2) = ^true) {
77
cc_setcolour(0xff981f);
88
if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
99
if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);
10-
if_setonop("1v1arena_clear_opbutton($component0, $int1, cc_getid)", $component0);
10+
if_setonop("1v1arena_clear_opbutton($component0, $comsubid1, cc_getid)", $component0);
1111
}
1212
if_setontimer(null, $component0);

‎scripts/[clientscript,1v1arena_hud_button].cs2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// 2714
2-
[clientscript,1v1arena_hud_button](int $int0, component $component1, int $int2)
3-
if ($int0 ! 1) {
2+
[clientscript,1v1arena_hud_button](int $opindex0, component $component1, int $comsubid2)
3+
if ($opindex0 ! 1) {
44
return;
55
}
66
sound_synth(synth_2266, 1, 0);
7-
if (cc_find($component1, $int2) = ^true) {
7+
if (cc_find($component1, $comsubid2) = ^true) {
88
cc_setcolour(^red);
99
if_setonmouserepeat(null, $component1);
1010
if_setonmouseleave(null, $component1);
1111
if_setonop(null, $component1);
12-
if_setontimer("1v1arena_hud_resetbutton($component1, $int2, calc(clientclock + 20))", $component1);
12+
if_setontimer("1v1arena_hud_resetbutton($component1, $comsubid2, calc(clientclock + 20))", $component1);
1313
}

‎scripts/[clientscript,1v1arena_hud_init].cs2‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
// 2713
22
[clientscript,1v1arena_hud_init](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5)
33
~1v1arena_hud_toggle(false, $component1, $component2, $component3);
4-
def_string $string0 = "Spectator";
4+
def_string $op0 = "Spectator";
55
cc_deleteall($component4);
6-
def_int $int6 = ~options_button_off($component4, 0);
7-
cc_create($component4, ^iftype_text, $int6);
6+
def_int $comsubid6 = ~options_button_off($component4, 0);
7+
cc_create($component4, ^iftype_text, $comsubid6);
88
cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
99
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
1010
cc_settextshadow(true);
1111
cc_settextfont(p11_full);
1212
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
13-
cc_settext($string0);
14-
if_setop(1, $string0, $component4);
13+
cc_settext($op0);
14+
if_setop(1, $op0, $component4);
1515
cc_setcolour(0xff981f);
1616
if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component4);
1717
if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component4);
1818
if_setonop("1v1arena_hud_button(event_opindex, $component4, cc_getid)", $component4);
1919
if_setontimer(null, $component4);
20-
$string0 = "Start All";
20+
$op0 = "Start All";
2121
cc_deleteall($component5);
22-
$int6 = ~options_button_off($component5, 0);
23-
cc_create($component5, ^iftype_text, $int6);
22+
$comsubid6 = ~options_button_off($component5, 0);
23+
cc_create($component5, ^iftype_text, $comsubid6);
2424
cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
2525
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
2626
cc_settextshadow(true);
2727
cc_settextfont(p11_full);
2828
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
29-
cc_settext($string0);
30-
if_setop(1, $string0, $component5);
29+
cc_settext($op0);
30+
if_setop(1, $op0, $component5);
3131
cc_setcolour(0xff981f);
3232
if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component5);
3333
if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component5);

‎scripts/[clientscript,1v1arena_hud_resetbutton].cs2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// 2715
2-
[clientscript,1v1arena_hud_resetbutton](component $component0, int $int1, int $int2)
3-
if (clientclock < $int2) {
2+
[clientscript,1v1arena_hud_resetbutton](component $component0, int $comsubid1, int $clock2)
3+
if (clientclock < $clock2) {
44
return;
55
}
6-
if (cc_find($component0, $int1) = ^true) {
6+
if (cc_find($component0, $comsubid1) = ^true) {
77
cc_setcolour(0xff981f);
88
if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
99
if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);

‎scripts/[clientscript,1v1arena_results_init].cs2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 2710
22
[clientscript,1v1arena_results_init](component $component0)
3-
def_string $string0 = "Clear";
3+
def_string $op0 = "Clear";
44
cc_deleteall($component0);
55
def_int $int1 = 0;
66
.cc_create($component0, ^iftype_rectangle, $int1);
@@ -16,8 +16,8 @@ cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
1616
cc_settextshadow(true);
1717
cc_settextfont(p11_full);
1818
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
19-
cc_settext($string0);
20-
if_setop(1, $string0, $component0);
19+
cc_settext($op0);
20+
if_setop(1, $op0, $component0);
2121
cc_setcolour(0xff981f);
2222
if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
2323
if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);

‎scripts/[clientscript,1v1arena_spectator_endhint].cs2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// 2723
2-
[clientscript,1v1arena_spectator_endhint](component $component0, int $int1, int $int2)
3-
if (clientclock < $int2) {
2+
[clientscript,1v1arena_spectator_endhint](component $component0, int $comsubid1, int $clock2)
3+
if (clientclock < $clock2) {
44
return;
55
}
6-
if (cc_find($component0, $int1) = ^true) {
6+
if (cc_find($component0, $comsubid1) = ^true) {
77
cc_setontimer(null);
88
cc_delete;
99
}

‎scripts/[clientscript,1v1arena_spectator_init].cs2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ cc_settextshadow(true);
1818
cc_settextfont(quill_oblique_large);
1919
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
2020
cc_settext("<col=ffffff>F12</col>: Exit<br><col=ffffff>PageUP</col>: Faster<br><col=ffffff>PageDOWN</col>: Slower<br>");
21-
cc_setontimer("1v1arena_spectator_endhint(event_com, event_comid, calc(clientclock + 400))");
21+
cc_setontimer("1v1arena_spectator_endhint(event_com, event_comsubid, calc(clientclock + 400))");

‎scripts/[clientscript,abyssalsire_overseer_update].cs2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 137
2-
[clientscript,abyssalsire_overseer_update](component $component0, int $int1)
3-
~abyssalsire_overseer_update($component0, calc(clientclock - $int1));
2+
[clientscript,abyssalsire_overseer_update](component $component0, int $clock1)
3+
~abyssalsire_overseer_update($component0, calc(clientclock - $clock1));

‎scripts/[clientscript,addtooltip].cs2‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// 38
2-
[clientscript,addtooltip](component $component0, component $component1, string $string0, int $int2, int $int3)
3-
def_int $int4 = 0;
4-
def_int $int5 = 0;
2+
[clientscript,addtooltip](component $component0, component $component1, string $string0, int $int2, int $width3)
3+
def_int $x4 = 0;
4+
def_int $y5 = 0;
55
if (%varcint1 < calc(clientclock + $int2)) {
66
if (%varcint1 < clientclock) {
77
%varcint1 = clientclock;
@@ -11,22 +11,22 @@ if (%varcint1 < calc(clientclock + $int2)) {
1111
}
1212
%varcint1 = calc(clientclock + $int2 + 10);
1313
if (%varcint2 = 0) {
14-
if ($int3 > if_getwidth(if_getlayer($component1))) {
15-
$int3 = if_getwidth(if_getlayer($component1));
14+
if ($width3 > if_getwidth(if_getlayer($component1))) {
15+
$width3 = if_getwidth(if_getlayer($component1));
1616
}
17-
$int3 = calc($int3 - 4);
18-
if_setsize(calc(4 + parawidth($string0, $int3, p12_full)), calc(4 + 13 * paraheight($string0, $int3, p12_full)), ^setsize_abs, ^setsize_abs, $component1);
19-
$int4 = calc(if_getx($component0) + 5);
20-
$int5 = calc(if_gety($component0) + if_getheight($component0) + 5);
17+
$width3 = calc($width3 - 4);
18+
if_setsize(calc(4 + parawidth($string0, $width3, p12_full)), calc(4 + 13 * paraheight($string0, $width3, p12_full)), ^setsize_abs, ^setsize_abs, $component1);
19+
$x4 = calc(if_getx($component0) + 5);
20+
$y5 = calc(if_gety($component0) + if_getheight($component0) + 5);
2121
if (if_getlayer($component1) ! null) {
22-
if ($int4 > calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1))) {
23-
$int4 = calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1));
22+
if ($x4 > calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1))) {
23+
$x4 = calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1));
2424
}
25-
if ($int5 > calc(if_getheight(if_getlayer($component1)) - if_getheight($component1))) {
26-
$int5 = calc(if_gety($component0) - if_getheight($component1) - 5);
25+
if ($y5 > calc(if_getheight(if_getlayer($component1)) - if_getheight($component1))) {
26+
$y5 = calc(if_gety($component0) - if_getheight($component1) - 5);
2727
}
2828
}
29-
if_setposition($int4, $int5, ^setpos_abs_left, ^setpos_abs_top, $component1);
29+
if_setposition($x4, $y5, ^setpos_abs_left, ^setpos_abs_top, $component1);
3030
cc_deleteall($component1);
3131
cc_create($component1, ^iftype_rectangle, 0);
3232
cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);

0 commit comments

Comments
 (0)