[Scummvm-git-logs] scummvm master -> fb478ba3194e041e9f25469ce59cc9574ddb27ef

sev- noreply at scummvm.org
Fri Feb 20 18:47:49 UTC 2026 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
fb478ba319 DIRECTOR: Rearranged rest of the Xtras to alphabetical directories


Commit: fb478ba3194e041e9f25469ce59cc9574ddb27ef
    https://github.com/scummvm/scummvm/commit/fb478ba3194e041e9f25469ce59cc9574ddb27ef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-20T19:47:13+01:00

Commit Message:
DIRECTOR: Rearranged rest of the Xtras to alphabetical directories

Changed paths:
  A engines/director/lingo/xtras/d/directsound.cpp
  A engines/director/lingo/xtras/d/directsound.h
  A engines/director/lingo/xtras/f/filextra.cpp
  A engines/director/lingo/xtras/f/filextra.h
  A engines/director/lingo/xtras/k/keypoll.cpp
  A engines/director/lingo/xtras/k/keypoll.h
  A engines/director/lingo/xtras/m/masterapp.cpp
  A engines/director/lingo/xtras/m/masterapp.h
  A engines/director/lingo/xtras/o/openurl.cpp
  A engines/director/lingo/xtras/o/openurl.h
  A engines/director/lingo/xtras/o/oscheck.cpp
  A engines/director/lingo/xtras/o/oscheck.h
  A engines/director/lingo/xtras/q/qtvrxtra.cpp
  A engines/director/lingo/xtras/q/qtvrxtra.h
  A engines/director/lingo/xtras/r/rtk.cpp
  A engines/director/lingo/xtras/r/rtk.h
  A engines/director/lingo/xtras/s/scrnutil.cpp
  A engines/director/lingo/xtras/s/scrnutil.h
  A engines/director/lingo/xtras/t/timextra.cpp
  A engines/director/lingo/xtras/t/timextra.h
  A engines/director/lingo/xtras/x/xsound.cpp
  A engines/director/lingo/xtras/x/xsound.h
  R engines/director/lingo/xtras/directsound.cpp
  R engines/director/lingo/xtras/directsound.h
  R engines/director/lingo/xtras/filextra.cpp
  R engines/director/lingo/xtras/filextra.h
  R engines/director/lingo/xtras/keypoll.cpp
  R engines/director/lingo/xtras/keypoll.h
  R engines/director/lingo/xtras/masterapp.cpp
  R engines/director/lingo/xtras/masterapp.h
  R engines/director/lingo/xtras/openurl.cpp
  R engines/director/lingo/xtras/openurl.h
  R engines/director/lingo/xtras/oscheck.cpp
  R engines/director/lingo/xtras/oscheck.h
  R engines/director/lingo/xtras/qtvrxtra.cpp
  R engines/director/lingo/xtras/qtvrxtra.h
  R engines/director/lingo/xtras/rtk.cpp
  R engines/director/lingo/xtras/rtk.h
  R engines/director/lingo/xtras/scrnutil.cpp
  R engines/director/lingo/xtras/scrnutil.h
  R engines/director/lingo/xtras/timextra.cpp
  R engines/director/lingo/xtras/timextra.h
  R engines/director/lingo/xtras/xsound.cpp
  R engines/director/lingo/xtras/xsound.h
    engines/director/lingo/lingo-object.cpp
    engines/director/module.mk


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 3b6de46841b..4f8c6a1d056 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -151,19 +151,19 @@
 #include "director/lingo/xlibs/y/yasix.h"
 #include "director/lingo/xtras/a/audio.h"
 #include "director/lingo/xtras/b/budapi.h"
-#include "director/lingo/xtras/directsound.h"
+#include "director/lingo/xtras/d/directsound.h"
 #include "director/lingo/xtras/d/displayres.h"
-#include "director/lingo/xtras/filextra.h"
-#include "director/lingo/xtras/keypoll.h"
-#include "director/lingo/xtras/masterapp.h"
+#include "director/lingo/xtras/f/filextra.h"
+#include "director/lingo/xtras/k/keypoll.h"
+#include "director/lingo/xtras/m/masterapp.h"
 #include "director/lingo/xtras/m/mui.h"
 #include "director/lingo/xtras/m/mui.h"
-#include "director/lingo/xtras/openurl.h"
-#include "director/lingo/xtras/oscheck.h"
-#include "director/lingo/xtras/qtvrxtra.h"
+#include "director/lingo/xtras/o/openurl.h"
+#include "director/lingo/xtras/o/oscheck.h"
+#include "director/lingo/xtras/q/qtvrxtra.h"
 #include "director/lingo/xtras/r/registryreader.h"
-#include "director/lingo/xtras/rtk.h"
-#include "director/lingo/xtras/scrnutil.h"
+#include "director/lingo/xtras/r/rtk.h"
+#include "director/lingo/xtras/s/scrnutil.h"
 #include "director/lingo/xtras/s/smacker.h"
 #include "director/lingo/xtras/s/staytoonedhall.h"
 #include "director/lingo/xtras/s/staytoonedball.h"
@@ -171,8 +171,8 @@
 #include "director/lingo/xtras/s/staytoonedhigh.h"
 #include "director/lingo/xtras/s/staytoonedober.h"
 #include "director/lingo/xtras/s/staytoonedtoon.h"
-#include "director/lingo/xtras/timextra.h"
-#include "director/lingo/xtras/xsound.h"
+#include "director/lingo/xtras/t/timextra.h"
+#include "director/lingo/xtras/x/xsound.h"
 
 namespace Director {
 
diff --git a/engines/director/lingo/xtras/directsound.cpp b/engines/director/lingo/xtras/d/directsound.cpp
similarity index 99%
rename from engines/director/lingo/xtras/directsound.cpp
rename to engines/director/lingo/xtras/d/directsound.cpp
index 04e9c99fef1..bbc24f7e489 100644
--- a/engines/director/lingo/xtras/directsound.cpp
+++ b/engines/director/lingo/xtras/d/directsound.cpp
@@ -27,7 +27,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/directsound.h"
+#include "director/lingo/xtras/d/directsound.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/directsound.h b/engines/director/lingo/xtras/d/directsound.h
similarity index 100%
rename from engines/director/lingo/xtras/directsound.h
rename to engines/director/lingo/xtras/d/directsound.h
diff --git a/engines/director/lingo/xtras/filextra.cpp b/engines/director/lingo/xtras/f/filextra.cpp
similarity index 99%
rename from engines/director/lingo/xtras/filextra.cpp
rename to engines/director/lingo/xtras/f/filextra.cpp
index 7ce285b208c..2531ea12a89 100644
--- a/engines/director/lingo/xtras/filextra.cpp
+++ b/engines/director/lingo/xtras/f/filextra.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/filextra.h"
+#include "director/lingo/xtras/f/filextra.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/filextra.h b/engines/director/lingo/xtras/f/filextra.h
similarity index 100%
rename from engines/director/lingo/xtras/filextra.h
rename to engines/director/lingo/xtras/f/filextra.h
diff --git a/engines/director/lingo/xtras/keypoll.cpp b/engines/director/lingo/xtras/k/keypoll.cpp
similarity index 98%
rename from engines/director/lingo/xtras/keypoll.cpp
rename to engines/director/lingo/xtras/k/keypoll.cpp
index 7158d3e34e9..f11da3e04cb 100644
--- a/engines/director/lingo/xtras/keypoll.cpp
+++ b/engines/director/lingo/xtras/k/keypoll.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/keypoll.h"
+#include "director/lingo/xtras/k/keypoll.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/keypoll.h b/engines/director/lingo/xtras/k/keypoll.h
similarity index 100%
rename from engines/director/lingo/xtras/keypoll.h
rename to engines/director/lingo/xtras/k/keypoll.h
diff --git a/engines/director/lingo/xtras/masterapp.cpp b/engines/director/lingo/xtras/m/masterapp.cpp
similarity index 99%
rename from engines/director/lingo/xtras/masterapp.cpp
rename to engines/director/lingo/xtras/m/masterapp.cpp
index 22f1f9e34f8..d0f2bf37633 100644
--- a/engines/director/lingo/xtras/masterapp.cpp
+++ b/engines/director/lingo/xtras/m/masterapp.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/masterapp.h"
+#include "director/lingo/xtras/m/masterapp.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/masterapp.h b/engines/director/lingo/xtras/m/masterapp.h
similarity index 100%
rename from engines/director/lingo/xtras/masterapp.h
rename to engines/director/lingo/xtras/m/masterapp.h
diff --git a/engines/director/lingo/xtras/openurl.cpp b/engines/director/lingo/xtras/o/openurl.cpp
similarity index 98%
rename from engines/director/lingo/xtras/openurl.cpp
rename to engines/director/lingo/xtras/o/openurl.cpp
index 003e5818d24..d21c446c822 100644
--- a/engines/director/lingo/xtras/openurl.cpp
+++ b/engines/director/lingo/xtras/o/openurl.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/openurl.h"
+#include "director/lingo/xtras/o/openurl.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/openurl.h b/engines/director/lingo/xtras/o/openurl.h
similarity index 100%
rename from engines/director/lingo/xtras/openurl.h
rename to engines/director/lingo/xtras/o/openurl.h
diff --git a/engines/director/lingo/xtras/oscheck.cpp b/engines/director/lingo/xtras/o/oscheck.cpp
similarity index 98%
rename from engines/director/lingo/xtras/oscheck.cpp
rename to engines/director/lingo/xtras/o/oscheck.cpp
index 918046e9ee7..91d7f8cc93c 100644
--- a/engines/director/lingo/xtras/oscheck.cpp
+++ b/engines/director/lingo/xtras/o/oscheck.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/oscheck.h"
+#include "director/lingo/xtras/o/oscheck.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/oscheck.h b/engines/director/lingo/xtras/o/oscheck.h
similarity index 100%
rename from engines/director/lingo/xtras/oscheck.h
rename to engines/director/lingo/xtras/o/oscheck.h
diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/q/qtvrxtra.cpp
similarity index 99%
rename from engines/director/lingo/xtras/qtvrxtra.cpp
rename to engines/director/lingo/xtras/q/qtvrxtra.cpp
index 9cb342b33aa..a00525adf34 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/q/qtvrxtra.cpp
@@ -33,7 +33,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-builtins.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/qtvrxtra.h"
+#include "director/lingo/xtras/q/qtvrxtra.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/qtvrxtra.h b/engines/director/lingo/xtras/q/qtvrxtra.h
similarity index 100%
rename from engines/director/lingo/xtras/qtvrxtra.h
rename to engines/director/lingo/xtras/q/qtvrxtra.h
diff --git a/engines/director/lingo/xtras/rtk.cpp b/engines/director/lingo/xtras/r/rtk.cpp
similarity index 99%
rename from engines/director/lingo/xtras/rtk.cpp
rename to engines/director/lingo/xtras/r/rtk.cpp
index 96e946d1a85..ffbb1d54317 100644
--- a/engines/director/lingo/xtras/rtk.cpp
+++ b/engines/director/lingo/xtras/r/rtk.cpp
@@ -28,7 +28,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/rtk.h"
+#include "director/lingo/xtras/r/rtk.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/rtk.h b/engines/director/lingo/xtras/r/rtk.h
similarity index 100%
rename from engines/director/lingo/xtras/rtk.h
rename to engines/director/lingo/xtras/r/rtk.h
diff --git a/engines/director/lingo/xtras/scrnutil.cpp b/engines/director/lingo/xtras/s/scrnutil.cpp
similarity index 98%
rename from engines/director/lingo/xtras/scrnutil.cpp
rename to engines/director/lingo/xtras/s/scrnutil.cpp
index 89c8140053f..15434bfc1f1 100644
--- a/engines/director/lingo/xtras/scrnutil.cpp
+++ b/engines/director/lingo/xtras/s/scrnutil.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/scrnutil.h"
+#include "director/lingo/xtras/s/scrnutil.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/scrnutil.h b/engines/director/lingo/xtras/s/scrnutil.h
similarity index 100%
rename from engines/director/lingo/xtras/scrnutil.h
rename to engines/director/lingo/xtras/s/scrnutil.h
diff --git a/engines/director/lingo/xtras/timextra.cpp b/engines/director/lingo/xtras/t/timextra.cpp
similarity index 98%
rename from engines/director/lingo/xtras/timextra.cpp
rename to engines/director/lingo/xtras/t/timextra.cpp
index 65681d06952..eb6ad50cd81 100644
--- a/engines/director/lingo/xtras/timextra.cpp
+++ b/engines/director/lingo/xtras/t/timextra.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/timextra.h"
+#include "director/lingo/xtras/t/timextra.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/timextra.h b/engines/director/lingo/xtras/t/timextra.h
similarity index 100%
rename from engines/director/lingo/xtras/timextra.h
rename to engines/director/lingo/xtras/t/timextra.h
diff --git a/engines/director/lingo/xtras/xsound.cpp b/engines/director/lingo/xtras/x/xsound.cpp
similarity index 99%
rename from engines/director/lingo/xtras/xsound.cpp
rename to engines/director/lingo/xtras/x/xsound.cpp
index 8076c8ecdd4..77b35927756 100644
--- a/engines/director/lingo/xtras/xsound.cpp
+++ b/engines/director/lingo/xtras/x/xsound.cpp
@@ -25,7 +25,7 @@
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-utils.h"
-#include "director/lingo/xtras/xsound.h"
+#include "director/lingo/xtras/x/xsound.h"
 
 /**************************************************
  *
diff --git a/engines/director/lingo/xtras/xsound.h b/engines/director/lingo/xtras/x/xsound.h
similarity index 100%
rename from engines/director/lingo/xtras/xsound.h
rename to engines/director/lingo/xtras/x/xsound.h
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 958520d232e..4ed9dcd5065 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -183,18 +183,18 @@ MODULE_OBJS = \
 	lingo/xlibs/y/yasix.o \
 	lingo/xtras/b/budapi.o \
 	lingo/xtras/a/audio.o \
-	lingo/xtras/directsound.o \
+	lingo/xtras/d/directsound.o \
 	lingo/xtras/d/displayres.o \
-	lingo/xtras/filextra.o \
-	lingo/xtras/keypoll.o \
-	lingo/xtras/masterapp.o \
+	lingo/xtras/f/filextra.o \
+	lingo/xtras/k/keypoll.o \
+	lingo/xtras/m/masterapp.o \
 	lingo/xtras/m/mui.o \
-	lingo/xtras/openurl.o \
-	lingo/xtras/oscheck.o \
-	lingo/xtras/qtvrxtra.o \
+	lingo/xtras/o/openurl.o \
+	lingo/xtras/o/oscheck.o \
+	lingo/xtras/q/qtvrxtra.o \
 	lingo/xtras/r/registryreader.o \
-	lingo/xtras/rtk.o \
-	lingo/xtras/scrnutil.o \
+	lingo/xtras/r/rtk.o \
+	lingo/xtras/s/scrnutil.o \
 	lingo/xtras/s/smacker.o \
 	lingo/xtras/s/staytoonedhall.o \
 	lingo/xtras/s/staytoonedball.o \
@@ -202,8 +202,8 @@ MODULE_OBJS = \
 	lingo/xtras/s/staytoonedhigh.o \
 	lingo/xtras/s/staytoonedober.o \
 	lingo/xtras/s/staytoonedtoon.o \
-	lingo/xtras/timextra.o \
-	lingo/xtras/xsound.o
+	lingo/xtras/t/timextra.o \
+	lingo/xtras/x/xsound.o
 
 
 ifdef USE_IMGUI

More information about the Scummvm-git-logs mailing list