diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index b13d34afe..8cda279bf 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -2419,7 +2419,7 @@ char * GameSave::serialiseOPS(unsigned int & dataLength) soapLinkData = new unsigned char[3*soapCount]; if (!soapLinkData) throw BuildException("Save error, out of memory (SOAP)"); - soapLinkDataPtr = std::move(std::unique_ptr(soapLinkData)); + soapLinkDataPtr = std::unique_ptr(soapLinkData); //Iterate through particles in the same order that they were saved for (y=0;y buttons; - bool isMouseInside; public: DropDownWindow(DropDown * dropDown): diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp index 8bb557d43..2acfd87ed 100644 --- a/src/gui/preview/PreviewView.cpp +++ b/src/gui/preview/PreviewView.cpp @@ -602,7 +602,7 @@ void PreviewView::NotifyCommentsChanged(PreviewModel * sender) if (showAvatars) { tempAvatar = new ui::AvatarButton(ui::Point(2, currentY+7), ui::Point(26, 26), comments->at(i)->authorName); - tempAvatar->SetActionCallback({ [this, tempAvatar] { + tempAvatar->SetActionCallback({ [tempAvatar] { if (tempAvatar->GetUsername().size() > 0) { new ProfileActivity(tempAvatar->GetUsername()); diff --git a/src/gui/render/RenderView.cpp b/src/gui/render/RenderView.cpp index c3191bb68..a7eb03954 100644 --- a/src/gui/render/RenderView.cpp +++ b/src/gui/render/RenderView.cpp @@ -48,7 +48,7 @@ RenderView::RenderView(): renderModes.push_back(renderModeCheckbox); renderModeCheckbox->mode = mode; renderModeCheckbox->SetIcon(icon); - renderModeCheckbox->SetActionCallback({ [this, mode, renderModeCheckbox] { + renderModeCheckbox->SetActionCallback({ [this, renderModeCheckbox] { if (renderModeCheckbox->GetChecked()) c->SetRenderMode(renderModeCheckbox->mode); else @@ -69,7 +69,7 @@ RenderView::RenderView(): displayModes.push_back(displayModeCheckbox); displayModeCheckbox->mode = mode; displayModeCheckbox->SetIcon(icon); - displayModeCheckbox->SetActionCallback({ [this, mode, displayModeCheckbox] { + displayModeCheckbox->SetActionCallback({ [this, displayModeCheckbox] { if (displayModeCheckbox->GetChecked()) c->SetDisplayMode(displayModeCheckbox->mode); else @@ -99,7 +99,7 @@ RenderView::RenderView(): colourModes.push_back(colourModeCheckbox); colourModeCheckbox->mode = mode; colourModeCheckbox->SetIcon(icon); - colourModeCheckbox->SetActionCallback({ [this, mode, colourModeCheckbox] { + colourModeCheckbox->SetActionCallback({ [this, colourModeCheckbox] { if(colourModeCheckbox->GetChecked()) c->SetColourMode(colourModeCheckbox->mode); else diff --git a/src/simulation/elements/PPIP.cpp b/src/simulation/elements/PPIP.cpp index bd49414fb..69579c465 100644 --- a/src/simulation/elements/PPIP.cpp +++ b/src/simulation/elements/PPIP.cpp @@ -50,16 +50,11 @@ void Element::Element_PPIP() Graphics = &Element_PIPE_graphics; } -constexpr int PFLAG_NORMALSPEED = 0x00010000; // parts[].tmp flags // trigger flags to be processed this frame (trigger flags for next frame are shifted 3 bits to the left): constexpr int PPIP_TMPFLAG_TRIGGER_ON = 0x10000000; constexpr int PPIP_TMPFLAG_TRIGGER_OFF = 0x08000000; constexpr int PPIP_TMPFLAG_TRIGGER_REVERSE = 0x04000000; -constexpr int PPIP_TMPFLAG_TRIGGERS = 0x1C000000; -// current status of the pipe -constexpr int PPIP_TMPFLAG_PAUSED = 0x02000000; -constexpr int PPIP_TMPFLAG_REVERSED = 0x01000000; // 0x000000FF element // 0x00000100 is single pixel pipe // 0x00000200 will transfer like a single pixel pipe when in forward mode