edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4640

Browse source 
4640: Don't clamp "zoom" command, we already clamp in ChangeZoom r=heinrich5991 a=def-

Thanks to chillerdragon for noticing

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Dennis Felsing <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2022-01-26 13:06:41 +00:00 committed by GitHub
parent 253bfaf987 0374ddac72
commit f1f0cd0bc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/camera.cpp
View file

@ -211,7 +211,7 @@ void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData)
} }
void CCamera::ConZoom(IConsole::IResult *pResult, void *pUserData) void CCamera::ConZoom(IConsole::IResult *pResult, void *pUserData)
{ {
float TargetLevel = pResult->NumArguments() ? clamp<float>(pResult->GetFloat(0), 0, 20) : g_Config.m_ClDefaultZoom; float TargetLevel = pResult->NumArguments() ? pResult->GetFloat(0) : g_Config.m_ClDefaultZoom;
((CCamera *)pUserData)->ChangeZoom(pow(ZoomStep, TargetLevel - 10)); ((CCamera *)pUserData)->ChangeZoom(pow(ZoomStep, TargetLevel - 10));
} }
void CCamera::ConSetView(IConsole::IResult *pResult, void *pUserData) void CCamera::ConSetView(IConsole::IResult *pResult, void *pUserData)