Skip to content

Commit

Permalink
Merge branch 'mafemergency:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffyGhoster authored Jan 6, 2024
2 parents 1d5daf6 + c529c30 commit 473ad7b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
14 changes: 12 additions & 2 deletions prof.c
Original file line number Diff line number Diff line change
Expand Up @@ -2813,7 +2813,7 @@ void *hook(char *const restrict dst, char *const restrict src, char unsigned siz
}

#if defined(UTRACY_WINDOWS)
# define BYOND_MAX_BUILD 1618
# define BYOND_MAX_BUILD 1623
# define BYOND_MIN_BUILD 1543
# define BYOND_VERSION_ADJUSTED(a) ((a) - BYOND_MIN_BUILD)

Expand Down Expand Up @@ -2895,10 +2895,15 @@ static int unsigned const byond_offsets[][9] = {
[BYOND_VERSION_ADJUSTED(1616)] = {0x004073E0, 0x004073E4, 0x004073F0, 0x00407400, 0x24, 0x00131210, 0x0020B9E0, 0x001C3E20, 0x00050606},
[BYOND_VERSION_ADJUSTED(1617)] = {0x004074B0, 0x004074B4, 0x004074C0, 0x004074D0, 0x28, 0x001312D0, 0x0020BAB0, 0x001C3EB0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1618)] = {0x004074B0, 0x004074B4, 0x004074C0, 0x004074D0, 0x28, 0x00131350, 0x0020BBA0, 0x001C3F40, 0x00050606},
[BYOND_VERSION_ADJUSTED(1619)] = {0x004074B0, 0x004074B4, 0x004074C0, 0x004074D0, 0x28, 0x00131350, 0x0020BBA0, 0x001C3F40, 0x00050606},
[BYOND_VERSION_ADJUSTED(1620)] = {0x0040758C, 0x00407590, 0x0040759C, 0x004075AC, 0x28, 0x001313C0, 0x0020BC00, 0x001C3F60, 0x00050606},
[BYOND_VERSION_ADJUSTED(1621)] = {0x0040758C, 0x00407590, 0x0040759C, 0x004075AC, 0x28, 0x001313B0, 0x0020BC70, 0x001C3FC0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1622)] = {0x0040755C, 0x00407560, 0x0040756C, 0x0040757C, 0x28, 0x001312D0, 0x0020BB90, 0x001C3EB0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1623)] = {0x0040755C, 0x00407560, 0x0040756C, 0x0040757C, 0x28, 0x001312D0, 0x0020BB90, 0x001C3EB0, 0x00050606},
};

#elif defined(UTRACY_LINUX)
# define BYOND_MAX_BUILD 1618
# define BYOND_MAX_BUILD 1623
# define BYOND_MIN_BUILD 1543
# define BYOND_VERSION_ADJUSTED(a) ((a) - BYOND_MIN_BUILD)

Expand Down Expand Up @@ -2978,6 +2983,11 @@ static int unsigned const byond_offsets[][9] = {
[BYOND_VERSION_ADJUSTED(1616)] = {0x006D8608, 0x006D860C, 0x006D8620, 0x006D866C, 0x24, 0x00325190, 0x003120F0, 0x00309D30, 0x00050505},
[BYOND_VERSION_ADJUSTED(1617)] = {0x006DA978, 0x006DA97C, 0x006DA990, 0x006DA9CC, 0x28, 0x00326510, 0x00313430, 0x0030B070, 0x00050505},
[BYOND_VERSION_ADJUSTED(1618)] = {0x006DA6D8, 0x006DA6DC, 0x006DA6F0, 0x006DA72C, 0x28, 0x00326250, 0x00313170, 0x0030ADB0, 0x00050505},
[BYOND_VERSION_ADJUSTED(1619)] = {0x006DA698, 0x006DA69C, 0x006DA6B0, 0x006DA6EC, 0x28, 0x00326240, 0x00313160, 0x0030ADA0, 0x00050505},
[BYOND_VERSION_ADJUSTED(1620)] = {0x006D61D8, 0x006D61DC, 0x006D61F0, 0x006D622C, 0x28, 0x00324BE0, 0x00311AE0, 0x00309720, 0x00050505},
[BYOND_VERSION_ADJUSTED(1621)] = {0x006D8698, 0x006D869C, 0x006D86B0, 0x006D86EC, 0x28, 0x003252F0, 0x003121F0, 0x00309E30, 0x00050505},
[BYOND_VERSION_ADJUSTED(1622)] = {0x006D71B8, 0x006D71BC, 0x006D71D0, 0x006D720C, 0x28, 0x00324BC0, 0x00311AC0, 0x00309700, 0x00050505},
[BYOND_VERSION_ADJUSTED(1623)] = {0x006D71B8, 0x006D71BC, 0x006D71D0, 0x006D720C, 0x28, 0x00324BD0, 0x00311AD0, 0x00309710, 0x00050505},
};

#endif
Expand Down
5 changes: 5 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ byond-tracy glues together a byond server with the tracy profiler allowing you t
## supported byond versions
| windows | linux |
| -------- | -------- |
| 515.1623 | 515.1623 |
| 515.1622 | 515.1622 |
| 515.1621 | 515.1621 |
| 515.1620 | 515.1620 |
| 515.1619 | 515.1619 |
| 515.1618 | 515.1618 |
| 515.1617 | 515.1617 |
| 515.1616 | 515.1616 |
Expand Down

0 comments on commit 473ad7b

Please sign in to comment.