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 Apr 26, 2024
2 parents 7c27c46 + 27b9d44 commit e99882f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
10 changes: 8 additions & 2 deletions prof.c
Original file line number Diff line number Diff line change
Expand Up @@ -2822,7 +2822,7 @@ void *hook(char *const restrict dst, char *const restrict src, char unsigned siz
}

#if defined(UTRACY_WINDOWS)
# define BYOND_MAX_BUILD 1633
# define BYOND_MAX_BUILD 1636
# define BYOND_MIN_BUILD 1543
# define BYOND_VERSION_ADJUSTED(a) ((a) - BYOND_MIN_BUILD)

Expand Down Expand Up @@ -2917,10 +2917,13 @@ static int unsigned const byond_offsets[][9] = {
[BYOND_VERSION_ADJUSTED(1631)] = {0x0040756C, 0x00407570, 0x0040757C, 0x0040758C, 0x001C002C, 0x0012FB30, 0x0020A830, 0x001C2970, 0x00050606},
[BYOND_VERSION_ADJUSTED(1632)] = {0x0040756C, 0x00407570, 0x0040757C, 0x0040758C, 0x001C002C, 0x0012FC00, 0x0020A8D0, 0x001C29D0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1633)] = {0x00407574, 0x00407578, 0x00407584, 0x00407594, 0x001C002C, 0x0012FCF0, 0x0020A9D0, 0x001C2AE0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1634)] = {0x00408574, 0x00408578, 0x00408584, 0x00408594, 0x001C002C, 0x0012FCF0, 0x0020A9D0, 0x001C2AE0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1635)] = {0x00408574, 0x00408578, 0x00408584, 0x00408594, 0x001C002C, 0x0012FE00, 0x0020AAD0, 0x001C2BD0, 0x00050606},
[BYOND_VERSION_ADJUSTED(1636)] = {0x0040860C, 0x00408610, 0x0040861C, 0x0040862C, 0x001C002C, 0x0012FFE0, 0x0020AEE0, 0x001C2F60, 0x00050606},
};

#elif defined(UTRACY_LINUX)
# define BYOND_MAX_BUILD 1633
# define BYOND_MAX_BUILD 1636
# define BYOND_MIN_BUILD 1543
# define BYOND_VERSION_ADJUSTED(a) ((a) - BYOND_MIN_BUILD)

Expand Down Expand Up @@ -3013,6 +3016,9 @@ static int unsigned const byond_offsets[][9] = {
[BYOND_VERSION_ADJUSTED(1631)] = {0x006D84D8, 0x006D84DC, 0x006D84F0, 0x006D852C, 0x001C002C, 0x00322120, 0x0030EF80, 0x00306BC0, 0x00050505},
[BYOND_VERSION_ADJUSTED(1632)] = {0x006D85F8, 0x006D85FC, 0x006D8610, 0x006D864C, 0x001C002C, 0x00322140, 0x0030EFA0, 0x00306BE0, 0x00050505},
[BYOND_VERSION_ADJUSTED(1633)] = {0x006D8778, 0x006D877C, 0x006D8790, 0x006D87CC, 0x001C002C, 0x003220D0, 0x0030EF30, 0x00306B70, 0x00050505},
[BYOND_VERSION_ADJUSTED(1634)] = {0x006D8798, 0x006D879C, 0x006D87B0, 0x006D87EC, 0x001C002C, 0x00322150, 0x0030EFB0, 0x00306BF0, 0x00050505},
[BYOND_VERSION_ADJUSTED(1635)] = {0x006D8798, 0x006D879C, 0x006D87B0, 0x006D87EC, 0x001C002C, 0x003220E0, 0x0030EF40, 0x00306B80, 0x00050505},
[BYOND_VERSION_ADJUSTED(1636)] = {0x006D9198, 0x006D919C, 0x006D91B0, 0x006D91EC, 0x001C002C, 0x00322D40, 0x0030FBA0, 0x003065A0, 0x00050505},
};

#endif
Expand Down
3 changes: 3 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ byond-tracy glues together a byond server with the tracy profiler allowing you t
## supported byond versions
| windows | linux |
| -------- | -------- |
| 515.1636 | 515.1636 |
| 515.1635 | 515.1635 |
| 515.1634 | 515.1634 |
| 515.1633 | 515.1633 |
| 515.1632 | 515.1632 |
| 515.1631 | 515.1631 |
Expand Down

0 comments on commit e99882f

Please sign in to comment.