diff --git a/README.md b/README.md index a7e5f99..3afbe6a 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # mkxp -Discord community: https://discord.gg/A8xHE8P -Matrix space: https://matrix.to/#/#mkxp:mapleshrine.eu -Further links: https://mapleshrine.eu +Read: [Future of mkxp](https://gist.github.com/Ancurio/fc568571eaf7dd62c550dc3a08c0d08f) +Official discord community: https://discord.gg/A8xHE8P mkxp is a project that seeks to provide a fully open source implementation of the Ruby Game Scripting System (RGSS) interface used in the popular game creation software "RPG Maker XP", "RPG Maker VX" and "RPG Maker VX Ace" (trademark by Enterbrain, Inc.), with focus on Linux. The goal is to be able to run games created with the above software natively without changing a single file. It is licensed under the GNU General Public License v2+. ## Prebuilt binaries -[**Linux / Windows**](https://www.mapleshrine.eu/releases/) +[**Linux (32bit/64bit)**](http://ancurio.bplaced.net/mkxp/generic/) [**OSX**](https://app.box.com/mkxpmacbuilds) by Ali +[**Windows (mingw-w64 32bit)**](http://ancurio.bplaced.net/mkxp/mingw32/) ## Should I use mkxp mkxp primarily targets technically versed users that are comfortable with Ruby / RGSS, and ideally know how to compile the project themselves. The reason for this is that for most games, due to Win32-API usage, mkxp is simply not a plug-and-play solution, but a building block with which a fully cross-platform version can be created in time. @@ -89,7 +89,7 @@ To run mkxp, you should have a graphics card capable of at least **OpenGL (ES) 2 ## Dependency kit -To facilitate hacking, I have assembled a package containing all dependencies to compile mkxp on a bare-bones Ubuntu 12.04 64bit installation. Compatibility with other distributions has not been tested. You can download it [here](https://mapleshrine.eu/depkits/linux64.tar.xz). Read the "README" for instructions. +To facilitate hacking, I have assembled a package containing all dependencies to compile mkxp on a bare-bones Ubuntu 12.04 64bit installation. Compatibility with other distributions has not been tested. You can download it [here](https://www.dropbox.com/s/mtp44ur367m2zts/mkxp-depkit.tar.xz). Read the "README" for instructions. ## Configuration @@ -105,7 +105,7 @@ Example: `./mkxp --gameFolder="my game" --vsync=true --fixedFramerate=60` mkxp doesn't come with a soundfont by default, so you will have to supply it yourself (set its path in the config). Playback has been tested and should work reasonably well with all RTP assets. -You can use this public domain soundfont: [GMGSx.sf2](https://mapleshrine.eu/unsorted/GMGSx.sf2) +You can use this public domain soundfont: [GMGSx.sf2](https://www.dropbox.com/s/qxdvoxxcexsvn43/GMGSx.sf2?dl=0) ## Fonts diff --git a/binding-mri/audio-binding.cpp b/binding-mri/audio-binding.cpp index 1d5e275..7a4b2d1 100644 --- a/binding-mri/audio-binding.cpp +++ b/binding-mri/audio-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp index a4fb501..d166771 100644 --- a/binding-mri/binding-mri.cpp +++ b/binding-mri/binding-mri.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/binding-types.h b/binding-mri/binding-types.h index ff9e991..5d97546 100644 --- a/binding-mri/binding-types.h +++ b/binding-mri/binding-types.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/binding-util.cpp b/binding-mri/binding-util.cpp index a34f122..1eab074 100644 --- a/binding-mri/binding-util.cpp +++ b/binding-mri/binding-util.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/binding-util.h b/binding-mri/binding-util.h index 9fdea05..17e6757 100644 --- a/binding-mri/binding-util.h +++ b/binding-mri/binding-util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/bitmap-binding.cpp b/binding-mri/bitmap-binding.cpp index 3581688..49e0093 100644 --- a/binding-mri/bitmap-binding.cpp +++ b/binding-mri/bitmap-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -433,40 +433,6 @@ RB_METHOD(bitmapInitializeCopy) return self; } -RB_METHOD(bitmapWriteToPng) -{ - Bitmap *b = getPrivateData(self); - const char *filename; - - rb_get_args(argc, argv, "z", &filename RB_ARG_END); - - b->writeToPng(filename); - - return self; -} - -RB_METHOD(bitmapVFlip) -{ - RB_UNUSED_PARAM; - - Bitmap *b = getPrivateData(self); - - b->vFlip(); - - return Qnil; -} - -RB_METHOD(bitmapHFlip) -{ - RB_UNUSED_PARAM; - - Bitmap *b = getPrivateData(self); - - b->hFlip(); - - return Qnil; -} - void bitmapBindingInit() @@ -500,9 +466,5 @@ bitmapBindingInit() _rb_define_method(klass, "radial_blur", bitmapRadialBlur); } - _rb_define_method(klass, "write_to_png", bitmapWriteToPng); - _rb_define_method(klass, "v_flip", bitmapVFlip); - _rb_define_method(klass, "h_flip", bitmapHFlip); - INIT_PROP_BIND(Bitmap, Font, "font"); } diff --git a/binding-mri/disposable-binding.h b/binding-mri/disposable-binding.h index 2aaa27f..a90f5ec 100644 --- a/binding-mri/disposable-binding.h +++ b/binding-mri/disposable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/etc-binding.cpp b/binding-mri/etc-binding.cpp index 730acb4..20f90f1 100644 --- a/binding-mri/etc-binding.cpp +++ b/binding-mri/etc-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/filesystem-binding.cpp b/binding-mri/filesystem-binding.cpp index 39b6be3..a9449af 100644 --- a/binding-mri/filesystem-binding.cpp +++ b/binding-mri/filesystem-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/flashable-binding.h b/binding-mri/flashable-binding.h index 3389eb6..60a344b 100644 --- a/binding-mri/flashable-binding.h +++ b/binding-mri/flashable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/font-binding.cpp b/binding-mri/font-binding.cpp index b2a6a7f..006a2df 100644 --- a/binding-mri/font-binding.cpp +++ b/binding-mri/font-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/graphics-binding.cpp b/binding-mri/graphics-binding.cpp index f924098..aa58102 100644 --- a/binding-mri/graphics-binding.cpp +++ b/binding-mri/graphics-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ */ #include "graphics.h" -#include "eventthread.h" #include "sharedstate.h" #include "binding-util.h" #include "binding-types.h" @@ -196,37 +195,6 @@ RB_METHOD(graphicsPlayMovie) return Qnil; } -RB_METHOD(graphicsResizeWindow) -{ - RB_UNUSED_PARAM; - - int width, height; - bool recenter = false; - rb_get_args(argc, argv, "ii|b", &width, &height, &recenter RB_ARG_END); - - shState->eThread().requestWindowResize(width, height, recenter); - - return Qnil; -} - -RB_METHOD(graphicsMaximizeWindow) -{ - RB_UNUSED_PARAM; - - shState->eThread().requestWindowMaximize(); - - return Qnil; -} - -RB_METHOD(graphicsRestoreWindow) -{ - RB_UNUSED_PARAM; - - shState->eThread().requestWindowRestore(); - - return Qnil; -} - DEF_GRA_PROP_I(FrameRate) DEF_GRA_PROP_I(FrameCount) DEF_GRA_PROP_I(Brightness) @@ -284,8 +252,4 @@ void graphicsBindingInit() INIT_GRA_PROP_BIND( Fullscreen, "fullscreen" ); INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" ); - - _rb_define_module_function(module, "resize_window", graphicsResizeWindow); - _rb_define_module_function(module, "maximize_window", graphicsMaximizeWindow); - _rb_define_module_function(module, "restore_window", graphicsRestoreWindow); } diff --git a/binding-mri/input-binding.cpp b/binding-mri/input-binding.cpp index ea9bae3..62a383a 100644 --- a/binding-mri/input-binding.cpp +++ b/binding-mri/input-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -115,13 +115,6 @@ RB_METHOD(inputMouseY) return rb_fix_new(shState->input().mouseY()); } -RB_METHOD(inputScrollV) -{ - RB_UNUSED_PARAM; - - return rb_fix_new(shState->input().scrollV()); -} - struct { @@ -156,9 +149,7 @@ static buttonCodes[] = { "MOUSELEFT", Input::MouseLeft }, { "MOUSEMIDDLE", Input::MouseMiddle }, - { "MOUSERIGHT", Input::MouseRight }, - { "MOUSEX1", Input::MouseX1 }, - { "MOUSEX2", Input::MouseX2 } + { "MOUSERIGHT", Input::MouseRight } }; static elementsN(buttonCodes); @@ -177,7 +168,6 @@ inputBindingInit() _rb_define_module_function(module, "mouse_x", inputMouseX); _rb_define_module_function(module, "mouse_y", inputMouseY); - _rb_define_module_function(module, "scroll_v", inputScrollV); if (rgssVer >= 3) { diff --git a/binding-mri/plane-binding.cpp b/binding-mri/plane-binding.cpp index 7818f76..33f2d9b 100644 --- a/binding-mri/plane-binding.cpp +++ b/binding-mri/plane-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/sceneelement-binding.h b/binding-mri/sceneelement-binding.h index da51a97..c191ee4 100644 --- a/binding-mri/sceneelement-binding.h +++ b/binding-mri/sceneelement-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/serializable-binding.h b/binding-mri/serializable-binding.h index 12e897b..3082705 100644 --- a/binding-mri/serializable-binding.h +++ b/binding-mri/serializable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/sprite-binding.cpp b/binding-mri/sprite-binding.cpp index bdee863..0142756 100644 --- a/binding-mri/sprite-binding.cpp +++ b/binding-mri/sprite-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/table-binding.cpp b/binding-mri/table-binding.cpp index 12643f5..33d657e 100644 --- a/binding-mri/table-binding.cpp +++ b/binding-mri/table-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/tilemap-binding.cpp b/binding-mri/tilemap-binding.cpp index b9e414c..970ad58 100644 --- a/binding-mri/tilemap-binding.cpp +++ b/binding-mri/tilemap-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/tilemapvx-binding.cpp b/binding-mri/tilemapvx-binding.cpp index 56e9642..9fd5a82 100644 --- a/binding-mri/tilemapvx-binding.cpp +++ b/binding-mri/tilemapvx-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/viewport-binding.cpp b/binding-mri/viewport-binding.cpp index 051890a..1292b8c 100644 --- a/binding-mri/viewport-binding.cpp +++ b/binding-mri/viewport-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/viewportelement-binding.h b/binding-mri/viewportelement-binding.h index 362845d..4d9e7ae 100644 --- a/binding-mri/viewportelement-binding.h +++ b/binding-mri/viewportelement-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/window-binding.cpp b/binding-mri/window-binding.cpp index 99fceab..3ea28c8 100644 --- a/binding-mri/window-binding.cpp +++ b/binding-mri/window-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mri/windowvx-binding.cpp b/binding-mri/windowvx-binding.cpp index d25c043..889707b 100644 --- a/binding-mri/windowvx-binding.cpp +++ b/binding-mri/windowvx-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/audio-binding.cpp b/binding-mruby/audio-binding.cpp index 127dab0..9b9981c 100644 --- a/binding-mruby/audio-binding.cpp +++ b/binding-mruby/audio-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp index 4636574..b2d7fcf 100644 --- a/binding-mruby/binding-mruby.cpp +++ b/binding-mruby/binding-mruby.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/binding-types.h b/binding-mruby/binding-types.h index ff9e991..5d97546 100644 --- a/binding-mruby/binding-types.h +++ b/binding-mruby/binding-types.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/binding-util.cpp b/binding-mruby/binding-util.cpp index a3cf3aa..f405bf8 100644 --- a/binding-mruby/binding-util.cpp +++ b/binding-mruby/binding-util.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/binding-util.h b/binding-mruby/binding-util.h index 3025174..765887d 100644 --- a/binding-mruby/binding-util.h +++ b/binding-mruby/binding-util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/bitmap-binding.cpp b/binding-mruby/bitmap-binding.cpp index f65f7dc..16f9ce4 100644 --- a/binding-mruby/bitmap-binding.cpp +++ b/binding-mruby/bitmap-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/disposable-binding.h b/binding-mruby/disposable-binding.h index 4933e0e..2edafd1 100644 --- a/binding-mruby/disposable-binding.h +++ b/binding-mruby/disposable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/etc-binding.cpp b/binding-mruby/etc-binding.cpp index 7fa0582..9cc4580 100644 --- a/binding-mruby/etc-binding.cpp +++ b/binding-mruby/etc-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/flashable-binding.h b/binding-mruby/flashable-binding.h index e471fd2..a7a124a 100644 --- a/binding-mruby/flashable-binding.h +++ b/binding-mruby/flashable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/font-binding.cpp b/binding-mruby/font-binding.cpp index 1450534..0aed999 100644 --- a/binding-mruby/font-binding.cpp +++ b/binding-mruby/font-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/graphics-binding.cpp b/binding-mruby/graphics-binding.cpp index f33c601..d4e3b5e 100644 --- a/binding-mruby/graphics-binding.cpp +++ b/binding-mruby/graphics-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/input-binding.cpp b/binding-mruby/input-binding.cpp index 0735480..1835f9f 100644 --- a/binding-mruby/input-binding.cpp +++ b/binding-mruby/input-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/file.cpp b/binding-mruby/mrb-ext/file.cpp index 4c4d5d8..acddafc 100644 --- a/binding-mruby/mrb-ext/file.cpp +++ b/binding-mruby/mrb-ext/file.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/file.h b/binding-mruby/mrb-ext/file.h index 2203032..b5fd641 100644 --- a/binding-mruby/mrb-ext/file.h +++ b/binding-mruby/mrb-ext/file.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/kernel.cpp b/binding-mruby/mrb-ext/kernel.cpp index 704b95d..b642ca3 100644 --- a/binding-mruby/mrb-ext/kernel.cpp +++ b/binding-mruby/mrb-ext/kernel.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/marshal.cpp b/binding-mruby/mrb-ext/marshal.cpp index 3fbb869..a3403f9 100644 --- a/binding-mruby/mrb-ext/marshal.cpp +++ b/binding-mruby/mrb-ext/marshal.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/marshal.h b/binding-mruby/mrb-ext/marshal.h index ffb56bc..fa79c99 100644 --- a/binding-mruby/mrb-ext/marshal.h +++ b/binding-mruby/mrb-ext/marshal.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/rwmem.cpp b/binding-mruby/mrb-ext/rwmem.cpp index 1f832e0..c6f7778 100644 --- a/binding-mruby/mrb-ext/rwmem.cpp +++ b/binding-mruby/mrb-ext/rwmem.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/rwmem.h b/binding-mruby/mrb-ext/rwmem.h index 4a8f8b3..4736b82 100644 --- a/binding-mruby/mrb-ext/rwmem.h +++ b/binding-mruby/mrb-ext/rwmem.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/mrb-ext/time.cpp b/binding-mruby/mrb-ext/time.cpp index 784fc75..c9e6ca1 100644 --- a/binding-mruby/mrb-ext/time.cpp +++ b/binding-mruby/mrb-ext/time.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/plane-binding.cpp b/binding-mruby/plane-binding.cpp index a84db8f..fafc3fe 100644 --- a/binding-mruby/plane-binding.cpp +++ b/binding-mruby/plane-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/sceneelement-binding.h b/binding-mruby/sceneelement-binding.h index d35c4e4..b2f4baa 100644 --- a/binding-mruby/sceneelement-binding.h +++ b/binding-mruby/sceneelement-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/serializable-binding.h b/binding-mruby/serializable-binding.h index 170b06f..35c7e0b 100644 --- a/binding-mruby/serializable-binding.h +++ b/binding-mruby/serializable-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/sprite-binding.cpp b/binding-mruby/sprite-binding.cpp index f89baca..fd8e65d 100644 --- a/binding-mruby/sprite-binding.cpp +++ b/binding-mruby/sprite-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/table-binding.cpp b/binding-mruby/table-binding.cpp index cb4297f..3e63cc7 100644 --- a/binding-mruby/table-binding.cpp +++ b/binding-mruby/table-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/tilemap-binding.cpp b/binding-mruby/tilemap-binding.cpp index dff3704..527fe9c 100644 --- a/binding-mruby/tilemap-binding.cpp +++ b/binding-mruby/tilemap-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/viewport-binding.cpp b/binding-mruby/viewport-binding.cpp index 6dd5fdd..304c268 100644 --- a/binding-mruby/viewport-binding.cpp +++ b/binding-mruby/viewport-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/viewportelement-binding.h b/binding-mruby/viewportelement-binding.h index a52a3f2..315faf0 100644 --- a/binding-mruby/viewportelement-binding.h +++ b/binding-mruby/viewportelement-binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-mruby/window-binding.cpp b/binding-mruby/window-binding.cpp index 4f526ac..a434ea9 100644 --- a/binding-mruby/window-binding.cpp +++ b/binding-mruby/window-binding.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/binding-null/binding-null.cpp b/binding-null/binding-null.cpp index c686152..9353212 100644 --- a/binding-null/binding-null.cpp +++ b/binding-null/binding-null.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/doc/SDL_scancode_map.rb b/doc/SDL_scancode_map.rb deleted file mode 100644 index 5bb6691..0000000 --- a/doc/SDL_scancode_map.rb +++ /dev/null @@ -1,64 +0,0 @@ -SDL = { - :UNKNOWN => 0x00, - :A => 0x04, :B => 0x05, :C => 0x06, :D => 0x07, - :E => 0x08, :F => 0x09, :G => 0x0A, :H => 0x0B, - :I => 0x0C, :J => 0x0D, :K => 0x0E, :L => 0x0F, - :M => 0x10, :N => 0x11, :O => 0x12, :P => 0x13, - :Q => 0x14, :R => 0x15, :S => 0x16, :T => 0x17, - :U => 0x18, :V => 0x19, :W => 0x1A, :X => 0x1B, - :Y => 0x1C, :Z => 0x1D, :N1 => 0x1E, :N2 => 0x1F, - :N3 => 0x20, :N4 => 0x21, :N5 => 0x22, :N6 => 0x23, - :N7 => 0x24, :N8 => 0x25, :N9 => 0x26, :N0 => 0x27, - :RETURN => 0x28, :ESCAPE => 0x29, :BACKSPACE => 0x2A, :TAB => 0x2B, - :SPACE => 0x2C, :MINUS => 0x2D, :EQUALS => 0x2E, :LEFTBRACKET => 0x2F, - :RIGHTBRACKET => 0x30, :BACKSLASH => 0x31, :NONUSHASH => 0x32, :SEMICOLON => 0x33, - :APOSTROPHE => 0x34, :GRAVE => 0x35, :COMMA => 0x36, :PERIOD => 0x37, - :SLASH => 0x38, :CAPSLOCK => 0x39, :F1 => 0x3A, :F2 => 0x3B, - :F3 => 0x3C, :F4 => 0x3D, :F5 => 0x3E, :F6 => 0x3F, - :F7 => 0x40, :F8 => 0x41, :F9 => 0x42, :F10 => 0x43, - :F11 => 0x44, :F12 => 0x45, :PRINTSCREEN => 0x46, :SCROLLLOCK => 0x47, - :PAUSE => 0x48, :INSERT => 0x49, :HOME => 0x4A, :PAGEUP => 0x4B, - :DELETE => 0x4C, :END => 0x4D, :PAGEDOWN => 0x4E, :RIGHT => 0x4F, - :LEFT => 0x50, :DOWN => 0x51, :UP => 0x52, :NUMLOCKCLEAR => 0x53, - :KP_DIVIDE => 0x54, :KP_MULTIPLY => 0x55, :KP_MINUS => 0x56, :KP_PLUS => 0x57, - :KP_ENTER => 0x58, :KP_1 => 0x59, :KP_2 => 0x5A, :KP_3 => 0x5B, - :KP_4 => 0x5C, :KP_5 => 0x5D, :KP_6 => 0x5E, :KP_7 => 0x5F, - :KP_8 => 0x60, :KP_9 => 0x61, :KP_0 => 0x62, :KP_PERIOD => 0x63, - :NONUSBACKSLASH => 0x64, :APPLICATION => 0x65, :POWER => 0x66, :KP_EQUALS => 0x67, - :F13 => 0x68, :F14 => 0x69, :F15 => 0x6A, :F16 => 0x6B, - :F17 => 0x6C, :F18 => 0x6D, :F19 => 0x6E, :F20 => 0x6F, - :F21 => 0x70, :F22 => 0x71, :F23 => 0x72, :F24 => 0x73, - :EXECUTE => 0x74, :HELP => 0x75, :MENU => 0x76, :SELECT => 0x77, - :STOP => 0x78, :AGAIN => 0x79, :UNDO => 0x7A, :CUT => 0x7B, - :COPY => 0x7C, :PASTE => 0x7D, :FIND => 0x7E, :MUTE => 0x7F, - :VOLUMEUP => 0x80, :VOLUMEDOWN => 0x81, :LOCKINGCAPSLOCK => 0x82, :LOCKINGNUMLOCK => 0x83, - :LOCKINGSCROLLLOCK => 0x84, :KP_COMMA => 0x85, :KP_EQUALSAS400 => 0x86, :INTERNATIONAL1 => 0x87, - :INTERNATIONAL2 => 0x88, :INTERNATIONAL3 => 0x89, :INTERNATIONAL4 => 0x8A, :INTERNATIONAL5 => 0x8B, - :INTERNATIONAL6 => 0x8C, :INTERNATIONAL7 => 0x8D, :INTERNATIONAL8 => 0x8E, :INTERNATIONAL9 => 0x8F, - :LANG1 => 0x90, :LANG2 => 0x91, :LANG3 => 0x92, :LANG4 => 0x93, - :LANG5 => 0x94, :LANG6 => 0x95, :LANG7 => 0x96, :LANG8 => 0x97, - :LANG9 => 0x98, :ALTERASE => 0x99, :SYSREQ => 0x9A, :CANCEL => 0x9B, - :CLEAR => 0x9C, :PRIOR => 0x9D, :RETURN2 => 0x9E, :SEPARATOR => 0x9F, - :OUT => 0xA0, :OPER => 0xA1, :CLEARAGAIN => 0xA2, :CRSEL => 0xA3, - :EXSEL => 0xA4, :KP_00 => 0xB0, :KP_000 => 0xB1, :THOUSANDSSEPARATOR => 0xB2, - :DECIMALSEPARATOR => 0xB3, :CURRENCYUNIT => 0xB4, :CURRENCYSUBUNIT => 0xB5, :KP_LEFTPAREN => 0xB6, - :KP_RIGHTPAREN => 0xB7, :KP_LEFTBRACE => 0xB8, :KP_RIGHTBRACE => 0xB9, :KP_TAB => 0xBA, - :KP_BACKSPACE => 0xBB, :KP_A => 0xBC, :KP_B => 0xBD, :KP_C => 0xBE, - :KP_D => 0xBF, :KP_E => 0xC0, :KP_F => 0xC1, :KP_XOR => 0xC2, - :KP_POWER => 0xC3, :KP_PERCENT => 0xC4, :KP_LESS => 0xC5, :KP_GREATER => 0xC6, - :KP_AMPERSAND => 0xC7, :KP_DBLAMPERSAND => 0xC8, :KP_VERTICALBAR => 0xC9, :KP_DBLVERTICALBAR => 0xCA, - :KP_COLON => 0xCB, :KP_HASH => 0xCC, :KP_SPACE => 0xCD, :KP_AT => 0xCE, - :KP_EXCLAM => 0xCF, :KP_MEMSTORE => 0xD0, :KP_MEMRECALL => 0xD1, :KP_MEMCLEAR => 0xD2, - :KP_MEMADD => 0xD3, :KP_MEMSUBTRACT => 0xD4, :KP_MEMMULTIPLY => 0xD5, :KP_MEMDIVIDE => 0xD6, - :KP_PLUSMINUS => 0xD7, :KP_CLEAR => 0xD8, :KP_CLEARENTRY => 0xD9, :KP_BINARY => 0xDA, - :KP_OCTAL => 0xDB, :KP_DECIMAL => 0xDC, :KP_HEXADECIMAL => 0xDD, :LCTRL => 0xE0, - :LSHIFT => 0xE1, :LALT => 0xE2, :LGUI => 0xE3, :RCTRL => 0xE4, - :RSHIFT => 0xE5, :RALT => 0xE6, :RGUI => 0xE7, :MODE => 0x101, - :AUDIONEXT => 0x102, :AUDIOPREV => 0x103, :AUDIOSTOP => 0x104, :AUDIOPLAY => 0x105, - :AUDIOMUTE => 0x106, :MEDIASELECT => 0x107, :WWW => 0x108, :MAIL => 0x109, - :CALCULATOR => 0x10A, :COMPUTER => 0x10B, :AC_SEARCH => 0x10C, :AC_HOME => 0x10D, - :AC_BACK => 0x10E, :AC_FORWARD => 0x10F, :AC_STOP => 0x110, :AC_REFRESH => 0x111, - :AC_BOOKMARKS => 0x112, :BRIGHTNESSDOWN => 0x113, :BRIGHTNESSUP => 0x114, :DISPLAYSWITCH => 0x115, - :KBDILLUMTOGGLE => 0x116, :KBDILLUMDOWN => 0x117, :KBDILLUMUP => 0x118, :EJECT => 0x119, - :SLEEP => 0x11A, :APP1 => 0x11B, :APP2 => 0x11C, -} diff --git a/doc/extension_doc.md b/doc/extension_doc.md deleted file mode 100644 index ee8d32a..0000000 --- a/doc/extension_doc.md +++ /dev/null @@ -1,57 +0,0 @@ - -# mkxp extenions for Dancing Dragon Games / Symphony of War - -## Graphics.resize_window(width, height, recenter) -width: Integer -height: Integer -recenter: Boolean, false by default -returns: nil - -Resizes the game window to width x height. If `recenter` is **true**, also center the window on the current screen. - -## Graphics.maximize_window() - -Maximizes the game window, ignoring the `winResizable` config option. - -## Graphics.restore_window() - -Restores the game window from a maximized or minimized state. - -## Bitmap.write_to_png(filename) -filename: String -returns: self - -Writes the contents of the bitmap to `filename`, in PNG format. - -## Bitmap.v_flip() / .h_flip() -returns: nil - -Flips the bitmap image vertically / horizontally. - -## Input.scroll_v() -returns: Integer - -Returns the cumulative amount of scroll events (negative if down, positive if up) inbetween the current and last `Input.update` call. - -## Input::MOUSEX1 / ::MOUSEX2 - -These two constants representing two extra mouse buttons can be passed to the familiar #press?/#trigger?/#repeat? functions. - -## MKXP.data_directory() -returns: String - -Provides a PC-user-dependant, game-specific path to a writable directory, intended for save states, configuration and similar. -In `mkxp.conf`, both `dataPathOrg` and `dataPathApp` keys need to be set, otherwise it returns a generic directory shared by all mkxp games. It is recommended (though not required) to not put any spaces in the config strings. -Real life example: -``` -dataPathOrg=dancingdragon -dataPathApp=skyborn -``` - -## MKXP.mouse_in_window() -returns: Boolean - -Returns true if the mouse cursor is currently within the game window, false otherwise. - -## Arbitrary key states -Use `MKXP.raw_key_states` to get the current byte array of keystates, then call `#getbyte(scancode)` with `scancode` being one of the constants defined in `SDL_scancode_map.rb`. **0** means the key is released, **1** that it is pressed. diff --git a/sources.def b/sources.def deleted file mode 100644 index 53104b9..0000000 --- a/sources.def +++ /dev/null @@ -1,100 +0,0 @@ -SOURCES=( - src/main.cpp - src/audio.cpp - src/bitmap.cpp - src/eventthread.cpp - src/filesystem.cpp - src/font.cpp - src/iniconfig.cpp - src/input.cpp - src/plane.cpp - src/scene.cpp - src/sprite.cpp - src/table.cpp - src/tilequad.cpp - src/viewport.cpp - src/window.cpp - src/texpool.cpp - src/shader.cpp - src/glstate.cpp - src/tilemap.cpp - src/autotiles.cpp - src/graphics.cpp - src/gl-debug.cpp - src/etc.cpp - src/config.cpp - src/settingsmenu.cpp - src/keybindings.cpp - src/tileatlas.cpp - src/sharedstate.cpp - src/gl-fun.cpp - src/gl-meta.cpp - src/vertex.cpp - src/soundemitter.cpp - src/sdlsoundsource.cpp - src/alstream.cpp - src/audiostream.cpp - src/rgssad.cpp - src/bundledfont.cpp - src/vorbissource.cpp - src/windowvx.cpp - src/tilemapvx.cpp - src/tileatlasvx.cpp - src/autotilesvx.cpp - src/midisource.cpp - src/fluid-fun.cpp -) - -SOURCES_C=( - steamshim/steamshim_child.c -) - -MRI_SOURCES=( - binding-mri/binding-mri.cpp - binding-mri/binding-util.cpp - binding-mri/table-binding.cpp - binding-mri/etc-binding.cpp - binding-mri/bitmap-binding.cpp - binding-mri/font-binding.cpp - binding-mri/graphics-binding.cpp - binding-mri/input-binding.cpp - binding-mri/sprite-binding.cpp - binding-mri/viewport-binding.cpp - binding-mri/plane-binding.cpp - binding-mri/window-binding.cpp - binding-mri/tilemap-binding.cpp - binding-mri/audio-binding.cpp - binding-mri/module_rpg.cpp - binding-mri/filesystem-binding.cpp - binding-mri/windowvx-binding.cpp - binding-mri/tilemapvx-binding.cpp -) - -EMBED=( - shader/common.h - shader/transSimple.frag - shader/trans.frag - shader/hue.frag - shader/sprite.frag - shader/plane.frag - shader/gray.frag - shader/bitmapBlit.frag - shader/flatColor.frag - shader/simple.frag - shader/simpleColor.frag - shader/simpleAlpha.frag - shader/simpleAlphaUni.frag - shader/flashMap.frag - shader/minimal.vert - shader/simple.vert - shader/simpleColor.vert - shader/sprite.vert - shader/tilemap.vert - shader/blur.frag - shader/blurH.vert - shader/blurV.vert - shader/simpleMatrix.vert - shader/tilemapvx.vert - assets/liberation.ttf - assets/icon.png -) diff --git a/src/al-util.h b/src/al-util.h index 58f888b..f93ed3f 100644 --- a/src/al-util.h +++ b/src/al-util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/aldatasource.h b/src/aldatasource.h index 94dea90..f46fc58 100644 --- a/src/aldatasource.h +++ b/src/aldatasource.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/alstream.cpp b/src/alstream.cpp index 1a8d73c..72675bc 100644 --- a/src/alstream.cpp +++ b/src/alstream.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/alstream.h b/src/alstream.h index 7391c4b..12a7f28 100644 --- a/src/alstream.h +++ b/src/alstream.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/audio.cpp b/src/audio.cpp index 19a4dee..b83ffed 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/audio.h b/src/audio.h index ea74d78..75cbc3f 100644 --- a/src/audio.h +++ b/src/audio.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/audiostream.cpp b/src/audiostream.cpp index 42a995f..dec70a8 100644 --- a/src/audiostream.cpp +++ b/src/audiostream.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/audiostream.h b/src/audiostream.h index de7eb63..2233a50 100644 --- a/src/audiostream.h +++ b/src/audiostream.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/binding.h b/src/binding.h index 7040263..49b143e 100644 --- a/src/binding.h +++ b/src/binding.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/bitmap.cpp b/src/bitmap.cpp index 47b380e..a2f27be 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -245,48 +245,6 @@ struct BitmapPrivate self->modified(); } - - void downloadToSurface() - { - if (!surface) - allocSurface(); - - FBO::bind(gl.fbo); - - glState.viewport.pushSet(IntRect(0, 0, gl.width, gl.height)); - - ::gl.ReadPixels(0, 0, gl.width, gl.height, GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels); - - glState.viewport.pop(); - } - - void flip(const IntRect &srcRect) - { - TEXFBO newTex = shState->texPool().request(gl.width, gl.height); - - SimpleShader &shader = shState->shaders().simple; - shader.bind(); - shader.setTexOffsetX(0); - bindTexture(shader); - - Quad &quad = shState->gpQuad(); - quad.setTexPosRect(srcRect, IntRect(0, 0, gl.width, gl.height)); - quad.setColor(Vec4(1, 1, 1, 1)); - - glState.blend.pushSet(false); - pushSetViewport(shader); - - FBO::bind(newTex.fbo); - blitQuad(quad); - - popViewport(); - glState.blend.pop(); - - shState->texPool().release(gl); - gl = newTex; - - onModified(); - } }; struct BitmapOpenHandler : FileSystem::OpenHandler @@ -943,7 +901,17 @@ Color Bitmap::getPixel(int x, int y) const return Vec4(); if (!p->surface) - p->downloadToSurface(); + { + p->allocSurface(); + + FBO::bind(p->gl.fbo); + + glState.viewport.pushSet(IntRect(0, 0, width(), height())); + + gl.ReadPixels(0, 0, width(), height(), GL_RGBA, GL_UNSIGNED_BYTE, p->surface->pixels); + + glState.viewport.pop(); + } uint32_t pixel = getPixelAt(p->surface, p->format, x, y); @@ -1432,28 +1400,6 @@ void Bitmap::setInitFont(Font *value) p->font = value; } -void Bitmap::writeToPng(const char *filename) -{ - p->downloadToSurface(); - IMG_SavePNG(p->surface, filename); -} - -void Bitmap::vFlip() -{ - guardDisposed(); - GUARD_MEGA; - - p->flip(IntRect(0, p->gl.height, p->gl.width, -p->gl.height)); -} - -void Bitmap::hFlip() -{ - guardDisposed(); - GUARD_MEGA; - - p->flip(IntRect(p->gl.width, 0, -p->gl.width, p->gl.height)); -} - TEXFBO &Bitmap::getGLTypes() { return p->gl; diff --git a/src/bitmap.h b/src/bitmap.h index 2522527..b744911 100644 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -105,12 +105,6 @@ public: * use at construction */ void setInitFont(Font *value); - /* extensions */ - void writeToPng(const char *filename); - - void vFlip(); - void hFlip(); - /* */ TEXFBO &getGLTypes(); SDL_Surface *megaSurface() const; diff --git a/src/boost-hash.h b/src/boost-hash.h index 39b6eaa..de41de3 100644 --- a/src/boost-hash.h +++ b/src/boost-hash.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/config.cpp b/src/config.cpp index 0bed41a..aee2517 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/config.h b/src/config.h index 98d9b2d..2925a99 100644 --- a/src/config.h +++ b/src/config.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/debugwriter.h b/src/debugwriter.h index da12825..39cf537 100644 --- a/src/debugwriter.h +++ b/src/debugwriter.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/disposable.h b/src/disposable.h index 432687b..5bb1d68 100644 --- a/src/disposable.h +++ b/src/disposable.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/etc-internal.h b/src/etc-internal.h index 5ddce74..c592423 100644 --- a/src/etc-internal.h +++ b/src/etc-internal.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/etc.cpp b/src/etc.cpp index 5af7739..26e6635 100644 --- a/src/etc.cpp +++ b/src/etc.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/etc.h b/src/etc.h index bd3470d..463b890 100644 --- a/src/etc.h +++ b/src/etc.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/eventthread.cpp b/src/eventthread.cpp index 989c89a..bbb8b51 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -40,12 +40,12 @@ #include -typedef void (ALC_APIENTRY *_LPALCDEVICEPAUSESOFT) (ALCdevice *device); -typedef void (ALC_APIENTRY *_LPALCDEVICERESUMESOFT) (ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCDEVICEPAUSESOFT) (ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCDEVICERESUMESOFT) (ALCdevice *device); #define AL_DEVICE_PAUSE_FUN \ - AL_FUN(DevicePause, _LPALCDEVICEPAUSESOFT) \ - AL_FUN(DeviceResume, _LPALCDEVICERESUMESOFT) + AL_FUN(DevicePause, LPALCDEVICEPAUSESOFT) \ + AL_FUN(DeviceResume, LPALCDEVICERESUMESOFT) struct ALCFunctions { @@ -73,15 +73,12 @@ uint8_t EventThread::keyStates[]; EventThread::JoyState EventThread::joyState; EventThread::MouseState EventThread::mouseState; EventThread::TouchState EventThread::touchState; -SDL_atomic_t EventThread::verticalScrollDistance; /* User event codes */ enum { REQUEST_SETFULLSCREEN = 0, REQUEST_WINRESIZE, - REQUEST_WINMAXIMIZE, - REQUEST_WINRESTORE, REQUEST_MESSAGEBOX, REQUEST_SETCURSORVISIBLE, @@ -103,36 +100,6 @@ bool EventThread::allocUserEvents() return true; } -static void writeResizeRequest(SDL_WindowEvent &event, int w, int h, bool recenter) -{ - event.data1 = w; - event.data2 = h; - event.padding3 = recenter ? 1 : 0; -} - -static void handleResizeRequest(SDL_Window *win, SDL_WindowEvent &event) -{ - int newWidth = event.data1; - int newHeight = event.data2; - bool recenter = event.padding3 == 1; - - if (recenter) - { - int display = SDL_GetWindowDisplayIndex(win); - if (display >= 0) - { - SDL_DisplayMode dm; - SDL_GetDesktopDisplayMode(display, &dm); - int newX = (dm.w - newWidth) / 2; - int newY = (dm.h - newHeight) / 2; - - SDL_SetWindowPosition(win, newX, newY); - } - } - - SDL_SetWindowSize(win, newWidth, newHeight); -} - EventThread::EventThread() : fullscreen(false), showCursor(false) @@ -217,9 +184,6 @@ void EventThread::process(RGSSThreadData &rtData) { case SDL_MOUSEBUTTONDOWN : case SDL_MOUSEBUTTONUP : - if (event.button.button == 8 || event.button.button == 9) - event.button.button -= (8 - SDL_BUTTON_X1); - case SDL_MOUSEMOTION : if (event.button.which == SDL_TOUCH_MOUSEID) continue; @@ -416,11 +380,6 @@ void EventThread::process(RGSSThreadData &rtData) updateCursorState(cursorInWindow, gameScreen); break; - case SDL_MOUSEWHEEL : - /* Only consider vertical scrolling for now */ - SDL_AtomicAdd(&verticalScrollDistance, event.wheel.y); - break; - case SDL_FINGERDOWN : i = event.tfinger.fingerId; touchState.fingers[i].down = true; @@ -445,7 +404,7 @@ void EventThread::process(RGSSThreadData &rtData) break; case REQUEST_WINRESIZE : - handleResizeRequest(win, event.window); + SDL_SetWindowSize(win, event.window.data1, event.window.data2); break; case REQUEST_MESSAGEBOX : @@ -461,14 +420,6 @@ void EventThread::process(RGSSThreadData &rtData) updateCursorState(cursorInWindow, gameScreen); break; - case REQUEST_WINMAXIMIZE : - SDL_MaximizeWindow(win); - break; - - case REQUEST_WINRESTORE : - SDL_RestoreWindow(win); - break; - case UPDATE_FPS : if (rtData.config.printFPS) Debug() << "FPS:" << event.user.code; @@ -624,25 +575,12 @@ void EventThread::requestFullscreenMode(bool mode) SDL_PushEvent(&event); } -void EventThread::requestWindowResize(int width, int height, bool recenter) +void EventThread::requestWindowResize(int width, int height) { SDL_Event event; event.type = usrIdStart + REQUEST_WINRESIZE; - writeResizeRequest(event.window, width, height, recenter); - SDL_PushEvent(&event); -} - -void EventThread::requestWindowMaximize() -{ - SDL_Event event; - event.type = usrIdStart + REQUEST_WINMAXIMIZE; - SDL_PushEvent(&event); -} - -void EventThread::requestWindowRestore() -{ - SDL_Event event; - event.type = usrIdStart + REQUEST_WINRESTORE; + event.window.data1 = width; + event.window.data2 = height; SDL_PushEvent(&event); } diff --git a/src/eventthread.h b/src/eventthread.h index 88d3f98..0c57f2d 100644 --- a/src/eventthread.h +++ b/src/eventthread.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -31,7 +31,6 @@ #include #include #include -#include #include @@ -77,7 +76,6 @@ public: static JoyState joyState; static MouseState mouseState; static TouchState touchState; - static SDL_atomic_t verticalScrollDistance; static bool allocUserEvents(); @@ -88,9 +86,7 @@ public: /* Called from RGSS thread */ void requestFullscreenMode(bool mode); - void requestWindowResize(int width, int height, bool recenter = false); - void requestWindowMaximize(); - void requestWindowRestore(); + void requestWindowResize(int width, int height); void requestShowCursor(bool mode); void requestTerminate(); diff --git a/src/exception.h b/src/exception.h index 6f95b60..94961a6 100644 --- a/src/exception.h +++ b/src/exception.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/filesystem.cpp b/src/filesystem.cpp index 60f050b..5be8f83 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/filesystem.h b/src/filesystem.h index b4376a1..71cdb1b 100644 --- a/src/filesystem.h +++ b/src/filesystem.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/flashable.h b/src/flashable.h index 6876104..d0a9f0c 100644 --- a/src/flashable.h +++ b/src/flashable.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/font.cpp b/src/font.cpp index 830c19a..b9698dd 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/font.h b/src/font.h index d514836..5341974 100644 --- a/src/font.h +++ b/src/font.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-debug.cpp b/src/gl-debug.cpp index d193c97..46e04b3 100644 --- a/src/gl-debug.cpp +++ b/src/gl-debug.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-debug.h b/src/gl-debug.h index 5a7065b..a37e2ba 100644 --- a/src/gl-debug.h +++ b/src/gl-debug.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-fun.cpp b/src/gl-fun.cpp index dd11458..a26419f 100644 --- a/src/gl-fun.cpp +++ b/src/gl-fun.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-fun.h b/src/gl-fun.h index 64f8457..c9bd148 100644 --- a/src/gl-fun.h +++ b/src/gl-fun.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-meta.cpp b/src/gl-meta.cpp index 8dd3af5..2b930b5 100644 --- a/src/gl-meta.cpp +++ b/src/gl-meta.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-meta.h b/src/gl-meta.h index fd8cf8a..52315ba 100644 --- a/src/gl-meta.h +++ b/src/gl-meta.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/gl-util.h b/src/gl-util.h index 945af78..3411683 100644 --- a/src/gl-util.h +++ b/src/gl-util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/global-ibo.h b/src/global-ibo.h index 5781fbc..0604070 100644 --- a/src/global-ibo.h +++ b/src/global-ibo.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/glstate.cpp b/src/glstate.cpp index 59a2ee8..0fbcdc6 100644 --- a/src/glstate.cpp +++ b/src/glstate.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -119,7 +119,7 @@ GLState::GLState(const Config &conf) blendMode.init(BlendNormal); blend.init(true); scissorTest.init(false); - scissorBox.init(IntRect()); + scissorBox.init(IntRect(0, 0, 640, 480)); program.init(0); if (conf.maxTextureSize > 0) diff --git a/src/glstate.h b/src/glstate.h index f624408..7d68da5 100644 --- a/src/glstate.h +++ b/src/glstate.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/graphics.cpp b/src/graphics.cpp index 80e7340..5e2c2f8 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -152,7 +152,6 @@ public: pp.startRender(); glState.viewport.set(IntRect(0, 0, w, h)); - glState.scissorBox.pushSet(IntRect(0, 0, w, h)); FBO::clear(); @@ -167,8 +166,6 @@ public: brightnessQuad.draw(); } - - glState.scissorBox.pop(); } void requestViewportRender(const Vec4 &c, const Vec4 &f, const Vec4 &t) @@ -558,6 +555,7 @@ struct GraphicsPrivate scOffset.y = (winSize.y - scRes.y * integerScaleFactor.y) / 2; scSize = Vec2i(scRes.x * integerScaleFactor.x, scRes.y * integerScaleFactor.y); + Debug() << scOffset.x << scOffset.y << winSize.x << winSize.y << integerScaleFactor.x << integerScaleFactor.y; return; } @@ -580,6 +578,8 @@ struct GraphicsPrivate while (base * scale <= target) scale += 1; + Debug() << base << target << scale - 1; + return scale - 1; } @@ -1066,8 +1066,8 @@ int Graphics::height() const void Graphics::resizeScreen(int width, int height) { - width = std::max(1, width); - height = std::max(1, height); + width = clamp(width, 1, 640); + height = clamp(height, 1, 480); Vec2i size(width, height); diff --git a/src/graphics.h b/src/graphics.h index 7edd601..940875d 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/input.cpp b/src/input.cpp index e58963d..5bcc850 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -28,13 +28,12 @@ #include #include -#include #include #include #include -#define BUTTON_CODE_COUNT 26 +#define BUTTON_CODE_COUNT 24 struct ButtonState { @@ -237,7 +236,7 @@ static const int mapToIndex[] = 0, 16, 17, 18, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 22, 23, 24, 25 + 21, 22, 23 }; static elementsN(mapToIndex); @@ -288,9 +287,6 @@ struct InputPrivate Input::ButtonCode repeating; unsigned int repeatCount; - /* Cumulative vertical scroll distance since last update call */ - int vScrollDistance; - struct { int active; @@ -326,8 +322,6 @@ struct InputPrivate dir4Data.previous = Input::None; dir8Data.active = 0; - - vScrollDistance = 0; } inline ButtonState &getStateCheck(int code) @@ -465,14 +459,12 @@ struct InputPrivate void initMsBindings() { - msBindings.resize(5); + msBindings.resize(3); size_t i = 0; msBindings[i++] = MsBinding(SDL_BUTTON_LEFT, Input::MouseLeft); msBindings[i++] = MsBinding(SDL_BUTTON_MIDDLE, Input::MouseMiddle); msBindings[i++] = MsBinding(SDL_BUTTON_RIGHT, Input::MouseRight); - msBindings[i++] = MsBinding(SDL_BUTTON_X1, Input::MouseX1); - msBindings[i++] = MsBinding(SDL_BUTTON_X2, Input::MouseX2); } void pollBindings(Input::ButtonCode &repeatCand) @@ -648,9 +640,6 @@ void Input::update() } p->repeating = None; - - /* Fetch new cumulative scroll distance and reset counter */ - p->vScrollDistance = SDL_AtomicSet(&EventThread::verticalScrollDistance, 0); } bool Input::isPressed(int button) @@ -692,11 +681,6 @@ int Input::mouseY() return (EventThread::mouseState.y - rtData.screenOffset.y) * rtData.sizeResoRatio.y; } -int Input::scrollV() -{ - return p->vScrollDistance; -} - Input::~Input() { delete p; diff --git a/src/input.h b/src/input.h index 8f83dfd..1daede7 100644 --- a/src/input.h +++ b/src/input.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -43,8 +43,7 @@ public: F5 = 25, F6 = 26, F7 = 27, F8 = 28, F9 = 29, /* Non-standard extensions */ - MouseLeft = 38, MouseMiddle = 39, MouseRight = 40, - MouseX1 = 41, MouseX2 = 42 + MouseLeft = 38, MouseMiddle = 39, MouseRight = 40 }; void update(); @@ -59,7 +58,6 @@ public: /* Non-standard extensions */ int mouseX(); int mouseY(); - int scrollV(); private: Input(const RGSSThreadData &rtData); diff --git a/src/intrulist.h b/src/intrulist.h index 6e087cd..e02ea40 100644 --- a/src/intrulist.h +++ b/src/intrulist.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/keybindings.cpp b/src/keybindings.cpp index 46ff471..40962f7 100644 --- a/src/keybindings.cpp +++ b/src/keybindings.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/keybindings.h b/src/keybindings.h index cef4e8d..63f3acb 100644 --- a/src/keybindings.h +++ b/src/keybindings.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index 3902970..648595b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -41,6 +41,10 @@ #include "binding.h" #ifdef __WINDOWS__ +#include +#include +#include + #include "resource.h" // Try to force dedicated GPU @@ -204,6 +208,16 @@ int main(int argc, char *argv[]) SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); // SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); +#ifdef __WINDOWS__ + SetProcessDPIAware(); +// HRESULT hr = SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE); +// if (FAILED(hr)) +// { +// _com_error err(hr); +// fwprintf(stderr, L"SetProcessDpiAwareness: %s\n", err.ErrorMessage()); +// } +#endif + /* initialize SDL first */ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { diff --git a/src/midisource.cpp b/src/midisource.cpp index 431f07d..9f98b50 100644 --- a/src/midisource.cpp +++ b/src/midisource.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/plane.cpp b/src/plane.cpp index 58cb165..f2c0d43 100644 --- a/src/plane.cpp +++ b/src/plane.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/plane.h b/src/plane.h index 70ff590..9350eb3 100644 --- a/src/plane.h +++ b/src/plane.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/quad.h b/src/quad.h index d200c6b..77995c6 100644 --- a/src/quad.h +++ b/src/quad.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/quadarray.h b/src/quadarray.h index 2d9e6cc..bf9778d 100644 --- a/src/quadarray.h +++ b/src/quadarray.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/rgssad.cpp b/src/rgssad.cpp index edbdd8e..b4a0b99 100644 --- a/src/rgssad.cpp +++ b/src/rgssad.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/rgssad.h b/src/rgssad.h index 8484804..ab130de 100644 --- a/src/rgssad.h +++ b/src/rgssad.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/scene.cpp b/src/scene.cpp index 21760aa..20190a7 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/scene.h b/src/scene.h index 0353e6a..1040aa6 100644 --- a/src/scene.h +++ b/src/scene.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sdlsoundsource.cpp b/src/sdlsoundsource.cpp index 83bda06..7ffd7c3 100644 --- a/src/sdlsoundsource.cpp +++ b/src/sdlsoundsource.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/serial-util.h b/src/serial-util.h index 45a6bde..1b8d372 100644 --- a/src/serial-util.h +++ b/src/serial-util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/serializable.h b/src/serializable.h index 65891d5..6ab5919 100644 --- a/src/serializable.h +++ b/src/serializable.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp index 6d66d3a..694240c 100644 --- a/src/settingsmenu.cpp +++ b/src/settingsmenu.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/settingsmenu.h b/src/settingsmenu.h index a614192..e972ade 100644 --- a/src/settingsmenu.h +++ b/src/settingsmenu.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/shader.cpp b/src/shader.cpp index 076eb74..14a13ab 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/shader.h b/src/shader.h index b399527..028bb59 100644 --- a/src/shader.h +++ b/src/shader.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sharedmidistate.h b/src/sharedmidistate.h index f1fb35a..4fd7c08 100644 --- a/src/sharedmidistate.h +++ b/src/sharedmidistate.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sharedstate.cpp b/src/sharedstate.cpp index 7bf6343..6f22214 100644 --- a/src/sharedstate.cpp +++ b/src/sharedstate.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sharedstate.h b/src/sharedstate.h index 827afaf..f2d51b4 100644 --- a/src/sharedstate.h +++ b/src/sharedstate.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/soundemitter.cpp b/src/soundemitter.cpp index 75f1b38..7a3abd4 100644 --- a/src/soundemitter.cpp +++ b/src/soundemitter.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/soundemitter.h b/src/soundemitter.h index 1545b85..338e144 100644 --- a/src/soundemitter.h +++ b/src/soundemitter.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sprite.cpp b/src/sprite.cpp index 292ea0f..8afad1c 100644 --- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/sprite.h b/src/sprite.h index 84b73f2..91c024a 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/table.cpp b/src/table.cpp index 306c072..c46313f 100644 --- a/src/table.cpp +++ b/src/table.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/table.h b/src/table.h index 4583b54..c63ddc7 100644 --- a/src/table.h +++ b/src/table.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/texpool.cpp b/src/texpool.cpp index 37aab8b..2094585 100644 --- a/src/texpool.cpp +++ b/src/texpool.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/texpool.h b/src/texpool.h index e289840..51d4bfd 100644 --- a/src/texpool.h +++ b/src/texpool.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tileatlas.cpp b/src/tileatlas.cpp index c79398c..53c0a73 100644 --- a/src/tileatlas.cpp +++ b/src/tileatlas.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tileatlas.h b/src/tileatlas.h index 4959501..0a3fcdd 100644 --- a/src/tileatlas.h +++ b/src/tileatlas.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tileatlasvx.cpp b/src/tileatlasvx.cpp index 116fc30..7fc1222 100644 --- a/src/tileatlasvx.cpp +++ b/src/tileatlasvx.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tileatlasvx.h b/src/tileatlasvx.h index e03017a..af6ffb1 100644 --- a/src/tileatlasvx.h +++ b/src/tileatlasvx.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilemap-common.h b/src/tilemap-common.h index 7c290e8..e49ec39 100644 --- a/src/tilemap-common.h +++ b/src/tilemap-common.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 1c3bb77..30257da 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilemap.h b/src/tilemap.h index 91abbdc..bb74459 100644 --- a/src/tilemap.h +++ b/src/tilemap.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilemapvx.cpp b/src/tilemapvx.cpp index d20f3b3..4abcb5a 100644 --- a/src/tilemapvx.cpp +++ b/src/tilemapvx.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilemapvx.h b/src/tilemapvx.h index 17f1ed8..e28c9c3 100644 --- a/src/tilemapvx.h +++ b/src/tilemapvx.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilequad.cpp b/src/tilequad.cpp index accf297..76e5118 100644 --- a/src/tilequad.cpp +++ b/src/tilequad.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/tilequad.h b/src/tilequad.h index 96e3d71..2360681 100644 --- a/src/tilequad.h +++ b/src/tilequad.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/transform.h b/src/transform.h index 6493bb4..12c529a 100644 --- a/src/transform.h +++ b/src/transform.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. It is based on parts of "SFML 2.0" (license further below) ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/util.h b/src/util.h index 661cd9d..31d4099 100644 --- a/src/util.h +++ b/src/util.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/vertex.cpp b/src/vertex.cpp index 59714a6..17283d4 100644 --- a/src/vertex.cpp +++ b/src/vertex.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/vertex.h b/src/vertex.h index 94dfe14..b448d2d 100644 --- a/src/vertex.h +++ b/src/vertex.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/viewport.cpp b/src/viewport.cpp index ce17746..8549465 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/viewport.h b/src/viewport.h index 65e176c..515d25d 100644 --- a/src/viewport.h +++ b/src/viewport.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/vorbissource.cpp b/src/vorbissource.cpp index d6deeea..e283127 100644 --- a/src/vorbissource.cpp +++ b/src/vorbissource.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/window.cpp b/src/window.cpp index 90ea14c..a06322f 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/window.h b/src/window.h index 60d147e..349b5a3 100644 --- a/src/window.h +++ b/src/window.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2013 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/windowvx.cpp b/src/windowvx.cpp index 05d629d..b4acfa6 100644 --- a/src/windowvx.cpp +++ b/src/windowvx.cpp @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/windowvx.h b/src/windowvx.h index 08f237f..8fa40ca 100644 --- a/src/windowvx.h +++ b/src/windowvx.h @@ -3,7 +3,7 @@ ** ** This file is part of mkxp. ** -** Copyright (C) 2014 - 2021 Amaryllis Kulla +** Copyright (C) 2021 Amaryllis Kulla ** ** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/windows/mkxp.exe.manifest b/windows/mkxp.exe.manifest deleted file mode 100644 index 03dfda3..0000000 --- a/windows/mkxp.exe.manifest +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - true - - PerMonitorV2 - - - - diff --git a/windows/resource.h b/windows/resource.h index c4e9734..32015bd 100644 --- a/windows/resource.h +++ b/windows/resource.h @@ -1,2 +1 @@ -#define IDI_MANIFEST 1 #define IDI_APPICON 101 diff --git a/windows/resource.rc b/windows/resource.rc index 8df8d01..293e38d 100644 --- a/windows/resource.rc +++ b/windows/resource.rc @@ -1,6 +1,4 @@ #include -#include #include "resource.h" -IDI_MANIFEST RT_MANIFEST "mkxp.exe.manifest" IDI_APPICON ICON "icon.ico"