diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp index c559768d736..69714f99ea4 100644 --- a/engines/ags/engine/ac/draw.cpp +++ b/engines/ags/engine/ac/draw.cpp @@ -61,8 +61,8 @@ #include "ags/shared/font/fonts.h" #include "ags/shared/gui/guimain.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/ac/spritecache.h" #include "ags/engine/gfx/gfx_util.h" #include "ags/engine/gfx/graphicsdriver.h" diff --git a/engines/ags/engine/ac/dynobj/cc_serializer.cpp b/engines/ags/engine/ac/dynobj/cc_serializer.cpp index 1e91c8c8e65..7390b4629ca 100644 --- a/engines/ags/engine/ac/dynobj/cc_serializer.cpp +++ b/engines/ags/engine/ac/dynobj/cc_serializer.cpp @@ -31,8 +31,8 @@ #include "ags/engine/ac/dynobj/scriptviewport.h" #include "ags/engine/ac/game.h" #include "ags/engine/debugging/debug_log.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/pluginobjectreader.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/pluginobjectreader.h" namespace AGS3 { diff --git a/engines/ags/engine/ac/event.cpp b/engines/ags/engine/ac/event.cpp index bb7d9b23aa8..005542c0da2 100644 --- a/engines/ags/engine/ac/event.cpp +++ b/engines/ags/engine/ac/event.cpp @@ -33,8 +33,8 @@ #include "ags/engine/ac/screen.h" #include "ags/shared/script/cc_error.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/engine/script/script.h" #include "ags/shared/gfx/bitmap.h" #include "ags/engine/gfx/ddb.h" diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp index f7788186da8..a862d533b35 100644 --- a/engines/ags/engine/ac/game.cpp +++ b/engines/ags/engine/ac/game.cpp @@ -85,8 +85,8 @@ #include "ags/engine/main/graphics_mode.h" #include "ags/engine/main/main.h" #include "ags/engine/media/audio/audio_system.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/script/cc_error.h" #include "ags/engine/script/runtimescriptvalue.h" #include "ags/engine/script/script.h" diff --git a/engines/ags/engine/ac/global_translation.cpp b/engines/ags/engine/ac/global_translation.cpp index 6ee31b312e7..6fe8bb586af 100644 --- a/engines/ags/engine/ac/global_translation.cpp +++ b/engines/ags/engine/ac/global_translation.cpp @@ -28,8 +28,8 @@ #include "ags/engine/ac/string.h" #include "ags/engine/ac/tree_map.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/util/memory.h" #include "ags/shared/core/types.h" diff --git a/engines/ags/engine/ac/room.cpp b/engines/ags/engine/ac/room.cpp index d6c04b6a02b..41ac25bceb2 100644 --- a/engines/ags/engine/ac/room.cpp +++ b/engines/ags/engine/ac/room.cpp @@ -60,8 +60,8 @@ #include "ags/shared/debugging/out.h" #include "ags/shared/game/room_version.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/script/cc_error.h" #include "ags/engine/script/script.h" #include "ags/engine/script/script_runtime.h" diff --git a/engines/ags/engine/ac/screen.cpp b/engines/ags/engine/ac/screen.cpp index 9306c4ac88c..06fc83fe557 100644 --- a/engines/ags/engine/ac/screen.cpp +++ b/engines/ags/engine/ac/screen.cpp @@ -31,8 +31,8 @@ #include "ags/engine/ac/dynobj/scriptuserobject.h" #include "ags/engine/script/script_runtime.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/gfx/bitmap.h" #include "ags/engine/gfx/graphicsdriver.h" diff --git a/engines/ags/engine/ac/sprite.cpp b/engines/ags/engine/ac/sprite.cpp index e8e1f2eeeeb..ccecda46bc2 100644 --- a/engines/ags/engine/ac/sprite.cpp +++ b/engines/ags/engine/ac/sprite.cpp @@ -26,8 +26,8 @@ #include "ags/engine/ac/sprite.h" #include "ags/engine/ac/system.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/ac/spritecache.h" #include "ags/shared/gfx/bitmap.h" #include "ags/engine/gfx/graphicsdriver.h" diff --git a/engines/ags/engine/debugging/debug.cpp b/engines/ags/engine/debugging/debug.cpp index 016f2b471c2..44147bdefeb 100644 --- a/engines/ags/engine/debugging/debug.cpp +++ b/engines/ags/engine/debugging/debug.cpp @@ -38,7 +38,7 @@ #include "ags/engine/main/config.h" #include "ags/engine/media/audio/audio_system.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/plugin_engine.h" #include "ags/engine/script/script.h" #include "ags/shared/script/script_common.h" #include "ags/shared/script/cc_error.h" diff --git a/engines/ags/engine/game/game_init.cpp b/engines/ags/engine/game/game_init.cpp index 8de53db9a16..5813e7e6c98 100644 --- a/engines/ags/engine/game/game_init.cpp +++ b/engines/ags/engine/game/game_init.cpp @@ -43,7 +43,7 @@ #include "ags/shared/gfx/bitmap.h" #include "ags/engine/gfx/ddb.h" #include "ags/shared/gui/guilabel.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/script/cc_error.h" #include "ags/engine/script/exports.h" #include "ags/engine/script/script.h" diff --git a/engines/ags/engine/game/savegame.cpp b/engines/ags/engine/game/savegame.cpp index d2deb79b9d7..085fbe669d7 100644 --- a/engines/ags/engine/game/savegame.cpp +++ b/engines/ags/engine/game/savegame.cpp @@ -52,8 +52,8 @@ #include "ags/engine/main/engine.h" #include "ags/engine/main/main.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/engine/script/script.h" #include "ags/shared/script/cc_error.h" #include "ags/shared/util/alignedstream.h" diff --git a/engines/ags/engine/game/savegame_components.cpp b/engines/ags/engine/game/savegame_components.cpp index 4475b1fdb64..72a8c179cce 100644 --- a/engines/ags/engine/game/savegame_components.cpp +++ b/engines/ags/engine/game/savegame_components.cpp @@ -53,8 +53,8 @@ #include "ags/shared/gui/guimain.h" #include "ags/shared/gui/guislider.h" #include "ags/shared/gui/guitextbox.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/shared/script/cc_error.h" #include "ags/engine/script/script.h" #include "ags/shared/util/filestream.h" // TODO: needed only because plugins expect file handle diff --git a/engines/ags/engine/main/game_file.cpp b/engines/ags/engine/main/game_file.cpp index 545ef80b75f..000949b6214 100644 --- a/engines/ags/engine/main/game_file.cpp +++ b/engines/ags/engine/main/game_file.cpp @@ -50,7 +50,7 @@ #include "ags/engine/ac/gamesetup.h" #include "ags/shared/game/main_game_file.h" #include "ags/engine/game/game_init.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "ags/engine/script/script.h" namespace AGS3 { diff --git a/engines/ags/engine/main/game_run.cpp b/engines/ags/engine/main/game_run.cpp index 68a830ee831..30e5eef2ff7 100644 --- a/engines/ags/engine/main/game_run.cpp +++ b/engines/ags/engine/main/game_run.cpp @@ -57,8 +57,8 @@ #include "ags/engine/main/engine.h" #include "ags/engine/main/game_run.h" #include "ags/engine/main/update.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" #include "ags/engine/script/script.h" #include "ags/shared/ac/spritecache.h" #include "ags/engine/media/audio/audio_system.h" diff --git a/engines/ags/engine/main/quit.cpp b/engines/ags/engine/main/quit.cpp index 822b2737175..6d83fb3338d 100644 --- a/engines/ags/engine/main/quit.cpp +++ b/engines/ags/engine/main/quit.cpp @@ -44,7 +44,7 @@ #include "ags/engine/gfx/graphicsdriver.h" #include "ags/shared/gfx/bitmap.h" #include "ags/shared/core/assetmanager.h" -#include "ags/engine/plugin/plugin_engine.h" +#include "ags/plugins/plugin_engine.h" #include "ags/engine/media/audio/audio_system.h" #include "ags/engine/globals.h" #include "ags/ags.h" diff --git a/engines/ags/engine/platform/base/agsplatformdriver.cpp b/engines/ags/engine/platform/base/agsplatformdriver.cpp index 150a7f64189..5fff43d8c07 100644 --- a/engines/ags/engine/platform/base/agsplatformdriver.cpp +++ b/engines/ags/engine/platform/base/agsplatformdriver.cpp @@ -33,7 +33,7 @@ #include "ags/shared/util/string_utils.h" #include "ags/shared/util/stream.h" #include "ags/shared/gfx/bitmap.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "ags/engine/ac/timer.h" #include "ags/engine/media/audio/audio_system.h" #include "ags/lib/system/datetime.h" diff --git a/engines/ags/engine/platform/linux/acpllnx.cpp b/engines/ags/engine/platform/linux/acpllnx.cpp index 415dd3dc725..966ef23e095 100644 --- a/engines/ags/engine/platform/linux/acpllnx.cpp +++ b/engines/ags/engine/platform/linux/acpllnx.cpp @@ -36,7 +36,7 @@ #include "ags/engine/ac/runtime_defines.h" #include "ags/engine/gfx/gfxdefines.h" #include "ags/engine/platform/base/agsplatformdriver.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "ags/shared/util/string.h" namespace AGS3 { diff --git a/engines/ags/engine/script/script_runtime.cpp b/engines/ags/engine/script/script_runtime.cpp index 2c4a1e75690..628b792ca3f 100644 --- a/engines/ags/engine/script/script_runtime.cpp +++ b/engines/ags/engine/script/script_runtime.cpp @@ -39,7 +39,7 @@ #include "ags/shared/script/cc_error.h" #include "ags/shared/script/cc_options.h" #include "ags/engine/script/systemimports.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "ags/engine/ac/dynobj/cc_dynamicarray.h" #include "ags/engine/ac/statobj/staticobject.h" diff --git a/engines/ags/engine/util/library_posix.h b/engines/ags/engine/util/library_posix.h index 04ab9523401..bc9152d0d1e 100644 --- a/engines/ags/engine/util/library_posix.h +++ b/engines/ags/engine/util/library_posix.h @@ -27,7 +27,7 @@ #include "ags/shared/core/platform.h" #include "ags/shared/util/string.h" #include "ags/shared/debugging/out.h" -#include "ags/engine/plugin/library.h" +#include "ags/plugins/library.h" #include "ags/engine/globals.h" namespace AGS3 { diff --git a/engines/ags/module.mk b/engines/ags/module.mk index 526a60c7a3d..c04cd2c01a4 100644 --- a/engines/ags/module.mk +++ b/engines/ags/module.mk @@ -287,10 +287,6 @@ MODULE_OBJS = \ engine/media/video/video.o \ engine/platform/base/agsplatformdriver.o \ engine/platform/linux/acpllnx.o \ - engine/plugin/agsplugin.o \ - engine/plugin/global_plugin.o \ - engine/plugin/library.o \ - engine/plugin/pluginobjectreader.o \ engine/script/cc_instance.o \ engine/script/executingscript.o \ engine/script/exports.o \ @@ -300,7 +296,11 @@ MODULE_OBJS = \ engine/script/script_engine.o \ engine/script/script_runtime.o \ engine/script/systemimports.o \ + plugins/agsplugin.o \ plugins/dll.o \ + plugins/global_plugin.o \ + plugins/library.o \ + plugins/pluginobjectreader.o \ plugins/ags_blend/ags_blend.o \ plugins/ags_creditz/ags_creditz.o \ plugins/ags_flashlight/ags_flashlight.o \ diff --git a/engines/ags/plugins/ags_pal_render/pal_render.h b/engines/ags/plugins/ags_pal_render/pal_render.h index 1f448174e3d..1d61dab866c 100644 --- a/engines/ags/plugins/ags_pal_render/pal_render.h +++ b/engines/ags/plugins/ags_pal_render/pal_render.h @@ -24,7 +24,7 @@ #define AGS_PLUGINS_AGS_PAL_RENDER_PAL_RENDER_H #include "ags/lib/allegro.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "common/algorithm.h" namespace AGS3 { diff --git a/engines/ags/engine/plugin/agsplugin.cpp b/engines/ags/plugins/agsplugin.cpp similarity index 99% rename from engines/ags/engine/plugin/agsplugin.cpp rename to engines/ags/plugins/agsplugin.cpp index 7c18d3f358d..07fccba737b 100644 --- a/engines/ags/engine/plugin/agsplugin.cpp +++ b/engines/ags/plugins/agsplugin.cpp @@ -54,10 +54,10 @@ #include "ags/shared/gui/guidefines.h" #include "ags/engine/main/game_run.h" #include "ags/engine/main/engine.h" -#include "ags/engine/plugin/agsplugin.h" -#include "ags/engine/plugin/plugin_engine.h" -#include "ags/engine/plugin/plugin_builtin.h" -#include "ags/engine/plugin/pluginobjectreader.h" +#include "ags/plugins/agsplugin.h" +#include "ags/plugins/plugin_engine.h" +#include "ags/plugins/plugin_builtin.h" +#include "ags/plugins/pluginobjectreader.h" #include "ags/engine/script/script.h" #include "ags/engine/script/script_runtime.h" #include "ags/shared/ac/spritecache.h" diff --git a/engines/ags/engine/plugin/agsplugin.h b/engines/ags/plugins/agsplugin.h similarity index 100% rename from engines/ags/engine/plugin/agsplugin.h rename to engines/ags/plugins/agsplugin.h diff --git a/engines/ags/plugins/dll.h b/engines/ags/plugins/dll.h index 5b797a3d497..b6406d9f5a8 100644 --- a/engines/ags/plugins/dll.h +++ b/engines/ags/plugins/dll.h @@ -24,7 +24,7 @@ #define AGS_PLUGINS_DLL_H #include "ags/shared/util/string.h" -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "common/hashmap.h" #include "common/hash-str.h" diff --git a/engines/ags/engine/plugin/global_plugin.cpp b/engines/ags/plugins/global_plugin.cpp similarity index 100% rename from engines/ags/engine/plugin/global_plugin.cpp rename to engines/ags/plugins/global_plugin.cpp diff --git a/engines/ags/engine/plugin/library.cpp b/engines/ags/plugins/library.cpp similarity index 97% rename from engines/ags/engine/plugin/library.cpp rename to engines/ags/plugins/library.cpp index 814fab68dcf..1fe645d8fcf 100644 --- a/engines/ags/engine/plugin/library.cpp +++ b/engines/ags/plugins/library.cpp @@ -20,7 +20,7 @@ * */ -#include "ags/engine/plugin/library.h" +#include "ags/plugins/library.h" #include "ags/plugins/dll.h" namespace AGS3 { diff --git a/engines/ags/engine/plugin/library.h b/engines/ags/plugins/library.h similarity index 100% rename from engines/ags/engine/plugin/library.h rename to engines/ags/plugins/library.h diff --git a/engines/ags/engine/plugin/plugin_builtin.h b/engines/ags/plugins/plugin_builtin.h similarity index 100% rename from engines/ags/engine/plugin/plugin_builtin.h rename to engines/ags/plugins/plugin_builtin.h diff --git a/engines/ags/engine/plugin/plugin_engine.h b/engines/ags/plugins/plugin_engine.h similarity index 100% rename from engines/ags/engine/plugin/plugin_engine.h rename to engines/ags/plugins/plugin_engine.h diff --git a/engines/ags/engine/plugin/pluginobjectreader.cpp b/engines/ags/plugins/pluginobjectreader.cpp similarity index 95% rename from engines/ags/engine/plugin/pluginobjectreader.cpp rename to engines/ags/plugins/pluginobjectreader.cpp index c01edae79b3..dd510ca1c09 100644 --- a/engines/ags/engine/plugin/pluginobjectreader.cpp +++ b/engines/ags/plugins/pluginobjectreader.cpp @@ -20,7 +20,7 @@ * */ -#include "ags/engine/plugin/pluginobjectreader.h" +#include "ags/plugins/pluginobjectreader.h" #include "ags/engine/ac/runtime_defines.h" namespace AGS3 { diff --git a/engines/ags/engine/plugin/pluginobjectreader.h b/engines/ags/plugins/pluginobjectreader.h similarity index 100% rename from engines/ags/engine/plugin/pluginobjectreader.h rename to engines/ags/plugins/pluginobjectreader.h diff --git a/engines/ags/plugins/serializer.h b/engines/ags/plugins/serializer.h index ba48c0bc25a..e752ea060f7 100644 --- a/engines/ags/plugins/serializer.h +++ b/engines/ags/plugins/serializer.h @@ -23,7 +23,7 @@ #ifndef AGS_PLUGINS_SERIALIZER_H #define AGS_PLUGINS_SERIALIZER_H -#include "ags/engine/plugin/agsplugin.h" +#include "ags/plugins/agsplugin.h" #include "common/serializer.h" namespace AGS3 {