Skip to content

3rd argument in serv.map(location) is always z #1607

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
mtwango merged 3 commits into from
Oct 9, 2026
Merged

3rd argument in serv.map(location) is always z #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9b42dd
Remove 3rd variable argument (`map` or `z`) from serv.map(location) a…
mtwango Oct 8, 2026
05022e2
Add map ID check, otherwise it can crash the sphere with invalid id
mtwango Oct 8, 2026
3836ed9
Merge branch 'dev' into change-serv-map-arguments
mtwango Oct 9, 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
2 changes: 2 additions & 0 deletions Changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4154,3 +4154,5 @@ When setting a property like MORE to the a spell or skill defname, trying to rea

08-10-2026, Mulambo
- Changed: Equipped armor / weapon will also drop on ground when moving it while overweight, like other items (unless OF_OWNoDropCarriedItem is enabled).
WARNING! POTENTIALLY BREAKING CHANGE!
- Changed: `serv.map(location)` 3rd parameter is now always `z` position (was `map` when received 3 arguments or `z` when received 4 arguments).
11 changes: 7 additions & 4 deletions src/game/CServerConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,15 +1677,18 @@ bool CServerConfig::r_WriteVal( lpctstr ptcKey, CSString & sVal, CTextConsole *
if (IsDigit(ppVal[3][0]))
{
pt.m_map = (byte)(atoi(ppVal[3]));

if (!g_MapList.IsMapSupported(pt.m_map)) {
g_Log.EventError("Unsupported Map %d\n", pt.m_map);
return false;
}
}
FALLTHROUGH;

case 3:
if ( IsDigit(ppVal[2][0]) || (( iArgs == 4 ) && ( ppVal[2][0] == '-' )) )
if (IsDigit(ppVal[2][0]) || ppVal[2][0] == '-')
{
pt.m_z = (char)(( iArgs == 4 ) ? atoi(ppVal[2]) : 0);
if ( iArgs == 3 )
pt.m_map = (byte)(atoi(ppVal[2]));
pt.m_z = static_cast<char>(atoi(ppVal[2]));
}
FALLTHROUGH;

Expand Down
Loading