actually print height too

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
 

binding-mri/audio-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/binding-mri.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/binding-types.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/binding-util.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/binding-util.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/bitmap-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -445,28 +445,6 @@ RB_METHOD(bitmapWriteToPng)
 	return self;
 }
 
-RB_METHOD(bitmapVFlip)
-{
-	RB_UNUSED_PARAM;
-
-	Bitmap *b = getPrivateData<Bitmap>(self);
-
-	b->vFlip();
-
-	return Qnil;
-}
-
-RB_METHOD(bitmapHFlip)
-{
-	RB_UNUSED_PARAM;
-
-	Bitmap *b = getPrivateData<Bitmap>(self);
-
-	b->hFlip();
-
-	return Qnil;
-}
-
 
 void
 bitmapBindingInit()
@@ -501,8 +479,6 @@ bitmapBindingInit()
 	}
 
 	_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");
 }

binding-mri/disposable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/etc-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/filesystem-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/flashable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/font-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/graphics-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -209,24 +209,6 @@ RB_METHOD(graphicsResizeWindow)
 	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)
@@ -286,6 +268,4 @@ void graphicsBindingInit()
 	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);
 }

binding-mri/input-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -156,9 +156,7 @@ static buttonCodes[] =
 
 	{ "MOUSELEFT",   Input::MouseLeft   },
 	{ "MOUSEMIDDLE", Input::MouseMiddle },
-	{ "MOUSERIGHT",  Input::MouseRight  },
-	{ "MOUSEX1",     Input::MouseX1     },
-	{ "MOUSEX2",     Input::MouseX2     }
+	{ "MOUSERIGHT",  Input::MouseRight  }
 };
 
 static elementsN(buttonCodes);

binding-mri/plane-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/sceneelement-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/serializable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/sprite-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/table-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/tilemap-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/tilemapvx-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/viewport-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/viewportelement-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/window-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mri/windowvx-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/audio-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/binding-mruby.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/binding-types.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/binding-util.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/binding-util.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/bitmap-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/disposable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/etc-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/flashable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/font-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/graphics-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/input-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/file.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/file.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/kernel.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/marshal.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/marshal.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/rwmem.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/rwmem.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/mrb-ext/time.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/plane-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/sceneelement-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/serializable-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/sprite-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/table-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/tilemap-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/viewport-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/viewportelement-binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-mruby/window-binding.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

binding-null/binding-null.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

doc/extension_doc.md

@@ -1,4 +1,3 @@
-
 # mkxp extenions for Dancing Dragon Games / Symphony of War
 
 ## Graphics.resize_window(width, height, recenter)
@@ -9,34 +8,17 @@ 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  
 
@@ -48,10 +30,5 @@ 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.

sources.def

@@ -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
-)

src/al-util.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/aldatasource.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/alstream.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/alstream.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/audio.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/audio.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/audiostream.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/audiostream.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/binding.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/bitmap.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -259,34 +259,6 @@ struct BitmapPrivate
 
 		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
@@ -942,8 +914,7 @@ Color Bitmap::getPixel(int x, int y) const
 	if (x < 0 || y < 0 || x >= width() || y >= height())
 		return Vec4();
 
-	if (!p->surface)
-		p->downloadToSurface();
+	p->downloadToSurface();
 
 	uint32_t pixel = getPixelAt(p->surface, p->format, x, y);
 
@@ -1438,22 +1409,6 @@ void Bitmap::writeToPng(const char *filename)
 	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;

src/bitmap.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -108,9 +108,6 @@ public:
 	/* extensions */
 	void writeToPng(const char *filename);
 
-	void vFlip();
-	void hFlip();
-
 	/* <internal> */
 	TEXFBO &getGLTypes();
 	SDL_Surface *megaSurface() const;

src/boost-hash.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/config.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/config.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/debugwriter.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/disposable.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/etc-internal.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/etc.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/etc.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/eventthread.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** 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 <string.h>
 
-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
 {
@@ -80,8 +80,6 @@ enum
 {
 	REQUEST_SETFULLSCREEN = 0,
 	REQUEST_WINRESIZE,
-	REQUEST_WINMAXIMIZE,
-	REQUEST_WINRESTORE,
 	REQUEST_MESSAGEBOX,
 	REQUEST_SETCURSORVISIBLE,
 
@@ -217,9 +215,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;
@@ -461,14 +456,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;
@@ -632,20 +619,6 @@ void EventThread::requestWindowResize(int width, int height, bool 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;
-	SDL_PushEvent(&event);
-}
-
 void EventThread::requestShowCursor(bool mode)
 {
 	SDL_Event event;

src/eventthread.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -89,8 +89,6 @@ public:
 	/* Called from RGSS thread */
 	void requestFullscreenMode(bool mode);
 	void requestWindowResize(int width, int height, bool recenter = false);
-	void requestWindowMaximize();
-	void requestWindowRestore();
 	void requestShowCursor(bool mode);
 
 	void requestTerminate();

src/exception.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/filesystem.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/filesystem.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/flashable.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/font.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/font.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-debug.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-debug.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-fun.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-fun.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-meta.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-meta.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/gl-util.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/global-ibo.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/glstate.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** 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)

src/glstate.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/graphics.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** 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)
@@ -629,6 +626,8 @@ struct GraphicsPrivate
 			/* Query the acutal size in pixels, not units */
 			SDL_GL_GetDrawableSize(threadData->window, &winSize.x, &winSize.y);
 
+			Debug() << "Reported drawable size:" << winSize.x << winSize.y;
+
 			/* Make sure integer buffers are rebuilt before screen offsets are
 			 * calculated so we have the final allocated buffer size ready */
 			if (integerScaleActive)

src/graphics.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/input.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <assert.h>
 
-#define BUTTON_CODE_COUNT 26
+#define BUTTON_CODE_COUNT 24
 
 struct ButtonState
 {
@@ -237,7 +237,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);
@@ -465,14 +465,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)

src/input.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** 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();

src/intrulist.h

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2013 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

src/keybindings.cpp

@@ -3,7 +3,7 @@
 **
 ** This file is part of mkxp.
 **
-** Copyright (C) 2014 - 2021 Amaryllis Kulla <ancurio@mapleshrine.eu>
+** Copyright (C) 2021 Amaryllis Kulla <amaryllis.kulla@protonmail.com>
 **
 ** mkxp is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by