edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4174

Browse source 
4174: Fixed typo in variable name r=Jupeyy a=Chairn

Fixed typo 'Automic' --> 'Automatic' in graphics_threaded. I thought i made a comment on the PR (https://github.com/ddnet/ddnet/pull/4160), but seems like i didnt send it in the end.

## Checklist

- [ ] 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: Chairn <chairn.nq@hotmail.fr>
This commit is contained in:
bors[bot] 2021-09-18 18:56:02 +00:00 committed by GitHub
parent 79dbbe2ee2 635485de90
commit 48f81e27fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/graphics_threaded.cpp
View file

@ -1272,7 +1272,7 @@ int CGraphics_Threaded::CreateQuadContainer(bool AutomaticUpload)
void CGraphics_Threaded::QuadContainerChangeAutomaticUpload(int ContainerIndex, bool AutomaticUpload)
{
SQuadContainer &Container = m_QuadContainers[ContainerIndex];
Container.m_AutomicUpload = AutomaticUpload;
Container.m_AutomaticUpload = AutomaticUpload;
}
void CGraphics_Threaded::QuadContainerUpload(int ContainerIndex)
@ -1371,7 +1371,7 @@ void CGraphics_Threaded::QuadContainerAddQuads(int ContainerIndex, CQuadItem *pA
}
}
if(Container.m_AutomicUpload)
if(Container.m_AutomaticUpload)
QuadContainerUpload(ContainerIndex);
}
@ -1408,7 +1408,7 @@ void CGraphics_Threaded::QuadContainerAddQuads(int ContainerIndex, CFreeformItem
SetColor(&Quad.m_aVertices[3], 2);
}
if(Container.m_AutomicUpload)
if(Container.m_AutomaticUpload)
QuadContainerUpload(ContainerIndex);
}

6
src/engine/client/graphics_threaded.h
View file

@ -770,13 +770,13 @@ class CGraphics_Threaded : public IEngineGraphics
struct SQuadContainer
{
SQuadContainer(bool AutomicUpload = true)
SQuadContainer(bool AutomaticUpload = true)
{
m_Quads.clear();
m_QuadBufferObjectIndex = m_QuadBufferContainerIndex = -1;
m_FreeIndex = -1;
m_AutomicUpload = AutomicUpload;
m_AutomaticUpload = AutomaticUpload;
}
struct SQuad
@ -791,7 +791,7 @@ class CGraphics_Threaded : public IEngineGraphics
int m_FreeIndex;
bool m_AutomicUpload;
bool m_AutomaticUpload;
};
std::vector<SQuadContainer> m_QuadContainers;
int m_FirstFreeQuadContainer;