From ab89463b0f88f3f2191cf3f85e0e18bea39e9d36 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 5 Jan 2024 22:12:08 -0600 Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 89fab5cc..b46cb65b b46cb65b [nostalgia/studio] Add version 877349df [nostalgia/core/studio] Increase max tilesheet export size, fix input handling when popups open 5418c062 [olympic] Change olympic::s_version to olympic::appVersion dd9c1100 [glutils] Update copyright for 2024 db82aee7 [teagba] Update copyright for 2024 edf15858 [teagba] Update copyright for 2024 d1efbb2f [ox] Update copyright for 2024 051623f4 [olympic,nostalgia] Update copyright for 2024 055d64b1 [olympic] Add support for an AppLib app specific version de9f8426 [ox/std] Add error.hpp include to memory.hpp 200e5867 Add .idea to .gitignore f1609519 [olympic] Cleanup e452d9db [nostalgia] Add python3-mypy to Debian deps 43a87b60 [nostalgia] Ensure pkg-gba reads .current_build without a new line 8acc6244 [olympic/keel] Improve error clarity on pack some common failures bd2aeee2 [ox/claw] Improve error clarity when loading ModelObjects git-subtree-dir: deps/nostalgia git-subtree-split: b46cb65b7f5b1ea17c115fcb31a6baff323ea1a3 --- .gitignore | 1 + README.md | 1 + deps/glutils/.liccor.yml | 6 ++++++ deps/glutils/include/glutils/glutils.hpp | 2 +- deps/glutils/src/glutils.cpp | 2 +- deps/ox/src/ox/clargs/clargs.cpp | 4 ++-- deps/ox/src/ox/clargs/clargs.hpp | 4 ++-- deps/ox/src/ox/claw/claw.hpp | 2 +- deps/ox/src/ox/claw/format.hpp | 2 +- deps/ox/src/ox/claw/read.cpp | 7 +++++-- deps/ox/src/ox/claw/readclaw.cpp | 4 ++-- deps/ox/src/ox/claw/test/tests.cpp | 2 +- deps/ox/src/ox/claw/write.cpp | 2 +- deps/ox/src/ox/claw/write.hpp | 4 ++-- deps/ox/src/ox/event/event.hpp | 2 +- deps/ox/src/ox/event/signal.cpp | 2 +- deps/ox/src/ox/event/signal.hpp | 2 +- deps/ox/src/ox/event/test/tests.cpp | 2 +- deps/ox/src/ox/fs/filestore/filestoretemplate.cpp | 2 +- deps/ox/src/ox/fs/filestore/filestoretemplate.hpp | 4 ++-- deps/ox/src/ox/fs/filesystem/directory.cpp | 2 +- deps/ox/src/ox/fs/filesystem/directory.hpp | 4 ++-- deps/ox/src/ox/fs/filesystem/filelocation.cpp | 2 +- deps/ox/src/ox/fs/filesystem/filesystem.cpp | 4 ++-- deps/ox/src/ox/fs/filesystem/filesystem.hpp | 4 ++-- deps/ox/src/ox/fs/filesystem/passthroughfs.cpp | 4 ++-- deps/ox/src/ox/fs/filesystem/passthroughfs.hpp | 4 ++-- deps/ox/src/ox/fs/filesystem/pathiterator.cpp | 4 ++-- deps/ox/src/ox/fs/filesystem/pathiterator.hpp | 2 +- deps/ox/src/ox/fs/filesystem/types.hpp | 2 +- deps/ox/src/ox/fs/fs.hpp | 2 +- deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp | 4 ++-- deps/ox/src/ox/fs/ptrarith/ptr.hpp | 4 ++-- deps/ox/src/ox/fs/test/tests.cpp | 2 +- deps/ox/src/ox/fs/tool.cpp | 4 ++-- deps/ox/src/ox/logconn/def.hpp | 2 +- deps/ox/src/ox/logconn/logconn.cpp | 2 +- deps/ox/src/ox/mc/err.hpp | 2 +- deps/ox/src/ox/mc/intops.hpp | 2 +- deps/ox/src/ox/mc/mc.hpp | 2 +- deps/ox/src/ox/mc/presenceindicator.cpp | 2 +- deps/ox/src/ox/mc/presenceindicator.hpp | 4 ++-- deps/ox/src/ox/mc/read.hpp | 2 +- deps/ox/src/ox/mc/types.hpp | 2 +- deps/ox/src/ox/mc/write.hpp | 2 +- deps/ox/src/ox/model/descread.hpp | 2 +- deps/ox/src/ox/model/desctypes.cpp | 2 +- deps/ox/src/ox/model/descwrite.hpp | 2 +- deps/ox/src/ox/model/fieldcounter.hpp | 2 +- deps/ox/src/ox/model/metadata.hpp | 2 +- deps/ox/src/ox/model/modelhandleradaptor.hpp | 2 +- deps/ox/src/ox/model/modelops.hpp | 4 ++-- deps/ox/src/ox/model/modelvalue.hpp | 2 +- deps/ox/src/ox/model/test/tests.cpp | 2 +- deps/ox/src/ox/model/typenamecatcher.hpp | 2 +- deps/ox/src/ox/model/types.hpp | 2 +- deps/ox/src/ox/model/walk.hpp | 4 ++-- deps/ox/src/ox/oc/oc.hpp | 2 +- deps/ox/src/ox/oc/read.hpp | 2 +- deps/ox/src/ox/oc/test/tests.cpp | 2 +- deps/ox/src/ox/oc/write.hpp | 2 +- deps/ox/src/ox/preloader/alignmentcatcher.hpp | 6 +++++- deps/ox/src/ox/preloader/platspecs.hpp | 6 +++++- deps/ox/src/ox/preloader/preloader.cpp | 6 +++++- deps/ox/src/ox/preloader/preloader.hpp | 6 +++++- deps/ox/src/ox/preloader/sizecatcher.hpp | 6 +++++- deps/ox/src/ox/preloader/unionsizecatcher.hpp | 6 +++++- deps/ox/src/ox/std/algorithm.hpp | 2 +- deps/ox/src/ox/std/array.hpp | 4 ++-- deps/ox/src/ox/std/assert.cpp | 2 +- deps/ox/src/ox/std/assert.hpp | 2 +- deps/ox/src/ox/std/basestringview.hpp | 2 +- deps/ox/src/ox/std/bit.cpp | 2 +- deps/ox/src/ox/std/bit.hpp | 4 ++-- deps/ox/src/ox/std/bounds.hpp | 4 ++-- deps/ox/src/ox/std/bstring.hpp | 2 +- deps/ox/src/ox/std/buffer.cpp | 2 +- deps/ox/src/ox/std/buffer.hpp | 4 ++-- deps/ox/src/ox/std/buildinfo.cpp | 2 +- deps/ox/src/ox/std/buildinfo.hpp | 2 +- deps/ox/src/ox/std/byteswap.cpp | 2 +- deps/ox/src/ox/std/byteswap.hpp | 4 ++-- deps/ox/src/ox/std/cstringview.hpp | 2 +- deps/ox/src/ox/std/cstrops.hpp | 2 +- deps/ox/src/ox/std/def.hpp | 4 ++-- deps/ox/src/ox/std/defer.hpp | 2 +- deps/ox/src/ox/std/defines.hpp | 2 +- deps/ox/src/ox/std/error.hpp | 2 +- deps/ox/src/ox/std/fmt.cpp | 2 +- deps/ox/src/ox/std/fmt.hpp | 2 +- deps/ox/src/ox/std/hardware.hpp | 2 +- deps/ox/src/ox/std/hashmap.hpp | 2 +- deps/ox/src/ox/std/heapmgr.cpp | 2 +- deps/ox/src/ox/std/heapmgr.hpp | 2 +- deps/ox/src/ox/std/initializerlist.hpp | 2 +- deps/ox/src/ox/std/iterator.hpp | 4 ++-- deps/ox/src/ox/std/math.cpp | 2 +- deps/ox/src/ox/std/math.hpp | 2 +- deps/ox/src/ox/std/memops.cpp | 2 +- deps/ox/src/ox/std/memops.hpp | 2 +- deps/ox/src/ox/std/memory.hpp | 11 +++++++++++ deps/ox/src/ox/std/point.hpp | 4 ++-- deps/ox/src/ox/std/random.cpp | 4 ++-- deps/ox/src/ox/std/random.hpp | 4 ++-- deps/ox/src/ox/std/range.hpp | 2 +- deps/ox/src/ox/std/ranges.hpp | 2 +- deps/ox/src/ox/std/reader.cpp | 4 ++-- deps/ox/src/ox/std/reader.hpp | 4 ++-- deps/ox/src/ox/std/realstd.hpp | 2 +- deps/ox/src/ox/std/serialize.hpp | 2 +- deps/ox/src/ox/std/size.hpp | 4 ++-- deps/ox/src/ox/std/span.hpp | 4 ++-- deps/ox/src/ox/std/stacktrace.cpp | 4 ++-- deps/ox/src/ox/std/stacktrace.hpp | 2 +- deps/ox/src/ox/std/stddef.hpp | 2 +- deps/ox/src/ox/std/string.cpp | 2 +- deps/ox/src/ox/std/string.hpp | 2 +- deps/ox/src/ox/std/stringview.hpp | 2 +- deps/ox/src/ox/std/strongint.hpp | 2 +- deps/ox/src/ox/std/strops.cpp | 2 +- deps/ox/src/ox/std/strops.hpp | 2 +- deps/ox/src/ox/std/substitutes.cpp | 2 +- deps/ox/src/ox/std/test/tests.cpp | 4 ++-- deps/ox/src/ox/std/trace.cpp | 2 +- deps/ox/src/ox/std/trace.hpp | 4 ++-- deps/ox/src/ox/std/tracehook.cpp | 4 ++-- deps/ox/src/ox/std/typeinfo.hpp | 2 +- deps/ox/src/ox/std/types.hpp | 2 +- deps/ox/src/ox/std/typetraits.cpp | 2 +- deps/ox/src/ox/std/units.hpp | 2 +- deps/ox/src/ox/std/utility.hpp | 2 +- deps/ox/src/ox/std/uuid.cpp | 4 ++-- deps/ox/src/ox/std/uuid.hpp | 2 +- deps/ox/src/ox/std/vec.cpp | 4 ++-- deps/ox/src/ox/std/vec.hpp | 4 ++-- deps/ox/src/ox/std/vector.hpp | 4 ++-- deps/ox/src/ox/std/writer.hpp | 2 +- deps/teagba/.liccor.yml | 6 ++++++ deps/teagba/include/teagba/addresses.hpp | 2 +- deps/teagba/include/teagba/bios.hpp | 2 +- deps/teagba/include/teagba/gfx.hpp | 2 +- deps/teagba/include/teagba/irq.hpp | 2 +- deps/teagba/include/teagba/registers.hpp | 2 +- deps/teagba/src/bios_stub.cpp | 6 +----- deps/teagba/src/cstartup.cpp | 6 +----- deps/teagba/src/gfx.cpp | 2 +- scripts/pkg-gba.py | 4 +++- .../modules/core/include/nostalgia/core/color.hpp | 2 +- .../modules/core/include/nostalgia/core/consts.hpp | 2 +- .../modules/core/include/nostalgia/core/context.hpp | 2 +- .../modules/core/include/nostalgia/core/core.hpp | 2 +- .../modules/core/include/nostalgia/core/gfx.hpp | 2 +- .../core/include/nostalgia/core/initparams.hpp | 2 +- .../core/include/nostalgia/core/keelmodule.hpp | 2 +- .../modules/core/include/nostalgia/core/palette.hpp | 2 +- .../modules/core/include/nostalgia/core/ptidxconv.hpp | 2 +- .../core/include/nostalgia/core/studiomodule.hpp | 2 +- .../modules/core/include/nostalgia/core/tilesheet.hpp | 2 +- src/nostalgia/modules/core/src/gba/context.cpp | 2 +- src/nostalgia/modules/core/src/gba/context.hpp | 2 +- src/nostalgia/modules/core/src/gba/gfx.cpp | 2 +- src/nostalgia/modules/core/src/gba/gfx.hpp | 2 +- src/nostalgia/modules/core/src/gba/panic.cpp | 2 +- src/nostalgia/modules/core/src/gfx.cpp | 2 +- src/nostalgia/modules/core/src/keel/keelmodule.cpp | 2 +- src/nostalgia/modules/core/src/keel/typeconv.cpp | 2 +- src/nostalgia/modules/core/src/keel/typeconv.hpp | 2 +- src/nostalgia/modules/core/src/opengl/context.cpp | 2 +- src/nostalgia/modules/core/src/opengl/context.hpp | 2 +- src/nostalgia/modules/core/src/opengl/gfx.cpp | 2 +- src/nostalgia/modules/core/src/opengl/gfx.hpp | 2 +- .../src/studio/paletteeditor/paletteeditor-imgui.cpp | 2 +- .../src/studio/paletteeditor/paletteeditor-imgui.hpp | 2 +- .../core/src/studio/paletteeditor/paletteeditor.cpp | 2 +- .../core/src/studio/paletteeditor/paletteeditor.hpp | 2 +- .../modules/core/src/studio/studiomodule.cpp | 2 +- .../tilesheeteditor/commands/addsubsheetcommand.cpp | 2 +- .../tilesheeteditor/commands/addsubsheetcommand.hpp | 2 +- .../src/studio/tilesheeteditor/commands/commands.hpp | 2 +- .../tilesheeteditor/commands/cutpastecommand.cpp | 2 +- .../tilesheeteditor/commands/cutpastecommand.hpp | 2 +- .../tilesheeteditor/commands/deletetilescommand.cpp | 2 +- .../tilesheeteditor/commands/deletetilescommand.hpp | 2 +- .../studio/tilesheeteditor/commands/drawcommand.cpp | 2 +- .../studio/tilesheeteditor/commands/drawcommand.hpp | 2 +- .../tilesheeteditor/commands/inserttilescommand.cpp | 2 +- .../tilesheeteditor/commands/inserttilescommand.hpp | 2 +- .../tilesheeteditor/commands/palettechangecommand.cpp | 2 +- .../tilesheeteditor/commands/palettechangecommand.hpp | 2 +- .../tilesheeteditor/commands/rmsubsheetcommand.cpp | 2 +- .../tilesheeteditor/commands/rmsubsheetcommand.hpp | 2 +- .../commands/updatesubsheetcommand.cpp | 2 +- .../commands/updatesubsheetcommand.hpp | 2 +- .../studio/tilesheeteditor/tilesheeteditor-imgui.cpp | 9 +++++---- .../studio/tilesheeteditor/tilesheeteditor-imgui.hpp | 6 +++++- .../studio/tilesheeteditor/tilesheeteditormodel.cpp | 2 +- .../studio/tilesheeteditor/tilesheeteditormodel.hpp | 2 +- .../studio/tilesheeteditor/tilesheeteditorview.cpp | 2 +- .../studio/tilesheeteditor/tilesheeteditorview.hpp | 2 +- .../src/studio/tilesheeteditor/tilesheetpixelgrid.cpp | 2 +- .../src/studio/tilesheeteditor/tilesheetpixelgrid.hpp | 2 +- .../src/studio/tilesheeteditor/tilesheetpixels.cpp | 2 +- .../src/studio/tilesheeteditor/tilesheetpixels.hpp | 2 +- src/nostalgia/modules/core/src/tilesheet.cpp | 2 +- src/nostalgia/modules/core/test/tests.cpp | 2 +- src/nostalgia/modules/keelmodules.cpp | 2 +- src/nostalgia/modules/keelmodules.hpp | 2 +- .../scene/include/nostalgia/scene/keelmodule.hpp | 2 +- .../modules/scene/include/nostalgia/scene/scene.hpp | 2 +- .../scene/include/nostalgia/scene/scenestatic.hpp | 2 +- .../scene/include/nostalgia/scene/studiomodule.hpp | 2 +- src/nostalgia/modules/scene/src/keel/keelmodule.cpp | 2 +- src/nostalgia/modules/scene/src/keel/typeconv.cpp | 2 +- src/nostalgia/modules/scene/src/keel/typeconv.hpp | 2 +- src/nostalgia/modules/scene/src/scene.cpp | 2 +- src/nostalgia/modules/scene/src/scenestatic.cpp | 2 +- .../modules/scene/src/studio/sceneeditor-imgui.cpp | 2 +- .../modules/scene/src/studio/sceneeditor-imgui.hpp | 2 +- .../modules/scene/src/studio/sceneeditor.cpp | 2 +- .../modules/scene/src/studio/sceneeditor.hpp | 2 +- .../modules/scene/src/studio/sceneeditorview.cpp | 2 +- .../modules/scene/src/studio/sceneeditorview.hpp | 2 +- .../modules/scene/src/studio/studiomodule.cpp | 2 +- src/nostalgia/modules/studiomodules.cpp | 2 +- src/nostalgia/modules/studiomodules.hpp | 2 +- src/nostalgia/player/app.cpp | 2 +- src/nostalgia/player/app.hpp | 2 +- src/nostalgia/player/main.cpp | 2 +- src/nostalgia/studio/CMakeLists.txt | 5 +++++ src/olympic/applib/applib.cpp | 8 +++++++- src/olympic/keel/include/keel/asset.hpp | 2 +- src/olympic/keel/include/keel/assetmanager.hpp | 2 +- src/olympic/keel/include/keel/context.hpp | 2 +- src/olympic/keel/include/keel/keel.hpp | 2 +- src/olympic/keel/include/keel/media.hpp | 2 +- src/olympic/keel/include/keel/module.hpp | 2 +- src/olympic/keel/include/keel/pack.hpp | 8 ++++++-- src/olympic/keel/include/keel/typeconv.hpp | 2 +- src/olympic/keel/include/keel/typestore.hpp | 2 +- src/olympic/keel/src/asset.cpp | 2 +- src/olympic/keel/src/keel.cpp | 2 +- src/olympic/keel/src/media.cpp | 2 +- src/olympic/keel/src/module.cpp | 2 +- src/olympic/keel/src/pack-applib.cpp | 2 +- src/olympic/keel/src/pack.cpp | 8 ++++++-- src/olympic/keel/src/typeconv.cpp | 2 +- src/olympic/keel/src/typestore.cpp | 2 +- src/olympic/keel/test/tests.cpp | 2 +- .../studio/applib/include/studioapp/studioapp.hpp | 2 +- src/olympic/studio/applib/src/aboutpopup.cpp | 8 ++++++-- src/olympic/studio/applib/src/aboutpopup.hpp | 2 +- src/olympic/studio/applib/src/clawviewer.cpp | 2 +- src/olympic/studio/applib/src/clawviewer.hpp | 2 +- src/olympic/studio/applib/src/filedialogmanager.cpp | 2 +- src/olympic/studio/applib/src/filedialogmanager.hpp | 2 +- src/olympic/studio/applib/src/main.cpp | 11 ++++------- src/olympic/studio/applib/src/newmenu.cpp | 2 +- src/olympic/studio/applib/src/newmenu.hpp | 2 +- src/olympic/studio/applib/src/newproject.cpp | 2 +- src/olympic/studio/applib/src/newproject.hpp | 2 +- src/olympic/studio/applib/src/projectexplorer.cpp | 2 +- src/olympic/studio/applib/src/projectexplorer.hpp | 2 +- src/olympic/studio/applib/src/projecttreemodel.cpp | 2 +- src/olympic/studio/applib/src/projecttreemodel.hpp | 2 +- src/olympic/studio/applib/src/studioapp.cpp | 8 +++++--- src/olympic/studio/applib/src/studioapp.hpp | 2 +- src/olympic/studio/modlib/include/studio/configio.hpp | 2 +- src/olympic/studio/modlib/include/studio/context.hpp | 4 ++-- src/olympic/studio/modlib/include/studio/editor.hpp | 2 +- .../studio/modlib/include/studio/filedialog.hpp | 2 +- .../studio/modlib/include/studio/imguiuitl.hpp | 2 +- .../studio/modlib/include/studio/itemmaker.hpp | 2 +- src/olympic/studio/modlib/include/studio/module.hpp | 2 +- src/olympic/studio/modlib/include/studio/popup.hpp | 2 +- src/olympic/studio/modlib/include/studio/project.hpp | 10 +++++----- src/olympic/studio/modlib/include/studio/studio.hpp | 2 +- src/olympic/studio/modlib/include/studio/task.hpp | 2 +- .../studio/modlib/include/studio/undostack.hpp | 2 +- src/olympic/studio/modlib/include/studio/widget.hpp | 2 +- src/olympic/studio/modlib/src/configio.cpp | 2 +- src/olympic/studio/modlib/src/editor.cpp | 2 +- src/olympic/studio/modlib/src/filedialog_nfd.cpp | 2 +- src/olympic/studio/modlib/src/imguiutil.cpp | 2 +- src/olympic/studio/modlib/src/module.cpp | 2 +- src/olympic/studio/modlib/src/popup.cpp | 2 +- src/olympic/studio/modlib/src/project.cpp | 9 ++++++--- src/olympic/studio/modlib/src/task.cpp | 2 +- src/olympic/studio/modlib/src/undostack.cpp | 2 +- src/olympic/turbine/include/turbine/clipboard.hpp | 2 +- src/olympic/turbine/include/turbine/context.hpp | 2 +- src/olympic/turbine/include/turbine/event.hpp | 2 +- src/olympic/turbine/include/turbine/gfx.hpp | 2 +- src/olympic/turbine/include/turbine/input.hpp | 2 +- src/olympic/turbine/include/turbine/turbine.hpp | 2 +- src/olympic/turbine/src/gba/clipboard.cpp | 2 +- src/olympic/turbine/src/gba/config.hpp | 2 +- src/olympic/turbine/src/gba/context.cpp | 2 +- src/olympic/turbine/src/gba/context.hpp | 2 +- src/olympic/turbine/src/gba/event.cpp | 2 +- src/olympic/turbine/src/gba/gfx.cpp | 2 +- src/olympic/turbine/src/gba/irq.arm.cpp | 2 +- src/olympic/turbine/src/gba/irqstub.cpp | 2 +- src/olympic/turbine/src/gba/turbine.arm.cpp | 2 +- src/olympic/turbine/src/gba/turbine.cpp | 2 +- src/olympic/turbine/src/gba/turbine.hpp | 2 +- src/olympic/turbine/src/glfw/clipboard.cpp | 2 +- src/olympic/turbine/src/glfw/config.hpp | 2 +- src/olympic/turbine/src/glfw/context.cpp | 2 +- src/olympic/turbine/src/glfw/context.hpp | 2 +- src/olympic/turbine/src/glfw/event.cpp | 2 +- src/olympic/turbine/src/glfw/gfx.cpp | 2 +- src/olympic/turbine/src/glfw/turbine.cpp | 2 +- 312 files changed, 451 insertions(+), 375 deletions(-) create mode 100644 deps/glutils/.liccor.yml create mode 100644 deps/teagba/.liccor.yml diff --git a/.gitignore b/.gitignore index 0d81738..a68aa18 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .clangd .current_build .conanbuild +.idea .mypy_cache .stfolder .stignore diff --git a/README.md b/README.md index 4eaa751..eccb484 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ probably differ), install the following additional packages: * pkg-config * xorg-dev * libgtk-3-dev +* python3-mypy ## Build diff --git a/deps/glutils/.liccor.yml b/deps/glutils/.liccor.yml new file mode 100644 index 0000000..307325f --- /dev/null +++ b/deps/glutils/.liccor.yml @@ -0,0 +1,6 @@ +--- +source: +- include +- src +copyright_notice: |- + Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. diff --git a/deps/glutils/include/glutils/glutils.hpp b/deps/glutils/include/glutils/glutils.hpp index f431aa8..037c6b4 100644 --- a/deps/glutils/include/glutils/glutils.hpp +++ b/deps/glutils/include/glutils/glutils.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/deps/glutils/src/glutils.cpp b/deps/glutils/src/glutils.cpp index 82315a8..bd1ca0c 100644 --- a/deps/glutils/src/glutils.cpp +++ b/deps/glutils/src/glutils.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/deps/ox/src/ox/clargs/clargs.cpp b/deps/ox/src/ox/clargs/clargs.cpp index eae82a8..9acdecb 100644 --- a/deps/ox/src/ox/clargs/clargs.cpp +++ b/deps/ox/src/ox/clargs/clargs.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/clargs/clargs.hpp b/deps/ox/src/ox/clargs/clargs.hpp index 0294356..c38125d 100644 --- a/deps/ox/src/ox/clargs/clargs.hpp +++ b/deps/ox/src/ox/clargs/clargs.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/claw/claw.hpp b/deps/ox/src/ox/claw/claw.hpp index ee47795..7bed380 100644 --- a/deps/ox/src/ox/claw/claw.hpp +++ b/deps/ox/src/ox/claw/claw.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/claw/format.hpp b/deps/ox/src/ox/claw/format.hpp index 9e1cc3f..23dc345 100644 --- a/deps/ox/src/ox/claw/format.hpp +++ b/deps/ox/src/ox/claw/format.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/ox/claw/read.cpp index 3d2d834..2df7a1a 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/ox/claw/read.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -74,7 +74,10 @@ Result stripClawHeader(const ox::Buffer &buff) noexcept { Result readClaw(TypeStore &ts, const char *buff, std::size_t buffSz) noexcept { oxRequire(header, readClawHeader(buff, buffSz)); - oxRequire(t, ts.getLoad(header.typeName, header.typeVersion, header.typeParams)); + auto const [t, tdErr] = ts.getLoad(header.typeName, header.typeVersion, header.typeParams); + if (tdErr) { + return OxError(3, "Could not load type descriptor"); + } ModelObject obj; oxReturnError(obj.setType(t)); switch (header.fmt) { diff --git a/deps/ox/src/ox/claw/readclaw.cpp b/deps/ox/src/ox/claw/readclaw.cpp index 93f7a76..0186ccc 100644 --- a/deps/ox/src/ox/claw/readclaw.cpp +++ b/deps/ox/src/ox/claw/readclaw.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/claw/test/tests.cpp b/deps/ox/src/ox/claw/test/tests.cpp index bf0251b..bfcb833 100644 --- a/deps/ox/src/ox/claw/test/tests.cpp +++ b/deps/ox/src/ox/claw/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/write.cpp b/deps/ox/src/ox/claw/write.cpp index 8dde66e..7f8c26b 100644 --- a/deps/ox/src/ox/claw/write.cpp +++ b/deps/ox/src/ox/claw/write.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "write.hpp" diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/ox/claw/write.hpp index e1df4ef..e8ec3bf 100644 --- a/deps/ox/src/ox/claw/write.hpp +++ b/deps/ox/src/ox/claw/write.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/event/event.hpp b/deps/ox/src/ox/event/event.hpp index 348c259..d69433d 100644 --- a/deps/ox/src/ox/event/event.hpp +++ b/deps/ox/src/ox/event/event.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/event/signal.cpp b/deps/ox/src/ox/event/signal.cpp index f7fb201..3dee2f4 100644 --- a/deps/ox/src/ox/event/signal.cpp +++ b/deps/ox/src/ox/event/signal.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "signal.hpp" diff --git a/deps/ox/src/ox/event/signal.hpp b/deps/ox/src/ox/event/signal.hpp index 99828b2..8a543ac 100644 --- a/deps/ox/src/ox/event/signal.hpp +++ b/deps/ox/src/ox/event/signal.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/event/test/tests.cpp b/deps/ox/src/ox/event/test/tests.cpp index b04d02b..bee9b49 100644 --- a/deps/ox/src/ox/event/test/tests.cpp +++ b/deps/ox/src/ox/event/test/tests.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #undef NDEBUG diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp index da4361a..62522da 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "filestoretemplate.hpp" diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp index 1a2e258..6c00005 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/filesystem/directory.cpp b/deps/ox/src/ox/fs/filesystem/directory.cpp index 3436ba2..415e1e4 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.cpp +++ b/deps/ox/src/ox/fs/filesystem/directory.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "directory.hpp" diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/ox/fs/filesystem/directory.hpp index a692ebc..1040752 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.hpp +++ b/deps/ox/src/ox/fs/filesystem/directory.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/filesystem/filelocation.cpp b/deps/ox/src/ox/fs/filesystem/filelocation.cpp index 3dfb9f3..417b44d 100644 --- a/deps/ox/src/ox/fs/filesystem/filelocation.cpp +++ b/deps/ox/src/ox/fs/filesystem/filelocation.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.cpp b/deps/ox/src/ox/fs/filesystem/filesystem.cpp index 3558ad4..9a8dd29 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/ox/fs/filesystem/filesystem.hpp index 5f65c00..1c8538e 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp index 9893c03..d9cd254 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp index c7d2a17..51e9208 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp index 06e3e3a..d6edf19 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp +++ b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp index 353e708..1c0d5d0 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp +++ b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/filesystem/types.hpp b/deps/ox/src/ox/fs/filesystem/types.hpp index 53d2132..497cc4c 100644 --- a/deps/ox/src/ox/fs/filesystem/types.hpp +++ b/deps/ox/src/ox/fs/filesystem/types.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/fs.hpp b/deps/ox/src/ox/fs/fs.hpp index 677d043..df27f7e 100644 --- a/deps/ox/src/ox/fs/fs.hpp +++ b/deps/ox/src/ox/fs/fs.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp index 6db0fd9..c9bce57 100644 --- a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp +++ b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/ptrarith/ptr.hpp b/deps/ox/src/ox/fs/ptrarith/ptr.hpp index 3718e82..c09bab5 100644 --- a/deps/ox/src/ox/fs/ptrarith/ptr.hpp +++ b/deps/ox/src/ox/fs/ptrarith/ptr.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/fs/test/tests.cpp b/deps/ox/src/ox/fs/test/tests.cpp index ba2f8eb..be6fdb2 100644 --- a/deps/ox/src/ox/fs/test/tests.cpp +++ b/deps/ox/src/ox/fs/test/tests.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // make sure asserts are enabled for the test file diff --git a/deps/ox/src/ox/fs/tool.cpp b/deps/ox/src/ox/fs/tool.cpp index a63cec8..34fa0c5 100644 --- a/deps/ox/src/ox/fs/tool.cpp +++ b/deps/ox/src/ox/fs/tool.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/logconn/def.hpp b/deps/ox/src/ox/logconn/def.hpp index a7cbd0a..6fab40b 100644 --- a/deps/ox/src/ox/logconn/def.hpp +++ b/deps/ox/src/ox/logconn/def.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/logconn/logconn.cpp b/deps/ox/src/ox/logconn/logconn.cpp index b02ca82..9577cc4 100644 --- a/deps/ox/src/ox/logconn/logconn.cpp +++ b/deps/ox/src/ox/logconn/logconn.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/err.hpp b/deps/ox/src/ox/mc/err.hpp index 29dcddc..7f99b32 100644 --- a/deps/ox/src/ox/mc/err.hpp +++ b/deps/ox/src/ox/mc/err.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/mc/intops.hpp b/deps/ox/src/ox/mc/intops.hpp index 5256399..b9c6bd9 100644 --- a/deps/ox/src/ox/mc/intops.hpp +++ b/deps/ox/src/ox/mc/intops.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/mc/mc.hpp b/deps/ox/src/ox/mc/mc.hpp index 1a579f0..380f2e7 100644 --- a/deps/ox/src/ox/mc/mc.hpp +++ b/deps/ox/src/ox/mc/mc.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/mc/presenceindicator.cpp b/deps/ox/src/ox/mc/presenceindicator.cpp index 7bc7a01..09cb2d6 100644 --- a/deps/ox/src/ox/mc/presenceindicator.cpp +++ b/deps/ox/src/ox/mc/presenceindicator.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "err.hpp" diff --git a/deps/ox/src/ox/mc/presenceindicator.hpp b/deps/ox/src/ox/mc/presenceindicator.hpp index 6d7ee97..d946ad8 100644 --- a/deps/ox/src/ox/mc/presenceindicator.hpp +++ b/deps/ox/src/ox/mc/presenceindicator.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index 911807d..01e81b4 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/types.hpp b/deps/ox/src/ox/mc/types.hpp index 48f465d..0e69130 100644 --- a/deps/ox/src/ox/mc/types.hpp +++ b/deps/ox/src/ox/mc/types.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 9796859..8eb9480 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/descread.hpp b/deps/ox/src/ox/model/descread.hpp index 8006c06..2010f71 100644 --- a/deps/ox/src/ox/model/descread.hpp +++ b/deps/ox/src/ox/model/descread.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/model/desctypes.cpp b/deps/ox/src/ox/model/desctypes.cpp index 29c2391..ba0cc40 100644 --- a/deps/ox/src/ox/model/desctypes.cpp +++ b/deps/ox/src/ox/model/desctypes.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "desctypes.hpp" diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp index ddff59e..d60b810 100644 --- a/deps/ox/src/ox/model/descwrite.hpp +++ b/deps/ox/src/ox/model/descwrite.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/fieldcounter.hpp b/deps/ox/src/ox/model/fieldcounter.hpp index 9ea8bce..9477b83 100644 --- a/deps/ox/src/ox/model/fieldcounter.hpp +++ b/deps/ox/src/ox/model/fieldcounter.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/metadata.hpp b/deps/ox/src/ox/model/metadata.hpp index ac8ca63..9e228a5 100644 --- a/deps/ox/src/ox/model/metadata.hpp +++ b/deps/ox/src/ox/model/metadata.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/model/modelhandleradaptor.hpp b/deps/ox/src/ox/model/modelhandleradaptor.hpp index f1b084d..39f69d3 100644 --- a/deps/ox/src/ox/model/modelhandleradaptor.hpp +++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/modelops.hpp b/deps/ox/src/ox/model/modelops.hpp index f1e918c..1f8aca9 100644 --- a/deps/ox/src/ox/model/modelops.hpp +++ b/deps/ox/src/ox/model/modelops.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/ox/model/modelvalue.hpp index fd63c3a..8f3ec13 100644 --- a/deps/ox/src/ox/model/modelvalue.hpp +++ b/deps/ox/src/ox/model/modelvalue.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/test/tests.cpp b/deps/ox/src/ox/model/test/tests.cpp index 539a8f1..fbd50e6 100644 --- a/deps/ox/src/ox/model/test/tests.cpp +++ b/deps/ox/src/ox/model/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/typenamecatcher.hpp b/deps/ox/src/ox/model/typenamecatcher.hpp index 3f23572..d2b555d 100644 --- a/deps/ox/src/ox/model/typenamecatcher.hpp +++ b/deps/ox/src/ox/model/typenamecatcher.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/types.hpp b/deps/ox/src/ox/model/types.hpp index 323279b..85581ec 100644 --- a/deps/ox/src/ox/model/types.hpp +++ b/deps/ox/src/ox/model/types.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/walk.hpp b/deps/ox/src/ox/model/walk.hpp index 3939e8b..386e5cc 100644 --- a/deps/ox/src/ox/model/walk.hpp +++ b/deps/ox/src/ox/model/walk.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/oc/oc.hpp b/deps/ox/src/ox/oc/oc.hpp index ee47795..7bed380 100644 --- a/deps/ox/src/ox/oc/oc.hpp +++ b/deps/ox/src/ox/oc/oc.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp index 812da10..5c16ff7 100644 --- a/deps/ox/src/ox/oc/read.hpp +++ b/deps/ox/src/ox/oc/read.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/test/tests.cpp b/deps/ox/src/ox/oc/test/tests.cpp index d0a1e5d..0c98ae7 100644 --- a/deps/ox/src/ox/oc/test/tests.cpp +++ b/deps/ox/src/ox/oc/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/ox/oc/write.hpp index c2cf9de..a6a1103 100644 --- a/deps/ox/src/ox/oc/write.hpp +++ b/deps/ox/src/ox/oc/write.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/alignmentcatcher.hpp b/deps/ox/src/ox/preloader/alignmentcatcher.hpp index d6756f7..fdbe0b1 100644 --- a/deps/ox/src/ox/preloader/alignmentcatcher.hpp +++ b/deps/ox/src/ox/preloader/alignmentcatcher.hpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/preloader/platspecs.hpp b/deps/ox/src/ox/preloader/platspecs.hpp index 805df0d..e48001b 100644 --- a/deps/ox/src/ox/preloader/platspecs.hpp +++ b/deps/ox/src/ox/preloader/platspecs.hpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/preloader/preloader.cpp b/deps/ox/src/ox/preloader/preloader.cpp index e9cf68e..2b90312 100644 --- a/deps/ox/src/ox/preloader/preloader.cpp +++ b/deps/ox/src/ox/preloader/preloader.cpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "preloader.hpp" diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index 8bebd93..909b8c8 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/preloader/sizecatcher.hpp b/deps/ox/src/ox/preloader/sizecatcher.hpp index 132c983..1164ff5 100644 --- a/deps/ox/src/ox/preloader/sizecatcher.hpp +++ b/deps/ox/src/ox/preloader/sizecatcher.hpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/preloader/unionsizecatcher.hpp b/deps/ox/src/ox/preloader/unionsizecatcher.hpp index 5a9c767..40b9dff 100644 --- a/deps/ox/src/ox/preloader/unionsizecatcher.hpp +++ b/deps/ox/src/ox/preloader/unionsizecatcher.hpp @@ -1,5 +1,9 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2015 - 2022 gary@drinkingtea.net + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/algorithm.hpp b/deps/ox/src/ox/std/algorithm.hpp index f4ae777..a971e43 100644 --- a/deps/ox/src/ox/std/algorithm.hpp +++ b/deps/ox/src/ox/std/algorithm.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/array.hpp b/deps/ox/src/ox/std/array.hpp index 1e0cc46..b18efc2 100644 --- a/deps/ox/src/ox/std/array.hpp +++ b/deps/ox/src/ox/std/array.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/assert.cpp b/deps/ox/src/ox/std/assert.cpp index 32bae40..09c405b 100644 --- a/deps/ox/src/ox/std/assert.cpp +++ b/deps/ox/src/ox/std/assert.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "stacktrace.hpp" diff --git a/deps/ox/src/ox/std/assert.hpp b/deps/ox/src/ox/std/assert.hpp index bacdede..6f62d42 100644 --- a/deps/ox/src/ox/std/assert.hpp +++ b/deps/ox/src/ox/std/assert.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/basestringview.hpp b/deps/ox/src/ox/std/basestringview.hpp index 241fec6..e4ed55c 100644 --- a/deps/ox/src/ox/std/basestringview.hpp +++ b/deps/ox/src/ox/std/basestringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/bit.cpp b/deps/ox/src/ox/std/bit.cpp index 5af893f..7dcffa1 100644 --- a/deps/ox/src/ox/std/bit.cpp +++ b/deps/ox/src/ox/std/bit.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "bit.hpp" diff --git a/deps/ox/src/ox/std/bit.hpp b/deps/ox/src/ox/std/bit.hpp index c83f6db..d8be957 100644 --- a/deps/ox/src/ox/std/bit.hpp +++ b/deps/ox/src/ox/std/bit.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/bounds.hpp b/deps/ox/src/ox/std/bounds.hpp index df52a9a..21ff361 100644 --- a/deps/ox/src/ox/std/bounds.hpp +++ b/deps/ox/src/ox/std/bounds.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/bstring.hpp b/deps/ox/src/ox/std/bstring.hpp index a228e3d..1dd5ada 100644 --- a/deps/ox/src/ox/std/bstring.hpp +++ b/deps/ox/src/ox/std/bstring.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/buffer.cpp b/deps/ox/src/ox/std/buffer.cpp index 75309fd..35a1772 100644 --- a/deps/ox/src/ox/std/buffer.cpp +++ b/deps/ox/src/ox/std/buffer.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "error.hpp" diff --git a/deps/ox/src/ox/std/buffer.hpp b/deps/ox/src/ox/std/buffer.hpp index b6a9d8e..2753c82 100644 --- a/deps/ox/src/ox/std/buffer.hpp +++ b/deps/ox/src/ox/std/buffer.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/buildinfo.cpp b/deps/ox/src/ox/std/buildinfo.cpp index d0f0169..4db04b4 100644 --- a/deps/ox/src/ox/std/buildinfo.cpp +++ b/deps/ox/src/ox/std/buildinfo.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ namespace ox::buildinfo { diff --git a/deps/ox/src/ox/std/buildinfo.hpp b/deps/ox/src/ox/std/buildinfo.hpp index adbc5ce..a003f1e 100644 --- a/deps/ox/src/ox/std/buildinfo.hpp +++ b/deps/ox/src/ox/std/buildinfo.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ namespace ox::buildinfo { diff --git a/deps/ox/src/ox/std/byteswap.cpp b/deps/ox/src/ox/std/byteswap.cpp index 6584324..f3074cb 100644 --- a/deps/ox/src/ox/std/byteswap.cpp +++ b/deps/ox/src/ox/std/byteswap.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "byteswap.hpp" diff --git a/deps/ox/src/ox/std/byteswap.hpp b/deps/ox/src/ox/std/byteswap.hpp index 980eb1f..9f3c8a9 100644 --- a/deps/ox/src/ox/std/byteswap.hpp +++ b/deps/ox/src/ox/std/byteswap.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/cstringview.hpp b/deps/ox/src/ox/std/cstringview.hpp index 75ed81d..fd94ba4 100644 --- a/deps/ox/src/ox/std/cstringview.hpp +++ b/deps/ox/src/ox/std/cstringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/cstrops.hpp b/deps/ox/src/ox/std/cstrops.hpp index 171eea4..d0d26ff 100644 --- a/deps/ox/src/ox/std/cstrops.hpp +++ b/deps/ox/src/ox/std/cstrops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/def.hpp b/deps/ox/src/ox/std/def.hpp index 403c96a..007cf06 100644 --- a/deps/ox/src/ox/std/def.hpp +++ b/deps/ox/src/ox/std/def.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/defer.hpp b/deps/ox/src/ox/std/defer.hpp index e2775ea..ab02903 100644 --- a/deps/ox/src/ox/std/defer.hpp +++ b/deps/ox/src/ox/std/defer.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/defines.hpp b/deps/ox/src/ox/std/defines.hpp index 16108d7..27467be 100644 --- a/deps/ox/src/ox/std/defines.hpp +++ b/deps/ox/src/ox/std/defines.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index 49da498..978f107 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/fmt.cpp b/deps/ox/src/ox/std/fmt.cpp index 8168618..5060263 100644 --- a/deps/ox/src/ox/std/fmt.cpp +++ b/deps/ox/src/ox/std/fmt.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "fmt.hpp" diff --git a/deps/ox/src/ox/std/fmt.hpp b/deps/ox/src/ox/std/fmt.hpp index 7c2651c..a371704 100644 --- a/deps/ox/src/ox/std/fmt.hpp +++ b/deps/ox/src/ox/std/fmt.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/hardware.hpp b/deps/ox/src/ox/std/hardware.hpp index d16b9a1..5c9639b 100644 --- a/deps/ox/src/ox/std/hardware.hpp +++ b/deps/ox/src/ox/std/hardware.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/hashmap.hpp b/deps/ox/src/ox/std/hashmap.hpp index a8346bc..868f5ae 100644 --- a/deps/ox/src/ox/std/hashmap.hpp +++ b/deps/ox/src/ox/std/hashmap.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/heapmgr.cpp b/deps/ox/src/ox/std/heapmgr.cpp index 7226ed9..623b9e7 100644 --- a/deps/ox/src/ox/std/heapmgr.cpp +++ b/deps/ox/src/ox/std/heapmgr.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "assert.hpp" diff --git a/deps/ox/src/ox/std/heapmgr.hpp b/deps/ox/src/ox/std/heapmgr.hpp index d8c2443..5bbb4e4 100644 --- a/deps/ox/src/ox/std/heapmgr.hpp +++ b/deps/ox/src/ox/std/heapmgr.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "types.hpp" diff --git a/deps/ox/src/ox/std/initializerlist.hpp b/deps/ox/src/ox/std/initializerlist.hpp index 8c1b420..04e1a8f 100644 --- a/deps/ox/src/ox/std/initializerlist.hpp +++ b/deps/ox/src/ox/std/initializerlist.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/iterator.hpp b/deps/ox/src/ox/std/iterator.hpp index 4a32d45..ec7126c 100644 --- a/deps/ox/src/ox/std/iterator.hpp +++ b/deps/ox/src/ox/std/iterator.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/math.cpp b/deps/ox/src/ox/std/math.cpp index ca4d2bb..3313ffa 100644 --- a/deps/ox/src/ox/std/math.cpp +++ b/deps/ox/src/ox/std/math.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "math.hpp" diff --git a/deps/ox/src/ox/std/math.hpp b/deps/ox/src/ox/std/math.hpp index be15840..b18d641 100644 --- a/deps/ox/src/ox/std/math.hpp +++ b/deps/ox/src/ox/std/math.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/memops.cpp b/deps/ox/src/ox/std/memops.cpp index b888fe2..16c71ca 100644 --- a/deps/ox/src/ox/std/memops.cpp +++ b/deps/ox/src/ox/std/memops.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "types.hpp" diff --git a/deps/ox/src/ox/std/memops.hpp b/deps/ox/src/ox/std/memops.hpp index d8916df..56bd7d1 100644 --- a/deps/ox/src/ox/std/memops.hpp +++ b/deps/ox/src/ox/std/memops.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/ox/std/memory.hpp index a9374f9..4e751f3 100644 --- a/deps/ox/src/ox/std/memory.hpp +++ b/deps/ox/src/ox/std/memory.hpp @@ -39,6 +39,7 @@ constexpr T *construct_at(T *p, Args &&...args ) { #endif +#include "error.hpp" #include "utility.hpp" @@ -290,4 +291,14 @@ constexpr auto make_unique(Args&&... args) { return UniquePtr(new T(ox::forward(args)...)); } +template +[[nodiscard]] +constexpr Result> make_unique_catch(Args&&... args) noexcept { + try { + return UniquePtr(new T(ox::forward(args)...)); + } catch (ox::Exception const&ex) { + return ex.toError(); + } +} + } diff --git a/deps/ox/src/ox/std/point.hpp b/deps/ox/src/ox/std/point.hpp index 14f3a29..a4cad8e 100644 --- a/deps/ox/src/ox/std/point.hpp +++ b/deps/ox/src/ox/std/point.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/random.cpp b/deps/ox/src/ox/std/random.cpp index 22136ab..d573686 100644 --- a/deps/ox/src/ox/std/random.cpp +++ b/deps/ox/src/ox/std/random.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "bit.hpp" diff --git a/deps/ox/src/ox/std/random.hpp b/deps/ox/src/ox/std/random.hpp index a43ba0c..7a1eeae 100644 --- a/deps/ox/src/ox/std/random.hpp +++ b/deps/ox/src/ox/std/random.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/range.hpp b/deps/ox/src/ox/std/range.hpp index 279321d..717fae5 100644 --- a/deps/ox/src/ox/std/range.hpp +++ b/deps/ox/src/ox/std/range.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/ranges.hpp b/deps/ox/src/ox/std/ranges.hpp index 5b2f6bd..dfab656 100644 --- a/deps/ox/src/ox/std/ranges.hpp +++ b/deps/ox/src/ox/std/ranges.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/reader.cpp b/deps/ox/src/ox/std/reader.cpp index 0b4e78c..f650a19 100644 --- a/deps/ox/src/ox/std/reader.cpp +++ b/deps/ox/src/ox/std/reader.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ diff --git a/deps/ox/src/ox/std/reader.hpp b/deps/ox/src/ox/std/reader.hpp index 5915b28..3eacb8f 100644 --- a/deps/ox/src/ox/std/reader.hpp +++ b/deps/ox/src/ox/std/reader.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/realstd.hpp b/deps/ox/src/ox/std/realstd.hpp index 9d91632..d4441a5 100644 --- a/deps/ox/src/ox/std/realstd.hpp +++ b/deps/ox/src/ox/std/realstd.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/serialize.hpp b/deps/ox/src/ox/std/serialize.hpp index d4ee43f..ca68ba0 100644 --- a/deps/ox/src/ox/std/serialize.hpp +++ b/deps/ox/src/ox/std/serialize.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/size.hpp b/deps/ox/src/ox/std/size.hpp index e4c4025..e6ad409 100644 --- a/deps/ox/src/ox/std/size.hpp +++ b/deps/ox/src/ox/std/size.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/span.hpp b/deps/ox/src/ox/std/span.hpp index f58edc4..1d0af4f 100644 --- a/deps/ox/src/ox/std/span.hpp +++ b/deps/ox/src/ox/std/span.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/stacktrace.cpp b/deps/ox/src/ox/std/stacktrace.cpp index f9a1f38..0b7a2a6 100644 --- a/deps/ox/src/ox/std/stacktrace.cpp +++ b/deps/ox/src/ox/std/stacktrace.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #if defined(OX_USE_STDLIB) && __has_include() diff --git a/deps/ox/src/ox/std/stacktrace.hpp b/deps/ox/src/ox/std/stacktrace.hpp index 97bd79c..ec49c55 100644 --- a/deps/ox/src/ox/std/stacktrace.hpp +++ b/deps/ox/src/ox/std/stacktrace.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/stddef.hpp b/deps/ox/src/ox/std/stddef.hpp index 3f96954..cd9041c 100644 --- a/deps/ox/src/ox/std/stddef.hpp +++ b/deps/ox/src/ox/std/stddef.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/string.cpp b/deps/ox/src/ox/std/string.cpp index d80b1a5..dc44f41 100644 --- a/deps/ox/src/ox/std/string.cpp +++ b/deps/ox/src/ox/std/string.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "string.hpp" diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp index df9c759..772932d 100644 --- a/deps/ox/src/ox/std/string.hpp +++ b/deps/ox/src/ox/std/string.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stringview.hpp b/deps/ox/src/ox/std/stringview.hpp index 22a269f..46ff5b4 100644 --- a/deps/ox/src/ox/std/stringview.hpp +++ b/deps/ox/src/ox/std/stringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/strongint.hpp b/deps/ox/src/ox/std/strongint.hpp index 83359b7..a7c8593 100644 --- a/deps/ox/src/ox/std/strongint.hpp +++ b/deps/ox/src/ox/std/strongint.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/strops.cpp b/deps/ox/src/ox/std/strops.cpp index dd9fea5..532c3bf 100644 --- a/deps/ox/src/ox/std/strops.cpp +++ b/deps/ox/src/ox/std/strops.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "strops.hpp" diff --git a/deps/ox/src/ox/std/strops.hpp b/deps/ox/src/ox/std/strops.hpp index b1d6031..3528dda 100644 --- a/deps/ox/src/ox/std/strops.hpp +++ b/deps/ox/src/ox/std/strops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/substitutes.cpp b/deps/ox/src/ox/std/substitutes.cpp index 4a8a418..3c5ff19 100644 --- a/deps/ox/src/ox/std/substitutes.cpp +++ b/deps/ox/src/ox/std/substitutes.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #ifndef OX_USE_STDLIB diff --git a/deps/ox/src/ox/std/test/tests.cpp b/deps/ox/src/ox/std/test/tests.cpp index a394fef..b04ddf3 100644 --- a/deps/ox/src/ox/std/test/tests.cpp +++ b/deps/ox/src/ox/std/test/tests.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #undef NDEBUG diff --git a/deps/ox/src/ox/std/trace.cpp b/deps/ox/src/ox/std/trace.cpp index e991021..8354cf1 100644 --- a/deps/ox/src/ox/std/trace.cpp +++ b/deps/ox/src/ox/std/trace.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "trace.hpp" diff --git a/deps/ox/src/ox/std/trace.hpp b/deps/ox/src/ox/std/trace.hpp index 36823bd..6409ec7 100644 --- a/deps/ox/src/ox/std/trace.hpp +++ b/deps/ox/src/ox/std/trace.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/tracehook.cpp b/deps/ox/src/ox/std/tracehook.cpp index 6f7a989..7498954 100644 --- a/deps/ox/src/ox/std/tracehook.cpp +++ b/deps/ox/src/ox/std/tracehook.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #if defined(OX_USE_STDLIB) diff --git a/deps/ox/src/ox/std/typeinfo.hpp b/deps/ox/src/ox/std/typeinfo.hpp index 837e9eb..edfb6f7 100644 --- a/deps/ox/src/ox/std/typeinfo.hpp +++ b/deps/ox/src/ox/std/typeinfo.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/types.hpp b/deps/ox/src/ox/std/types.hpp index 0eba4f0..2361565 100644 --- a/deps/ox/src/ox/std/types.hpp +++ b/deps/ox/src/ox/std/types.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/typetraits.cpp b/deps/ox/src/ox/std/typetraits.cpp index 9f38a79..9fe9208 100644 --- a/deps/ox/src/ox/std/typetraits.cpp +++ b/deps/ox/src/ox/std/typetraits.cpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "typetraits.hpp" diff --git a/deps/ox/src/ox/std/units.hpp b/deps/ox/src/ox/std/units.hpp index 76ba2ed..1458a1c 100644 --- a/deps/ox/src/ox/std/units.hpp +++ b/deps/ox/src/ox/std/units.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/utility.hpp b/deps/ox/src/ox/std/utility.hpp index 1527261..42158c4 100644 --- a/deps/ox/src/ox/std/utility.hpp +++ b/deps/ox/src/ox/std/utility.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/uuid.cpp b/deps/ox/src/ox/std/uuid.cpp index 0978bcc..d52178f 100644 --- a/deps/ox/src/ox/std/uuid.cpp +++ b/deps/ox/src/ox/std/uuid.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "uuid.hpp" diff --git a/deps/ox/src/ox/std/uuid.hpp b/deps/ox/src/ox/std/uuid.hpp index 5374588..26fdccd 100644 --- a/deps/ox/src/ox/std/uuid.hpp +++ b/deps/ox/src/ox/std/uuid.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/vec.cpp b/deps/ox/src/ox/std/vec.cpp index dc3993a..d536966 100644 --- a/deps/ox/src/ox/std/vec.cpp +++ b/deps/ox/src/ox/std/vec.cpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #include diff --git a/deps/ox/src/ox/std/vec.hpp b/deps/ox/src/ox/std/vec.hpp index 3d92a26..35ecad9 100644 --- a/deps/ox/src/ox/std/vec.hpp +++ b/deps/ox/src/ox/std/vec.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/ox/std/vector.hpp index ab9feba..2bb6008 100644 --- a/deps/ox/src/ox/std/vector.hpp +++ b/deps/ox/src/ox/std/vector.hpp @@ -1,9 +1,9 @@ /* - * Copyright 2015 - 2023 gary@drinkingtea.net + * Copyright 2015 - 2022 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/ox/src/ox/std/writer.hpp b/deps/ox/src/ox/std/writer.hpp index df73b2c..18a4483 100644 --- a/deps/ox/src/ox/std/writer.hpp +++ b/deps/ox/src/ox/std/writer.hpp @@ -3,7 +3,7 @@ * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #pragma once diff --git a/deps/teagba/.liccor.yml b/deps/teagba/.liccor.yml new file mode 100644 index 0000000..307325f --- /dev/null +++ b/deps/teagba/.liccor.yml @@ -0,0 +1,6 @@ +--- +source: +- include +- src +copyright_notice: |- + Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. diff --git a/deps/teagba/include/teagba/addresses.hpp b/deps/teagba/include/teagba/addresses.hpp index bfeff54..7a19f86 100644 --- a/deps/teagba/include/teagba/addresses.hpp +++ b/deps/teagba/include/teagba/addresses.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/deps/teagba/include/teagba/bios.hpp b/deps/teagba/include/teagba/bios.hpp index a34f767..6297c0b 100644 --- a/deps/teagba/include/teagba/bios.hpp +++ b/deps/teagba/include/teagba/bios.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/deps/teagba/include/teagba/gfx.hpp b/deps/teagba/include/teagba/gfx.hpp index 530eeac..e339803 100644 --- a/deps/teagba/include/teagba/gfx.hpp +++ b/deps/teagba/include/teagba/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/deps/teagba/include/teagba/irq.hpp b/deps/teagba/include/teagba/irq.hpp index c697dbd..efcdc1e 100644 --- a/deps/teagba/include/teagba/irq.hpp +++ b/deps/teagba/include/teagba/irq.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/deps/teagba/include/teagba/registers.hpp b/deps/teagba/include/teagba/registers.hpp index a807165..efe3691 100644 --- a/deps/teagba/include/teagba/registers.hpp +++ b/deps/teagba/include/teagba/registers.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/deps/teagba/src/bios_stub.cpp b/deps/teagba/src/bios_stub.cpp index a1434b9..060c5c3 100644 --- a/deps/teagba/src/bios_stub.cpp +++ b/deps/teagba/src/bios_stub.cpp @@ -1,9 +1,5 @@ /* - * Copyright 2016 - 2023 gary@drinkingtea.net - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ // stubs for building TeaGBA for PC targets, for purposes of not having to diff --git a/deps/teagba/src/cstartup.cpp b/deps/teagba/src/cstartup.cpp index b9e3f98..ea4a62c 100644 --- a/deps/teagba/src/cstartup.cpp +++ b/deps/teagba/src/cstartup.cpp @@ -1,9 +1,5 @@ /* - * Copyright 2016 - 2023 gary@drinkingtea.net - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/deps/teagba/src/gfx.cpp b/deps/teagba/src/gfx.cpp index 3c89bbc..0dc80c4 100644 --- a/deps/teagba/src/gfx.cpp +++ b/deps/teagba/src/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/scripts/pkg-gba.py b/scripts/pkg-gba.py index 7234f61..f47c70f 100755 --- a/scripts/pkg-gba.py +++ b/scripts/pkg-gba.py @@ -18,8 +18,10 @@ arch = platform.machine() host_env = f'{os}-{arch}' # get current build type -with open(".current_build","r") as f: +with open(".current_build", "r") as f: current_build = f.readlines()[0] +if current_build[len(current_build) - 1] == '\n': + current_build = current_build[:len(current_build) - 1] project_dir = sys.argv[1] project_name = sys.argv[2] diff --git a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp index ebceb85..b780672 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp index eb88475..288c76a 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp index 2702412..1c21992 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/core.hpp b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp index 2bcb1da..3c91563 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/core.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp b/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp index 3c8a45c..b2b902b 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp b/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp index 7013855..c4770c7 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp index fb692b7..ee5b34f 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp index d8d03a6..b9a1370 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp b/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp index 8157d34..4b8eda4 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp index c14b11c..3f182fa 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp index e556423..bad7451 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/gba/context.cpp b/src/nostalgia/modules/core/src/gba/context.cpp index eefa51f..e156239 100644 --- a/src/nostalgia/modules/core/src/gba/context.cpp +++ b/src/nostalgia/modules/core/src/gba/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/gba/context.hpp b/src/nostalgia/modules/core/src/gba/context.hpp index 18449e4..23329da 100644 --- a/src/nostalgia/modules/core/src/gba/context.hpp +++ b/src/nostalgia/modules/core/src/gba/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/gba/gfx.cpp b/src/nostalgia/modules/core/src/gba/gfx.cpp index ec0153e..3c2a804 100644 --- a/src/nostalgia/modules/core/src/gba/gfx.cpp +++ b/src/nostalgia/modules/core/src/gba/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/gba/gfx.hpp b/src/nostalgia/modules/core/src/gba/gfx.hpp index d04be27..d4d8cf4 100644 --- a/src/nostalgia/modules/core/src/gba/gfx.hpp +++ b/src/nostalgia/modules/core/src/gba/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/gba/panic.cpp b/src/nostalgia/modules/core/src/gba/panic.cpp index 1b0b36b..d5c5537 100644 --- a/src/nostalgia/modules/core/src/gba/panic.cpp +++ b/src/nostalgia/modules/core/src/gba/panic.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ diff --git a/src/nostalgia/modules/core/src/gfx.cpp b/src/nostalgia/modules/core/src/gfx.cpp index 2628e96..2b85f80 100644 --- a/src/nostalgia/modules/core/src/gfx.cpp +++ b/src/nostalgia/modules/core/src/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index a91d0e5..8e71dbd 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/keel/typeconv.cpp b/src/nostalgia/modules/core/src/keel/typeconv.cpp index 9f4aefe..5c8dde7 100644 --- a/src/nostalgia/modules/core/src/keel/typeconv.cpp +++ b/src/nostalgia/modules/core/src/keel/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "typeconv.hpp" diff --git a/src/nostalgia/modules/core/src/keel/typeconv.hpp b/src/nostalgia/modules/core/src/keel/typeconv.hpp index d47e25f..7e7e978 100644 --- a/src/nostalgia/modules/core/src/keel/typeconv.hpp +++ b/src/nostalgia/modules/core/src/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/opengl/context.cpp b/src/nostalgia/modules/core/src/opengl/context.cpp index ecf2053..b4c3bed 100644 --- a/src/nostalgia/modules/core/src/opengl/context.cpp +++ b/src/nostalgia/modules/core/src/opengl/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "context.hpp" diff --git a/src/nostalgia/modules/core/src/opengl/context.hpp b/src/nostalgia/modules/core/src/opengl/context.hpp index e6727c8..1424a79 100644 --- a/src/nostalgia/modules/core/src/opengl/context.hpp +++ b/src/nostalgia/modules/core/src/opengl/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/opengl/gfx.cpp b/src/nostalgia/modules/core/src/opengl/gfx.cpp index 1900517..97f3e3d 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/opengl/gfx.hpp b/src/nostalgia/modules/core/src/opengl/gfx.hpp index 2e248ec..0fefa6f 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.hpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp index 0e4e57c..d6dba69 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp index ebe1c1a..b1b07be 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp index 299804b..6f3cc38 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "paletteeditor.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp index 43bced8..7519adf 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/studiomodule.cpp b/src/nostalgia/modules/core/src/studio/studiomodule.cpp index c735033..6f3d8b7 100644 --- a/src/nostalgia/modules/core/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/core/src/studio/studiomodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp index fdaa777..c567973 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "addsubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp index 366d33e..2f1cdb9 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp index d6418c6..77dbf35 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp index cee911b..2158292 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "cutpastecommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp index fc19af8..af72f09 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp index 57af043..96a0bc2 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "deletetilescommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp index 9ba1efe..d692b9f 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp index ea155ea..7af1bed 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "drawcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp index 5ef0b2e..7ac8e5d 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp index ac0083a..e8e11c1 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "inserttilescommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp index 77270b6..d0ea74e 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp index 4318b1f..7c41bb4 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "palettechangecommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp index d75213f..e94a2f5 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp index afd3534..a0c0a8c 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "rmsubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp index 915b2cb..d27de89 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp index 93e2c74..2083653 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "updatesubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp index 385439c..1ba917d 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp index 9d2ff65..e5249d4 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -109,8 +109,9 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key key, bool down) { m_subsheetEditor.close(); m_exportMenu.close(); } - auto pal = m_model.pal(); - if (pal) { + auto const popupOpen = m_subsheetEditor.isOpen() && m_exportMenu.isOpen(); + auto const pal = m_model.pal(); + if (pal && !popupOpen) { const auto colorCnt = pal->colors.size(); if (key == turbine::Key::Alpha_D) { m_tool = Tool::Draw; @@ -496,7 +497,7 @@ void TileSheetEditorImGui::ExportMenu::draw() noexcept { ImGui::SetNextWindowSize(ImVec2(235, popupHeight)); if (ImGui::BeginPopupModal(popupName, &m_show, modalFlags)) { ImGui::InputInt("Scale", &m_scale); - m_scale = ox::clamp(m_scale, 1, 20); + m_scale = ox::clamp(m_scale, 1, 50); if (ImGui::Button("OK", ImVec2{50, 20})) { ImGui::CloseCurrentPopup(); m_show = false; diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp index de35406..2670ab3 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once @@ -41,6 +41,8 @@ class TileSheetEditorImGui: public studio::Editor { } void draw() noexcept; void close() noexcept; + [[nodiscard]] + inline bool isOpen() const noexcept { return m_show; } }; class ExportMenu { int m_scale = 0; @@ -53,6 +55,8 @@ class TileSheetEditorImGui: public studio::Editor { } void draw() noexcept; void close() noexcept; + [[nodiscard]] + inline bool isOpen() const noexcept { return m_show; } }; std::size_t m_selectedPaletteIdx = 0; turbine::Context &m_ctx; diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp index 51d1e2c..3e733e4 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp index 6975926..72e24bf 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp index 5e6abb4..7053b1f 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp index dbd6e28..94f9e46 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp index 2760247..42f5fc9 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp index 96901d1..1c7a8ed 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp index 8bf018b..8c218e9 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp index 7725462..9e1e054 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/tilesheet.cpp b/src/nostalgia/modules/core/src/tilesheet.cpp index 91048e7..21edc35 100644 --- a/src/nostalgia/modules/core/src/tilesheet.cpp +++ b/src/nostalgia/modules/core/src/tilesheet.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/test/tests.cpp b/src/nostalgia/modules/core/test/tests.cpp index e91f4a4..0a8bbd5 100644 --- a/src/nostalgia/modules/core/test/tests.cpp +++ b/src/nostalgia/modules/core/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #undef NDEBUG diff --git a/src/nostalgia/modules/keelmodules.cpp b/src/nostalgia/modules/keelmodules.cpp index b1fcbf2..15901fa 100644 --- a/src/nostalgia/modules/keelmodules.cpp +++ b/src/nostalgia/modules/keelmodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/keelmodules.hpp b/src/nostalgia/modules/keelmodules.hpp index 6c8ea01..0247ed2 100644 --- a/src/nostalgia/modules/keelmodules.hpp +++ b/src/nostalgia/modules/keelmodules.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp index 8e1c46c..2404e9e 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp index ccc29d2..8555dda 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp index 5f09ac4..f3c9df5 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp index 3fb77e7..6eeed6f 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp index 2209a56..ec542fb 100644 --- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/keel/typeconv.cpp b/src/nostalgia/modules/scene/src/keel/typeconv.cpp index 0eae97c..ac1e4d1 100644 --- a/src/nostalgia/modules/scene/src/keel/typeconv.cpp +++ b/src/nostalgia/modules/scene/src/keel/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/keel/typeconv.hpp b/src/nostalgia/modules/scene/src/keel/typeconv.hpp index 9422d7e..b6fe8d8 100644 --- a/src/nostalgia/modules/scene/src/keel/typeconv.hpp +++ b/src/nostalgia/modules/scene/src/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/scene.cpp b/src/nostalgia/modules/scene/src/scene.cpp index 877858c..b0d87bd 100644 --- a/src/nostalgia/modules/scene/src/scene.cpp +++ b/src/nostalgia/modules/scene/src/scene.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/scenestatic.cpp b/src/nostalgia/modules/scene/src/scenestatic.cpp index 3e987a3..fc29860 100644 --- a/src/nostalgia/modules/scene/src/scenestatic.cpp +++ b/src/nostalgia/modules/scene/src/scenestatic.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp index 4d33fba..1b494fe 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp index 69f1f7c..016805f 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp index 3aea579..6b15bb9 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp index 7a0e5f1..3843893 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp index 12da3d0..fabba29 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp index b946066..276839f 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp index 2f1d6ca..b1eedf6 100644 --- a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/studiomodules.cpp b/src/nostalgia/modules/studiomodules.cpp index ab8b293..c9c78df 100644 --- a/src/nostalgia/modules/studiomodules.cpp +++ b/src/nostalgia/modules/studiomodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/studiomodules.hpp b/src/nostalgia/modules/studiomodules.hpp index 86328df..3f4bb72 100644 --- a/src/nostalgia/modules/studiomodules.hpp +++ b/src/nostalgia/modules/studiomodules.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp index da4a6ad..8c73f7f 100644 --- a/src/nostalgia/player/app.cpp +++ b/src/nostalgia/player/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/player/app.hpp b/src/nostalgia/player/app.hpp index aef946a..04e73a5 100644 --- a/src/nostalgia/player/app.hpp +++ b/src/nostalgia/player/app.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/player/main.cpp b/src/nostalgia/player/main.cpp index 7f34b53..8cba068 100644 --- a/src/nostalgia/player/main.cpp +++ b/src/nostalgia/player/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index fcfefad..6f21a60 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -9,6 +9,11 @@ target_link_libraries( OlympicApplib ) +target_compile_definitions( + NostalgiaStudio PUBLIC + OLYMPIC_APP_VERSION="dev build" +) + install( TARGETS NostalgiaStudio diff --git a/src/olympic/applib/applib.cpp b/src/olympic/applib/applib.cpp index 25b1cdf..ee6057e 100644 --- a/src/olympic/applib/applib.cpp +++ b/src/olympic/applib/applib.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -13,6 +13,10 @@ #define OLYMPIC_APP_NAME "App" #endif +#ifndef OLYMPIC_APP_VERSION +#define OLYMPIC_APP_VERSION "dev build" +#endif + #ifndef OLYMPIC_PROJECT_NAMESPACE #define OLYMPIC_PROJECT_NAMESPACE project #endif @@ -31,6 +35,8 @@ namespace olympic { +ox::String appVersion = ox::String(OLYMPIC_APP_VERSION); + ox::Error run( ox::StringView project, ox::StringView appName, diff --git a/src/olympic/keel/include/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp index a1a7503..f03b2a0 100644 --- a/src/olympic/keel/include/keel/asset.hpp +++ b/src/olympic/keel/include/keel/asset.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/assetmanager.hpp b/src/olympic/keel/include/keel/assetmanager.hpp index 88b0cdc..39c3a07 100644 --- a/src/olympic/keel/include/keel/assetmanager.hpp +++ b/src/olympic/keel/include/keel/assetmanager.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/context.hpp b/src/olympic/keel/include/keel/context.hpp index 92af34e..acc936c 100644 --- a/src/olympic/keel/include/keel/context.hpp +++ b/src/olympic/keel/include/keel/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/keel.hpp b/src/olympic/keel/include/keel/keel.hpp index 99712ca..ec0b558 100644 --- a/src/olympic/keel/include/keel/keel.hpp +++ b/src/olympic/keel/include/keel/keel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/media.hpp b/src/olympic/keel/include/keel/media.hpp index 7bcf52f..5c20f34 100644 --- a/src/olympic/keel/include/keel/media.hpp +++ b/src/olympic/keel/include/keel/media.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/module.hpp b/src/olympic/keel/include/keel/module.hpp index 2bcbf7d..13de7f1 100644 --- a/src/olympic/keel/include/keel/module.hpp +++ b/src/olympic/keel/include/keel/module.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp index 23925b8..eb8baa5 100644 --- a/src/olympic/keel/include/keel/pack.hpp +++ b/src/olympic/keel/include/keel/pack.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once @@ -125,7 +125,11 @@ ox::Error preloadDir( auto const dir = ox::sfmt("{}{}/", path, name); oxReturnError(preloadDir(ts, romFs, pl, dir)); } else { - oxReturnError(preloadObj(ts, romFs, pl, filePath)); + auto const err = preloadObj(ts, romFs, pl, filePath); + if (err) { + oxErrf("\033[31;1;1mCould not preload {}:\n\t{}\n", filePath, toStr(err)); + return err; + } } } return {}; diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp index f912438..6bf9756 100644 --- a/src/olympic/keel/include/keel/typeconv.hpp +++ b/src/olympic/keel/include/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/typestore.hpp b/src/olympic/keel/include/keel/typestore.hpp index 2228e62..699c569 100644 --- a/src/olympic/keel/include/keel/typestore.hpp +++ b/src/olympic/keel/include/keel/typestore.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/src/asset.cpp b/src/olympic/keel/src/asset.cpp index d40257c..5caf6b2 100644 --- a/src/olympic/keel/src/asset.cpp +++ b/src/olympic/keel/src/asset.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/keel.cpp b/src/olympic/keel/src/keel.cpp index 2ed1d85..1a5700d 100644 --- a/src/olympic/keel/src/keel.cpp +++ b/src/olympic/keel/src/keel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/media.cpp b/src/olympic/keel/src/media.cpp index af8133f..4bf4b02 100644 --- a/src/olympic/keel/src/media.cpp +++ b/src/olympic/keel/src/media.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/module.cpp b/src/olympic/keel/src/module.cpp index 340792b..54462a8 100644 --- a/src/olympic/keel/src/module.cpp +++ b/src/olympic/keel/src/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp index 801e666..1ea389a 100644 --- a/src/olympic/keel/src/pack-applib.cpp +++ b/src/olympic/keel/src/pack-applib.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp index 02c13ca..15bd51b 100644 --- a/src/olympic/keel/src/pack.cpp +++ b/src/olympic/keel/src/pack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -120,7 +120,11 @@ static ox::Error transformClaw( auto const dir = ox::sfmt("{}{}/", path, name); oxReturnError(transformClaw(ctx, ts, dest, dir)); } else { - oxReturnError(doTransformations(ctx, ts, dest, filePath)); + auto const err = doTransformations(ctx, ts, dest, filePath); + if (err) { + oxErrf("\033[31;1;1mCould not do transformations for {}:\n\t{}\n", filePath, toStr(err)); + return err; + } } } return {}; diff --git a/src/olympic/keel/src/typeconv.cpp b/src/olympic/keel/src/typeconv.cpp index dcda6cd..a53bea0 100644 --- a/src/olympic/keel/src/typeconv.cpp +++ b/src/olympic/keel/src/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/typestore.cpp b/src/olympic/keel/src/typestore.cpp index 8bc914b..7afcc6b 100644 --- a/src/olympic/keel/src/typestore.cpp +++ b/src/olympic/keel/src/typestore.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/test/tests.cpp b/src/olympic/keel/test/tests.cpp index e4cd805..9dac6da 100644 --- a/src/olympic/keel/test/tests.cpp +++ b/src/olympic/keel/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #undef NDEBUG diff --git a/src/olympic/studio/applib/include/studioapp/studioapp.hpp b/src/olympic/studio/applib/include/studioapp/studioapp.hpp index be8a062..460c006 100644 --- a/src/olympic/studio/applib/include/studioapp/studioapp.hpp +++ b/src/olympic/studio/applib/include/studioapp/studioapp.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/aboutpopup.cpp b/src/olympic/studio/applib/src/aboutpopup.cpp index d60f71a..f593052 100644 --- a/src/olympic/studio/applib/src/aboutpopup.cpp +++ b/src/olympic/studio/applib/src/aboutpopup.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -7,10 +7,14 @@ #include #include "aboutpopup.hpp" +namespace olympic { +extern ox::String appVersion; +} + namespace studio { AboutPopup::AboutPopup(turbine::Context &ctx) noexcept { - m_text = ox::sfmt("{} - dev build", keelCtx(ctx).appName); + m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion); } void AboutPopup::open() noexcept { diff --git a/src/olympic/studio/applib/src/aboutpopup.hpp b/src/olympic/studio/applib/src/aboutpopup.hpp index 0435a61..155bef6 100644 --- a/src/olympic/studio/applib/src/aboutpopup.hpp +++ b/src/olympic/studio/applib/src/aboutpopup.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp index 7f5dd33..f56fe83 100644 --- a/src/olympic/studio/applib/src/clawviewer.cpp +++ b/src/olympic/studio/applib/src/clawviewer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/clawviewer.hpp b/src/olympic/studio/applib/src/clawviewer.hpp index 7f63e0f..ed6697e 100644 --- a/src/olympic/studio/applib/src/clawviewer.hpp +++ b/src/olympic/studio/applib/src/clawviewer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/filedialogmanager.cpp b/src/olympic/studio/applib/src/filedialogmanager.cpp index c061fda..28187d7 100644 --- a/src/olympic/studio/applib/src/filedialogmanager.cpp +++ b/src/olympic/studio/applib/src/filedialogmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/filedialogmanager.hpp b/src/olympic/studio/applib/src/filedialogmanager.hpp index ee1cdd5..42b0dd9 100644 --- a/src/olympic/studio/applib/src/filedialogmanager.hpp +++ b/src/olympic/studio/applib/src/filedialogmanager.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/main.cpp index 24ec89d..4e2de23 100644 --- a/src/olympic/studio/applib/src/main.cpp +++ b/src/olympic/studio/applib/src/main.cpp @@ -1,11 +1,10 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include #include -#include #include #include #include @@ -31,21 +30,19 @@ class StudioUIDrawer: public turbine::gl::Drawer { static int updateHandler(turbine::Context &ctx) noexcept { auto sctx = turbine::applicationData(ctx); - auto ui = dynamic_cast(sctx->ui); - ui->update(); + sctx->ui->update(); return 16; } static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept { auto sctx = turbine::applicationData(ctx); - auto ui = dynamic_cast(sctx->ui); - ui->handleKeyEvent(key, down); + sctx->ui->handleKeyEvent(key, down); } static ox::Error runApp( ox::CRStringView appName, ox::CRStringView projectDataDir, - ox::UniquePtr fs) noexcept { + ox::UPtr &&fs) noexcept { oxRequireM(ctx, turbine::init(std::move(fs), appName)); turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName); turbine::setUpdateHandler(*ctx, updateHandler); diff --git a/src/olympic/studio/applib/src/newmenu.cpp b/src/olympic/studio/applib/src/newmenu.cpp index f9cd84a..8755ce4 100644 --- a/src/olympic/studio/applib/src/newmenu.cpp +++ b/src/olympic/studio/applib/src/newmenu.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/newmenu.hpp index ee30d77..cf2ef51 100644 --- a/src/olympic/studio/applib/src/newmenu.hpp +++ b/src/olympic/studio/applib/src/newmenu.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/newproject.cpp b/src/olympic/studio/applib/src/newproject.cpp index 2310721..1c624b7 100644 --- a/src/olympic/studio/applib/src/newproject.cpp +++ b/src/olympic/studio/applib/src/newproject.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/newproject.hpp b/src/olympic/studio/applib/src/newproject.hpp index f3bd42b..bd08776 100644 --- a/src/olympic/studio/applib/src/newproject.hpp +++ b/src/olympic/studio/applib/src/newproject.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/projectexplorer.cpp b/src/olympic/studio/applib/src/projectexplorer.cpp index 5e60b04..2ff1a2d 100644 --- a/src/olympic/studio/applib/src/projectexplorer.cpp +++ b/src/olympic/studio/applib/src/projectexplorer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/projectexplorer.hpp b/src/olympic/studio/applib/src/projectexplorer.hpp index 18850c9..50051f6 100644 --- a/src/olympic/studio/applib/src/projectexplorer.hpp +++ b/src/olympic/studio/applib/src/projectexplorer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/projecttreemodel.cpp b/src/olympic/studio/applib/src/projecttreemodel.cpp index 5b848dd..5d0eb87 100644 --- a/src/olympic/studio/applib/src/projecttreemodel.cpp +++ b/src/olympic/studio/applib/src/projecttreemodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/projecttreemodel.hpp b/src/olympic/studio/applib/src/projecttreemodel.hpp index c86b0e8..ce6be79 100644 --- a/src/olympic/studio/applib/src/projecttreemodel.hpp +++ b/src/olympic/studio/applib/src/projecttreemodel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp index 5061f22..e5e139b 100644 --- a/src/olympic/studio/applib/src/studioapp.cpp +++ b/src/olympic/studio/applib/src/studioapp.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -334,13 +334,15 @@ ox::Error StudioUI::createOpenProject(ox::CRStringView path) noexcept { std::filesystem::create_directories(toStdStringView(path), ec); oxReturnError(OxError(ec.value() != 0, "Could not create project directory")); oxReturnError(openProjectPath(path)); - return m_project->writeAllTypeDescriptors(); + return m_project->writeTypeStore(); } ox::Error StudioUI::openProjectPath(ox::CRStringView path) noexcept { oxRequireM(fs, keel::loadRomFs(path)); oxReturnError(keel::setRomFs(keelCtx(m_ctx), std::move(fs))); - m_project = ox::make_unique(keelCtx(m_ctx), ox::String(path), m_projectDataDir); + oxReturnError( + ox::make_unique_catch(keelCtx(m_ctx), ox::String(path), m_projectDataDir) + .moveTo(m_project)); auto const sctx = applicationData(m_ctx); sctx->project = m_project.get(); turbine::setWindowTitle(m_ctx, ox::sfmt("{} - {}", keelCtx(m_ctx).appName, m_project->projectPath())); diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioapp.hpp index e372775..556f036 100644 --- a/src/olympic/studio/applib/src/studioapp.hpp +++ b/src/olympic/studio/applib/src/studioapp.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/configio.hpp b/src/olympic/studio/modlib/include/studio/configio.hpp index 117d2fa..14d476e 100644 --- a/src/olympic/studio/modlib/include/studio/configio.hpp +++ b/src/olympic/studio/modlib/include/studio/configio.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/context.hpp b/src/olympic/studio/modlib/include/studio/context.hpp index a7611d3..f3b93d3 100644 --- a/src/olympic/studio/modlib/include/studio/context.hpp +++ b/src/olympic/studio/modlib/include/studio/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once @@ -11,7 +11,7 @@ namespace studio { struct StudioContext { - ox::SignalHandler *ui = nullptr; + class StudioUI *ui = nullptr; Project *project = nullptr; }; diff --git a/src/olympic/studio/modlib/include/studio/editor.hpp b/src/olympic/studio/modlib/include/studio/editor.hpp index 55e4061..20ddb0c 100644 --- a/src/olympic/studio/modlib/include/studio/editor.hpp +++ b/src/olympic/studio/modlib/include/studio/editor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/filedialog.hpp b/src/olympic/studio/modlib/include/studio/filedialog.hpp index 71fe9b9..40c13c8 100644 --- a/src/olympic/studio/modlib/include/studio/filedialog.hpp +++ b/src/olympic/studio/modlib/include/studio/filedialog.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/imguiuitl.hpp b/src/olympic/studio/modlib/include/studio/imguiuitl.hpp index 6555473..d72d920 100644 --- a/src/olympic/studio/modlib/include/studio/imguiuitl.hpp +++ b/src/olympic/studio/modlib/include/studio/imguiuitl.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/include/studio/itemmaker.hpp b/src/olympic/studio/modlib/include/studio/itemmaker.hpp index dd7bb51..e51b738 100644 --- a/src/olympic/studio/modlib/include/studio/itemmaker.hpp +++ b/src/olympic/studio/modlib/include/studio/itemmaker.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/module.hpp b/src/olympic/studio/modlib/include/studio/module.hpp index 9766d3b..775b18d 100644 --- a/src/olympic/studio/modlib/include/studio/module.hpp +++ b/src/olympic/studio/modlib/include/studio/module.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/popup.hpp b/src/olympic/studio/modlib/include/studio/popup.hpp index e31b0e3..d9a7aff 100644 --- a/src/olympic/studio/modlib/include/studio/popup.hpp +++ b/src/olympic/studio/modlib/include/studio/popup.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp index d54313e..cd64574 100644 --- a/src/olympic/studio/modlib/include/studio/project.hpp +++ b/src/olympic/studio/modlib/include/studio/project.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once @@ -56,7 +56,7 @@ class Project { ox::HashMap> m_fileExtFileMap; public: - explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept; + explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir); ox::Error create() noexcept; @@ -91,7 +91,7 @@ class Project { [[nodiscard]] ox::Vector const&fileList(ox::CRStringView ext) noexcept; - ox::Error writeAllTypeDescriptors() noexcept; + ox::Error writeTypeStore() noexcept; private: void buildFileIndex() noexcept; @@ -131,8 +131,8 @@ ox::Error Project::writeObj(ox::CRStringView path, T const&obj, ox::ClawFormat f } oxRequire(desc, m_typeStore.get()); auto const descExists = m_fs.stat(ox::sfmt("{}/{}", m_typeDescPath, buildTypeId(*desc))).error != 0; - if (!descExists || ox::defines::Debug) { - oxReturnError(writeAllTypeDescriptors()); + if (!descExists) { + oxReturnError(writeTypeStore()); } oxReturnError(keel::setAsset(m_ctx, path, obj)); fileUpdated.emit(path); diff --git a/src/olympic/studio/modlib/include/studio/studio.hpp b/src/olympic/studio/modlib/include/studio/studio.hpp index cc2fd34..40de738 100644 --- a/src/olympic/studio/modlib/include/studio/studio.hpp +++ b/src/olympic/studio/modlib/include/studio/studio.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/task.hpp b/src/olympic/studio/modlib/include/studio/task.hpp index a1b00b3..2730b09 100644 --- a/src/olympic/studio/modlib/include/studio/task.hpp +++ b/src/olympic/studio/modlib/include/studio/task.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/undostack.hpp b/src/olympic/studio/modlib/include/studio/undostack.hpp index ccf9717..094f713 100644 --- a/src/olympic/studio/modlib/include/studio/undostack.hpp +++ b/src/olympic/studio/modlib/include/studio/undostack.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/widget.hpp b/src/olympic/studio/modlib/include/studio/widget.hpp index 851d249..54365bd 100644 --- a/src/olympic/studio/modlib/include/studio/widget.hpp +++ b/src/olympic/studio/modlib/include/studio/widget.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/src/configio.cpp b/src/olympic/studio/modlib/src/configio.cpp index 7af85ee..c937927 100644 --- a/src/olympic/studio/modlib/src/configio.cpp +++ b/src/olympic/studio/modlib/src/configio.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/editor.cpp b/src/olympic/studio/modlib/src/editor.cpp index 1db819b..61a74e8 100644 --- a/src/olympic/studio/modlib/src/editor.cpp +++ b/src/olympic/studio/modlib/src/editor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/filedialog_nfd.cpp b/src/olympic/studio/modlib/src/filedialog_nfd.cpp index 3204d00..61de8be 100644 --- a/src/olympic/studio/modlib/src/filedialog_nfd.cpp +++ b/src/olympic/studio/modlib/src/filedialog_nfd.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/imguiutil.cpp b/src/olympic/studio/modlib/src/imguiutil.cpp index 25b1cdd..f4e0090 100644 --- a/src/olympic/studio/modlib/src/imguiutil.cpp +++ b/src/olympic/studio/modlib/src/imguiutil.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/module.cpp b/src/olympic/studio/modlib/src/module.cpp index 12d31b3..be292c7 100644 --- a/src/olympic/studio/modlib/src/module.cpp +++ b/src/olympic/studio/modlib/src/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/popup.cpp b/src/olympic/studio/modlib/src/popup.cpp index eaf2317..a3b2639 100644 --- a/src/olympic/studio/modlib/src/popup.cpp +++ b/src/olympic/studio/modlib/src/popup.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/project.cpp b/src/olympic/studio/modlib/src/project.cpp index 76ee9b3..3381694 100644 --- a/src/olympic/studio/modlib/src/project.cpp +++ b/src/olympic/studio/modlib/src/project.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -26,7 +26,7 @@ static void generateTypes(ox::TypeStore &ts) noexcept { } } -Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept: +Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir): m_ctx(ctx), m_path(std::move(path)), m_projectDataDir(projectDataDir), @@ -35,6 +35,9 @@ Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDa m_fs(*m_ctx.rom) { oxTracef("studio", "Project: {}", m_path); generateTypes(m_typeStore); + if (ox::defines::Debug) { + oxThrowError(writeTypeStore()); + } buildFileIndex(); } @@ -70,7 +73,7 @@ ox::Vector const&Project::fileList(ox::CRStringView ext) noexcept { return m_fileExtFileMap[ext]; } -ox::Error Project::writeAllTypeDescriptors() noexcept { +ox::Error Project::writeTypeStore() noexcept { // write all descriptors because we don't know which types T depends on oxReturnError(mkdir(m_typeDescPath)); for (auto const &t: m_typeStore.typeList()) { diff --git a/src/olympic/studio/modlib/src/task.cpp b/src/olympic/studio/modlib/src/task.cpp index caab41f..e25cacf 100644 --- a/src/olympic/studio/modlib/src/task.cpp +++ b/src/olympic/studio/modlib/src/task.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/undostack.cpp b/src/olympic/studio/modlib/src/undostack.cpp index 7b7eb5e..7468774 100644 --- a/src/olympic/studio/modlib/src/undostack.cpp +++ b/src/olympic/studio/modlib/src/undostack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/include/turbine/clipboard.hpp b/src/olympic/turbine/include/turbine/clipboard.hpp index fab5844..009b0b7 100644 --- a/src/olympic/turbine/include/turbine/clipboard.hpp +++ b/src/olympic/turbine/include/turbine/clipboard.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/context.hpp b/src/olympic/turbine/include/turbine/context.hpp index 3d5bca4..557e7b9 100644 --- a/src/olympic/turbine/include/turbine/context.hpp +++ b/src/olympic/turbine/include/turbine/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/event.hpp b/src/olympic/turbine/include/turbine/event.hpp index 5d4cfbc..a8f8c02 100644 --- a/src/olympic/turbine/include/turbine/event.hpp +++ b/src/olympic/turbine/include/turbine/event.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/gfx.hpp b/src/olympic/turbine/include/turbine/gfx.hpp index f52d447..0d2b135 100644 --- a/src/olympic/turbine/include/turbine/gfx.hpp +++ b/src/olympic/turbine/include/turbine/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/input.hpp b/src/olympic/turbine/include/turbine/input.hpp index 43c733e..d2ad284 100644 --- a/src/olympic/turbine/include/turbine/input.hpp +++ b/src/olympic/turbine/include/turbine/input.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/turbine.hpp b/src/olympic/turbine/include/turbine/turbine.hpp index 6d390d9..f12b18e 100644 --- a/src/olympic/turbine/include/turbine/turbine.hpp +++ b/src/olympic/turbine/include/turbine/turbine.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/gba/clipboard.cpp b/src/olympic/turbine/src/gba/clipboard.cpp index a00e0d3..eae5fbe 100644 --- a/src/olympic/turbine/src/gba/clipboard.cpp +++ b/src/olympic/turbine/src/gba/clipboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/config.hpp b/src/olympic/turbine/src/gba/config.hpp index cec7abe..5f6891b 100644 --- a/src/olympic/turbine/src/gba/config.hpp +++ b/src/olympic/turbine/src/gba/config.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/gba/context.cpp b/src/olympic/turbine/src/gba/context.cpp index 402c10d..c1ce23c 100644 --- a/src/olympic/turbine/src/gba/context.cpp +++ b/src/olympic/turbine/src/gba/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "context.hpp" diff --git a/src/olympic/turbine/src/gba/context.hpp b/src/olympic/turbine/src/gba/context.hpp index 430b9bc..64a1caa 100644 --- a/src/olympic/turbine/src/gba/context.hpp +++ b/src/olympic/turbine/src/gba/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/gba/event.cpp b/src/olympic/turbine/src/gba/event.cpp index 75b2fca..74218f0 100644 --- a/src/olympic/turbine/src/gba/event.cpp +++ b/src/olympic/turbine/src/gba/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/gfx.cpp b/src/olympic/turbine/src/gba/gfx.cpp index daa3429..e244e3c 100644 --- a/src/olympic/turbine/src/gba/gfx.cpp +++ b/src/olympic/turbine/src/gba/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/irq.arm.cpp b/src/olympic/turbine/src/gba/irq.arm.cpp index 6b5707c..977d071 100644 --- a/src/olympic/turbine/src/gba/irq.arm.cpp +++ b/src/olympic/turbine/src/gba/irq.arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ // NOTE: this file is compiled as ARM and not THUMB, so don't but too much in diff --git a/src/olympic/turbine/src/gba/irqstub.cpp b/src/olympic/turbine/src/gba/irqstub.cpp index e163b99..8d3148f 100644 --- a/src/olympic/turbine/src/gba/irqstub.cpp +++ b/src/olympic/turbine/src/gba/irqstub.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ // stub for building TeaGBA for PC targets, for purposes of not having to diff --git a/src/olympic/turbine/src/gba/turbine.arm.cpp b/src/olympic/turbine/src/gba/turbine.arm.cpp index fc9610e..84f0213 100644 --- a/src/olympic/turbine/src/gba/turbine.arm.cpp +++ b/src/olympic/turbine/src/gba/turbine.arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/turbine.cpp b/src/olympic/turbine/src/gba/turbine.cpp index 113861d..2d1fe7d 100644 --- a/src/olympic/turbine/src/gba/turbine.cpp +++ b/src/olympic/turbine/src/gba/turbine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/turbine.hpp b/src/olympic/turbine/src/gba/turbine.hpp index 894d72b..29312bf 100644 --- a/src/olympic/turbine/src/gba/turbine.hpp +++ b/src/olympic/turbine/src/gba/turbine.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/clipboard.cpp b/src/olympic/turbine/src/glfw/clipboard.cpp index e9374f5..b2efdf1 100644 --- a/src/olympic/turbine/src/glfw/clipboard.cpp +++ b/src/olympic/turbine/src/glfw/clipboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/config.hpp b/src/olympic/turbine/src/glfw/config.hpp index 974e1f0..550e5b5 100644 --- a/src/olympic/turbine/src/glfw/config.hpp +++ b/src/olympic/turbine/src/glfw/config.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/context.cpp b/src/olympic/turbine/src/glfw/context.cpp index c988f0f..ded5388 100644 --- a/src/olympic/turbine/src/glfw/context.cpp +++ b/src/olympic/turbine/src/glfw/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/context.hpp b/src/olympic/turbine/src/glfw/context.hpp index d654a0b..6075cf8 100644 --- a/src/olympic/turbine/src/glfw/context.hpp +++ b/src/olympic/turbine/src/glfw/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/event.cpp b/src/olympic/turbine/src/glfw/event.cpp index 75b2fca..74218f0 100644 --- a/src/olympic/turbine/src/glfw/event.cpp +++ b/src/olympic/turbine/src/glfw/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/gfx.cpp b/src/olympic/turbine/src/glfw/gfx.cpp index 48d58b2..b4d7b0a 100644 --- a/src/olympic/turbine/src/glfw/gfx.cpp +++ b/src/olympic/turbine/src/glfw/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/turbine.cpp b/src/olympic/turbine/src/glfw/turbine.cpp index f48c28c..7003e86 100644 --- a/src/olympic/turbine/src/glfw/turbine.cpp +++ b/src/olympic/turbine/src/glfw/turbine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include