Skip to content

CChar: added ResetVisualRange method #1464

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

Closed
nightNR wants to merge 11 commits into from
Closed

CChar: added ResetVisualRange method #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f43d3cd
CChar: added ResetVisualRange method
nightNR Sep 18, 2025
c21a4ba
chore(ci): empty commit to retrigger GitHub Actions
nightNR Sep 29, 2025
da5c8e2
Added new client encryptions (109,110,111)
mtwango Oct 6, 2025
7c5c453
Merge pull request #1513 from Sphereserver/dev
cbnolok Nov 15, 2025
dfe56fa
Merge pull request #1514 from Sphereserver/dev
cbnolok Nov 18, 2025
2154014
Merge pull request #1515 from Sphereserver/dev
cbnolok Nov 18, 2025
5d62a1e
Merge pull request #1517 from Sphereserver/dev
cbnolok Nov 19, 2025
394f883
Merge branch 'Sphereserver:master' into master
nightNR Dec 22, 2025
174d32d
Added new client encryptions (112, 113)
mtwango Jan 18, 2026
f1454fe
Fix github upload release ci permissions
mtwango Jan 18, 2026
8e9b8bf
Merge branch 'Sphereserver:master' into master
nightNR Jan 31, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build_linux_x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ jobs:
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
permissions:
contents: read
actions: write
contents: write
actions: read

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_linux_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ jobs:
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
permissions:
contents: read
actions: write
contents: write
actions: read

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_osx_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ jobs:
needs: macos-arm64 # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
permissions:
contents: read
actions: write
contents: write
actions: read

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_osx_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jobs:
upload_github_release:
needs: macos-x86_64
permissions:
contents: read
actions: write
contents: write
actions: read

# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_win_x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ jobs:
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
permissions:
contents: read
actions: write
contents: write
actions: read

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_win_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ jobs:
# Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
if: contains(fromJson('["master", "main"]'), github.ref_name)
permissions:
contents: read
actions: write
contents: write
actions: read

runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 5 additions & 0 deletions src/game/chars/CChar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,11 @@ void CChar::SetVisualRange(byte newSight)
}
}

void CChar::ResetVisualRange()
{
m_iVisualRange = g_Cfg.m_iMapViewSize;
}

// Clean up weird flags.
// fix Weirdness.
// NOTE:
Expand Down
3 changes: 2 additions & 1 deletion src/game/chars/CChar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,9 @@ public: void StatFlag_Mod(uint64 uiStatFlag, bool fMod) noexcept;
[[nodiscard]]
virtual int GetVisualRange() const override;
void SetVisualRange(byte newSight);
void ResetVisualRange();

virtual bool IsResourceMatch( const CResourceID& rid, dword dwArg ) const override;
virtual bool IsResourceMatch( const CResourceID& rid, dword dwArg ) const override;
bool IsResourceMatch( const CResourceID& rid, dword dwArg, dword dwArgResearch ) const;

bool IsSpeakAsGhost() const;
Expand Down
1 change: 1 addition & 0 deletions src/game/clients/CClientMsg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,6 +1497,7 @@ void CClient::addPlayerStart( CChar * pChar )
*/

new PacketPlayerStart(this);
pChar->ResetVisualRange();
addMapDiff();
m_pChar->MoveToChar(pt, true, false, false, false); // make sure we are in active list
m_pChar->Update();
Expand Down
4 changes: 4 additions & 0 deletions src/sphereCrypt.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENC_LOGIN 4 // Rotation cipher used for the Login Server crypt by every client,

[SPHERECRYPT]
// Classic Clients.
70011300 0374860ED 0ACD9FE7F ENC_TFISH // 7.0.113.00
70011200 03771A2FD 0ACDF527F ENC_TFISH // 7.0.112.00
70011100 037BBE10D 0ACB53E7F ENC_TFISH // 7.0.111.00
70011000 037DD2B1D 0ACEFA27F ENC_TFISH // 7.0.110.00
70010900 03817712D 0AB101E7F ENC_TFISH // 7.0.109.00
Expand Down Expand Up @@ -235,6 +237,8 @@ ENC_LOGIN 4 // Rotation cipher used for the Login Server crypt by every client,
1232700 0D47BD45C 034081CD6 ENC_LOGIN // 1.23.27

// Enhanced Clients.
6790011300 0154860ED 0BDD9FE7F ENC_TFISH // 4.0.113.00
6790011200 01571A2FD 0BDDF527F ENC_TFISH // 4.0.112.00
6790011100 015BBE10D 0BDB53E7F ENC_TFISH // 4.0.111.00
6790011000 015DD2B1D 0BDEFA27F ENC_TFISH // 4.0.110.00
6790010900 01A17712D 0BA101E7F ENC_TFISH // 4.0.109.00
Expand Down