From e88bddbdbf227bb4204026761bbfacdb0b9895e3 Mon Sep 17 00:00:00 2001 From: ref-err Date: Fri, 31 Jul 2026 21:47:58 +0500 Subject: [PATCH] fix crash on game exit and some ruby fixes idk and also sdl unfree's your copyright notice --- binding-mri/audio-binding.cpp | 2 +- binding-mri/binding-mri.cpp | 22 ++++++++++++++++++++-- binding-mri/binding-util.cpp | 2 +- binding-mri/bitmap-binding.cpp | 2 +- binding-mri/etc-binding.cpp | 2 +- binding-mri/filesystem-binding.cpp | 2 +- binding-mri/font-binding.cpp | 2 +- binding-mri/graphics-binding.cpp | 2 +- binding-mri/input-binding.cpp | 2 +- binding-mri/plane-binding.cpp | 2 +- binding-mri/sprite-binding.cpp | 2 +- binding-mri/table-binding.cpp | 2 +- binding-mri/tilemap-binding.cpp | 2 +- binding-mri/viewport-binding.cpp | 2 +- binding-mri/window-binding.cpp | 2 +- changelogs/0.1.2.txt | 2 +- src/alstream.cpp | 2 +- src/audio.cpp | 2 +- src/audiostream.cpp | 2 +- src/bitmap.cpp | 2 +- src/config.cpp | 2 +- src/etc.cpp | 2 +- src/filesystem.cpp | 2 +- src/font.cpp | 2 +- src/gl-debug.cpp | 2 +- src/gl-fun.cpp | 2 +- src/gl-meta.cpp | 2 +- src/glstate.cpp | 2 +- src/input.cpp | 2 +- src/keybindings.cpp | 2 +- src/main.cpp | 3 +-- src/meow.cpp | 2 +- src/plane.cpp | 2 +- src/rgssad.cpp | 2 +- src/scene.cpp | 2 +- src/sdlsoundsource.cpp | 2 +- src/shader.cpp | 2 +- src/sharedstate.cpp | 2 +- src/soundemitter.cpp | 4 ++-- src/sprite.cpp | 2 +- src/table.cpp | 2 +- src/texpool.cpp | 2 +- src/tileatlas.cpp | 2 +- src/tilemap.cpp | 2 +- src/tilequad.cpp | 2 +- src/vertex.cpp | 2 +- src/viewport.cpp | 2 +- src/vorbissource.cpp | 2 +- src/window.cpp | 2 +- src/xdg-user-dir-lookup.c | 2 +- 50 files changed, 70 insertions(+), 53 deletions(-) diff --git a/binding-mri/audio-binding.cpp b/binding-mri/audio-binding.cpp index 541600b..1de027b 100644 --- a/binding-mri/audio-binding.cpp +++ b/binding-mri/audio-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp index a08c0cd..f70b5db 100644 --- a/binding-mri/binding-mri.cpp +++ b/binding-mri/binding-mri.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. @@ -21,6 +21,8 @@ #include "binding.h" #include "binding-util.h" +#include "ruby/internal/eval.h" +#include "ruby/internal/memory.h" #include "sharedstate.h" #include "eventthread.h" #include "filesystem.h" @@ -34,6 +36,7 @@ #include "sunshine.h" #include "modloader.h" +#include #include #include #include @@ -97,6 +100,7 @@ static void tp_cb(VALUE tpval, void *data) { } extern const char binding_mri_module_rpg1_rb[]; +extern const int binding_mri_module_rpg1_rb_len; static void mriBindingExecute(); static void mriBindingTerminate(); @@ -193,7 +197,13 @@ static void mriBindingInit(){ rb_define_alias(rb_singleton_class(rb_mKernel), "_mkxp_kernel_caller_alias", "caller"); _rb_define_module_function(rb_mKernel, "caller", _kernelCaller); - rb_eval_string(binding_mri_module_rpg1_rb); + char *script = (char*)SDL_malloc(binding_mri_module_rpg1_rb_len + 1); + SDL_memcpy(script, binding_mri_module_rpg1_rb, binding_mri_module_rpg1_rb_len); + script[binding_mri_module_rpg1_rb_len] = '\0'; + + rb_eval_string(script); + + SDL_free(script); VALUE mod = rb_define_module("MKXP"); _rb_define_module_function(mod, "data_directory", mkxpDataDirectory); @@ -466,6 +476,8 @@ static void runRMXPScripts(BacktraceData &btData){ VALUE scriptDecoded = rb_ary_entry(script, 3); VALUE string = newStringUTF8(RSTRING_PTR(scriptDecoded), RSTRING_LEN(scriptDecoded)); + rb_gc_register_address(&string); + VALUE fname; const char *scriptName = RSTRING_PTR(rb_ary_entry(script, 1)); char buf[512]; @@ -474,9 +486,15 @@ static void runRMXPScripts(BacktraceData &btData){ len = SDL_snprintf(buf, sizeof(buf), "%03ld:%s", i, scriptName); fname = newStringUTF8(buf, len); + rb_gc_register_address(&fname); + btData.scriptNames.insert(buf, scriptName); int state; evalString(string, fname, &state); + + rb_gc_unregister_address(&fname); + rb_gc_unregister_address(&string); + if (state) break; } diff --git a/binding-mri/binding-util.cpp b/binding-mri/binding-util.cpp index 568b897..8342602 100644 --- a/binding-mri/binding-util.cpp +++ b/binding-mri/binding-util.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/bitmap-binding.cpp b/binding-mri/bitmap-binding.cpp index 64a32ad..58ef3e1 100644 --- a/binding-mri/bitmap-binding.cpp +++ b/binding-mri/bitmap-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/etc-binding.cpp b/binding-mri/etc-binding.cpp index d5b1071..c33d8c2 100644 --- a/binding-mri/etc-binding.cpp +++ b/binding-mri/etc-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/filesystem-binding.cpp b/binding-mri/filesystem-binding.cpp index 98137ee..413e600 100644 --- a/binding-mri/filesystem-binding.cpp +++ b/binding-mri/filesystem-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/font-binding.cpp b/binding-mri/font-binding.cpp index 14f59c0..8ad5d23 100644 --- a/binding-mri/font-binding.cpp +++ b/binding-mri/font-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/graphics-binding.cpp b/binding-mri/graphics-binding.cpp index e0fe38c..581bf97 100644 --- a/binding-mri/graphics-binding.cpp +++ b/binding-mri/graphics-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/input-binding.cpp b/binding-mri/input-binding.cpp index 0f5fd8f..27feece 100644 --- a/binding-mri/input-binding.cpp +++ b/binding-mri/input-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/plane-binding.cpp b/binding-mri/plane-binding.cpp index 52257ba..adc909e 100644 --- a/binding-mri/plane-binding.cpp +++ b/binding-mri/plane-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/sprite-binding.cpp b/binding-mri/sprite-binding.cpp index c8e8eef..7c53441 100644 --- a/binding-mri/sprite-binding.cpp +++ b/binding-mri/sprite-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/table-binding.cpp b/binding-mri/table-binding.cpp index ebbb0d9..1560515 100644 --- a/binding-mri/table-binding.cpp +++ b/binding-mri/table-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/tilemap-binding.cpp b/binding-mri/tilemap-binding.cpp index 3b44cd4..74b0d00 100644 --- a/binding-mri/tilemap-binding.cpp +++ b/binding-mri/tilemap-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/viewport-binding.cpp b/binding-mri/viewport-binding.cpp index 4d2aa84..d694d85 100644 --- a/binding-mri/viewport-binding.cpp +++ b/binding-mri/viewport-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/binding-mri/window-binding.cpp b/binding-mri/window-binding.cpp index e29c40f..a8cf07e 100644 --- a/binding-mri/window-binding.cpp +++ b/binding-mri/window-binding.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/changelogs/0.1.2.txt b/changelogs/0.1.2.txt index 9d68597..0a8900a 100644 --- a/changelogs/0.1.2.txt +++ b/changelogs/0.1.2.txt @@ -24,4 +24,4 @@ added icons and way to disable options in settings fixed segfault while to fast window size changing updated cg_blue picture Deleted useless hooks - +fix crash on game exit \ No newline at end of file diff --git a/src/alstream.cpp b/src/alstream.cpp index c7f82e3..5cc77de 100644 --- a/src/alstream.cpp +++ b/src/alstream.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/audio.cpp b/src/audio.cpp index 3d1e0ca..c2a6437 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/audiostream.cpp b/src/audiostream.cpp index f3da554..7c946fe 100644 --- a/src/audiostream.cpp +++ b/src/audiostream.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/bitmap.cpp b/src/bitmap.cpp index 614e657..4c335bf 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/config.cpp b/src/config.cpp index 62e10fa..91ad7db 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/etc.cpp b/src/etc.cpp index f30a998..127457b 100644 --- a/src/etc.cpp +++ b/src/etc.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/filesystem.cpp b/src/filesystem.cpp index e656fe1..6a2c8c2 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/font.cpp b/src/font.cpp index 0de1bee..8cc1f4b 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/gl-debug.cpp b/src/gl-debug.cpp index 3fa2512..59ca648 100644 --- a/src/gl-debug.cpp +++ b/src/gl-debug.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/gl-fun.cpp b/src/gl-fun.cpp index e28ab0a..20b5835 100644 --- a/src/gl-fun.cpp +++ b/src/gl-fun.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/gl-meta.cpp b/src/gl-meta.cpp index 7198eac..fc6ea6b 100644 --- a/src/gl-meta.cpp +++ b/src/gl-meta.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/glstate.cpp b/src/glstate.cpp index 56a84f7..a206b08 100644 --- a/src/glstate.cpp +++ b/src/glstate.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/input.cpp b/src/input.cpp index 8778a7f..0a01349 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/keybindings.cpp b/src/keybindings.cpp index 02d5287..a220f1f 100644 --- a/src/keybindings.cpp +++ b/src/keybindings.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/main.cpp b/src/main.cpp index c148ad0..7444034 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. @@ -272,7 +272,6 @@ int main(int argc, char *argv[]){ if (dataDir) { int result = chdir(dataDir); (void)result; - SDL_free((void*)dataDir); // SDL_GetBasePath returns a heap pointer; SDL_free expects void* } #endif diff --git a/src/meow.cpp b/src/meow.cpp index 708fc02..58a3b62 100644 --- a/src/meow.cpp +++ b/src/meow.cpp @@ -133,7 +133,7 @@ void crash(Exception::Type t, const char *fmt, ...){ o << "Emscripten start address of the stack: " << emscripten_stack_get_base() << std::endl; o << "Emscripten end address of the stack: " << emscripten_stack_get_end() << std::endl; o << "Emscripten current stack pointer: " << emscripten_stack_get_current() << std::endl; - o << "Emscripten number of SDL_free bytes left on stack: " << emscripten_stack_get_free() << std::endl; + o << "Emscripten number of free bytes left on stack: " << emscripten_stack_get_free() << std::endl; #elif __PSP__ o << "PSPdev MIPS Stack Trace: " << int pspDebugGetStackTrace() << std::endl; #endif diff --git a/src/plane.cpp b/src/plane.cpp index 047cf09..25b6ea7 100644 --- a/src/plane.cpp +++ b/src/plane.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/rgssad.cpp b/src/rgssad.cpp index 247512e..ab7671a 100644 --- a/src/rgssad.cpp +++ b/src/rgssad.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/scene.cpp b/src/scene.cpp index 3d83327..a1b61aa 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/sdlsoundsource.cpp b/src/sdlsoundsource.cpp index 5cf5c4f..0e67e23 100644 --- a/src/sdlsoundsource.cpp +++ b/src/sdlsoundsource.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/shader.cpp b/src/shader.cpp index ba58591..8b0609c 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/sharedstate.cpp b/src/sharedstate.cpp index 070eac3..a71e4de 100644 --- a/src/sharedstate.cpp +++ b/src/sharedstate.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/soundemitter.cpp b/src/soundemitter.cpp index 382dc93..811a2e0 100644 --- a/src/soundemitter.cpp +++ b/src/soundemitter.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. @@ -119,7 +119,7 @@ void SoundEmitter::play(const std::string &filename, int volume, int pitch) { if (!buffer) return; - /* Try to find first SDL_free source */ + /* Try to find first free source */ size_t i; for (i = 0; i < srcCount; ++i) if (AL::Source::getState(alSrcs[srcPrio[i]]) != AL_PLAYING) diff --git a/src/sprite.cpp b/src/sprite.cpp index dfd353f..ea02b89 100644 --- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/table.cpp b/src/table.cpp index 54b680a..5d1d9c0 100644 --- a/src/table.cpp +++ b/src/table.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/texpool.cpp b/src/texpool.cpp index 94ca0ea..a6e481f 100644 --- a/src/texpool.cpp +++ b/src/texpool.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/tileatlas.cpp b/src/tileatlas.cpp index db8931c..ff73043 100644 --- a/src/tileatlas.cpp +++ b/src/tileatlas.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 9b3f1eb..c813096 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/tilequad.cpp b/src/tilequad.cpp index d5816d0..c9d2429 100644 --- a/src/tilequad.cpp +++ b/src/tilequad.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/vertex.cpp b/src/vertex.cpp index 4ee8e00..d816fc9 100644 --- a/src/vertex.cpp +++ b/src/vertex.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/viewport.cpp b/src/viewport.cpp index 0ab4119..d2fcce8 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/vorbissource.cpp b/src/vorbissource.cpp index 956ee6f..d3c454c 100644 --- a/src/vorbissource.cpp +++ b/src/vorbissource.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2014 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/window.cpp b/src/window.cpp index 240ec7d..f58d3f2 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -5,7 +5,7 @@ ** ** Copyright (C) 2013 Jonas Kulla ** -** mkxp is SDL_free software: you can redistribute it and/or modify +** mkxp is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 2 of the License, or ** (at your option) any later version. diff --git a/src/xdg-user-dir-lookup.c b/src/xdg-user-dir-lookup.c index 572d60a..b8ce798 100644 --- a/src/xdg-user-dir-lookup.c +++ b/src/xdg-user-dir-lookup.c @@ -4,7 +4,7 @@ Copyright (c) 2007 Red Hat, Inc. - Permission is hereby granted, SDL_free of charge, to any person + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge,