summaryrefslogtreecommitdiff
path: root/src/dyetool
diff options
context:
space:
mode:
Diffstat (limited to 'src/dyetool')
-rw-r--r--src/dyetool/client.cpp2
-rw-r--r--src/dyetool/client.h2
-rw-r--r--src/dyetool/dyemain.cpp2
-rw-r--r--src/dyetool/gui/viewport.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 05a5d365a..18fb9943c 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -432,7 +432,7 @@ void Client::gameClear()
if (logger != nullptr)
logger->log1("Quitting3");
- graphicsManager.deleteRenderers();
+ GraphicsManager::deleteRenderers();
if (logger != nullptr)
logger->log1("Quitting4");
diff --git a/src/dyetool/client.h b/src/dyetool/client.h
index 6a22b6925..57f62c2b9 100644
--- a/src/dyetool/client.h
+++ b/src/dyetool/client.h
@@ -76,7 +76,7 @@ class Client final : public ActionListener
void slowLogic();
- bool isTmw();
+ static bool isTmw();
private:
void stateGame();
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index 4caf4b94d..95e038da6 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
printf("Error loading image\n");
return 1;
}
- SDL_Surface *const surface = imageHelper->convertTo32Bit(
+ SDL_Surface *const surface = ImageHelper::convertTo32Bit(
image->getSDLSurface());
ImageWriter::writePNG(surface, dst);
SDL_FreeSurface(surface);
diff --git a/src/dyetool/gui/viewport.cpp b/src/dyetool/gui/viewport.cpp
index 799f6acce..21719286f 100644
--- a/src/dyetool/gui/viewport.cpp
+++ b/src/dyetool/gui/viewport.cpp
@@ -153,10 +153,10 @@ void Viewport::mousePressed(MouseEvent &event)
}
// If a popup is active, just remove it
- if (popupManager->isPopupMenuVisible())
+ if (PopupManager::isPopupMenuVisible())
{
mPlayerFollowMouse = false;
- popupManager->hidePopupMenu();
+ PopupManager::hidePopupMenu();
return;
}