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

Merge pull request #8564 from ChillerDragon/pr_clang_editor

Browse source 
Fix some clang warnings in the editor
This commit is contained in:
Robert Müller 2024-07-06 10:51:04 +00:00 committed by GitHub
parent bb7d42444f d6cf127056
commit 60ab717f03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/editor/editor.cpp
View file

@ -917,7 +917,7 @@ bool CEditor::CallbackSaveSound(const char *pFileName, int StorageType, void *pU
return false;
}
void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, const int SampleId)
void CEditor::DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, int SampleId)
{
CUIRect Button, SeekBar;
// play/pause button

11
src/game/editor/editor.h
View file

@ -31,7 +31,6 @@
#include <engine/shared/datafile.h>
#include <engine/shared/jobs.h>
#include "auto_map.h"
#include "editor_history.h"
#include "editor_server_settings.h"
#include "editor_trackers.h"
@ -402,8 +401,8 @@ public:
m_CheckerTexture.Invalidate();
m_BackgroundTexture.Invalidate();
for(int i = 0; i < NUM_CURSORS; i++)
m_aCursorTextures[i].Invalidate();
for(auto &CursorTexture : m_aCursorTextures)
CursorTexture.Invalidate();
m_CursorType = CURSOR_NORMAL;
@ -833,7 +832,7 @@ public:
void RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness) const;
SEditResult<int> UiDoValueSelector(void *pId, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int corners = IGraphics::CORNER_ALL, const ColorRGBA *pColor = nullptr, bool ShowValue = true);
SEditResult<int> UiDoValueSelector(void *pId, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int Corners = IGraphics::CORNER_ALL, const ColorRGBA *pColor = nullptr, bool ShowValue = true);
static CUi::EPopupMenuFunctionResult PopupMenuFile(void *pContext, CUIRect View, bool Active);
static CUi::EPopupMenuFunctionResult PopupMenuTools(void *pContext, CUIRect View, bool Active);
@ -1003,7 +1002,7 @@ public:
void SelectGameLayer();
std::vector<int> SortImages();
void DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, const int SampleId);
void DoAudioPreview(CUIRect View, const void *pPlayPauseButtonId, const void *pStopButtonId, const void *pSeekBarId, int SampleId);
// Tile Numbers For Explanations - TODO: Add/Improve tiles and explanations
enum
@ -1127,7 +1126,6 @@ public:
int FindNextFreeSwitchNumber();
int FindNextFreeTeleNumber(bool IsCheckpoint = false);
public:
// Undo/Redo
CEditorHistory m_EditorHistory;
CEditorHistory m_ServerSettingsHistory;
@ -1139,7 +1137,6 @@ private:
void UndoLastAction();
void RedoLastAction();
private:
std::map<int, CPoint[5]> m_QuadDragOriginalPoints;
};