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

changed back camera position for internet tab and fixed some line endings

Browse source
This commit is contained in:
oy 2018-11-11 15:53:30 +01:00
parent d1b8b18b3a
commit 6fd0de865c
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,16 +16,16 @@ CCamera::CCamera()
m_RotationCenter = vec2(0.0f, 0.0f);
m_MenuCenter = vec2(0.0f, 0.0f);
m_Positions[POS_START] = vec2(500.0f, 500.0f);
m_Positions[POS_INTERNET] = vec2(500.0f, 500.0f);
m_Positions[POS_LAN] = vec2(1000.0f, 1000.0f);
m_Positions[POS_FAVORITES] = vec2(2000.0f, 500.0f);
m_Positions[POS_DEMOS] = vec2(1500.0f, 1000.0f);
m_Positions[POS_SETTINGS_GENERAL] = vec2(1000.0f, 500.0f);
m_Positions[POS_SETTINGS_PLAYER] = vec2(400.0f, 200.0f);
m_Positions[POS_SETTINGS_TEE] = vec2(1100.0f, 300.0f);
m_Positions[POS_SETTINGS_CONTROLS] = vec2(600.0f, 1000.0f);
m_Positions[POS_SETTINGS_GRAPHICS] = vec2(500.0f, 750.0f);
m_Positions[POS_START] = vec2(500.0f, 500.0f);
m_Positions[POS_INTERNET] = vec2(1000.0f, 1000.0f);
m_Positions[POS_LAN] = vec2(1000.0f, 1000.0f);
m_Positions[POS_FAVORITES] = vec2(2000.0f, 500.0f);
m_Positions[POS_DEMOS] = vec2(1500.0f, 1000.0f);
m_Positions[POS_SETTINGS_GENERAL] = vec2(1000.0f, 500.0f);
m_Positions[POS_SETTINGS_PLAYER] = vec2(400.0f, 200.0f);
m_Positions[POS_SETTINGS_TEE] = vec2(1100.0f, 300.0f);
m_Positions[POS_SETTINGS_CONTROLS] = vec2(600.0f, 1000.0f);
m_Positions[POS_SETTINGS_GRAPHICS] = vec2(500.0f, 750.0f);
m_Positions[POS_SETTINGS_SOUND] = vec2(1300.0f, 850.0f);
m_CurrentPosition = -1;

20
src/game/client/components/camera.h
View file

@ -10,16 +10,16 @@ class CCamera : public CComponent
public:
enum
{
POS_START = 0,
POS_INTERNET,
POS_LAN,
POS_FAVORITES,
POS_DEMOS,
POS_SETTINGS_GENERAL, // order here should be the same like enum for settings pages in menu
POS_SETTINGS_PLAYER,
POS_SETTINGS_TEE,
POS_SETTINGS_CONTROLS,
POS_SETTINGS_GRAPHICS,
POS_START = 0,
POS_INTERNET,
POS_LAN,
POS_FAVORITES,
POS_DEMOS,
POS_SETTINGS_GENERAL, // order here should be the same like enum for settings pages in menu
POS_SETTINGS_PLAYER,
POS_SETTINGS_TEE,
POS_SETTINGS_CONTROLS,
POS_SETTINGS_GRAPHICS,
POS_SETTINGS_SOUND,
NUM_POS,