From ad3bdaf826b08ebc400483ec1888afd28def2068 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Tue, 8 Oct 2019 15:46:47 +0300 Subject: [PATCH] switched to GPLv3 ONLY, because i don't trust FSF anymore --- gaem/anal/ass.d | 3 +-- gaem/anal/package.d | 3 +-- gaem/anal/uninit.d | 3 +-- gaem/anal/utils.d | 3 +-- gaem/anal/vars.d | 3 +-- gaem/anal/withloop.d | 3 +-- gaem/parser/ast.d | 3 +-- gaem/parser/astools.d | 3 +-- gaem/parser/gentokens.d | 6 ++---- gaem/parser/lexer.d | 3 +-- gaem/parser/package.d | 3 +-- gaem/parser/parser.d | 3 +-- gaem/parser/tokens.d | 3 +-- gaem/parser/utils.d | 3 +-- gaem/runner/compiler.d | 3 +-- gaem/runner/objects.d | 3 +-- gaem/runner/opcodes.d | 3 +-- gaem/runner/package.d | 3 +-- gaem/runner/sprites.d | 3 +-- gaem/runner/strpool.d | 3 +-- gaem/runner/value.d | 3 +-- gaem/runner/vm.d | 3 +-- gaem/ungmk/package.d | 3 +-- gaem/utils/cliarg.d | 3 +-- gaem/utils/loader.d | 3 +-- gaem/utils/package.d | 3 +-- ung.d | 13 +++++++++---- 27 files changed, 36 insertions(+), 58 deletions(-) diff --git a/gaem/anal/ass.d b/gaem/anal/ass.d index 7ccb328..48c2e86 100644 --- a/gaem/anal/ass.d +++ b/gaem/anal/ass.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/anal/package.d b/gaem/anal/package.d index 8a0b3db..a19cbb0 100644 --- a/gaem/anal/package.d +++ b/gaem/anal/package.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/anal/uninit.d b/gaem/anal/uninit.d index 88577b9..7216283 100644 --- a/gaem/anal/uninit.d +++ b/gaem/anal/uninit.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/anal/utils.d b/gaem/anal/utils.d index a9a331c..692031f 100644 --- a/gaem/anal/utils.d +++ b/gaem/anal/utils.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/anal/vars.d b/gaem/anal/vars.d index ad8108a..2afbed5 100644 --- a/gaem/anal/vars.d +++ b/gaem/anal/vars.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/anal/withloop.d b/gaem/anal/withloop.d index cef338d..0f730d1 100644 --- a/gaem/anal/withloop.d +++ b/gaem/anal/withloop.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/ast.d b/gaem/parser/ast.d index 8e1f87f..e89d9dd 100644 --- a/gaem/parser/ast.d +++ b/gaem/parser/ast.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/astools.d b/gaem/parser/astools.d index ea77ef6..1472cd9 100644 --- a/gaem/parser/astools.d +++ b/gaem/parser/astools.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/gentokens.d b/gaem/parser/gentokens.d index e699350..70b8260 100644 --- a/gaem/parser/gentokens.d +++ b/gaem/parser/gentokens.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -145,8 +144,7 @@ fo.writeln(`/* GML parser * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/lexer.d b/gaem/parser/lexer.d index 985df2f..3da0db8 100644 --- a/gaem/parser/lexer.d +++ b/gaem/parser/lexer.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/package.d b/gaem/parser/package.d index 3c8fedd..dd17681 100644 --- a/gaem/parser/package.d +++ b/gaem/parser/package.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/parser.d b/gaem/parser/parser.d index ca3ed85..b309ded 100644 --- a/gaem/parser/parser.d +++ b/gaem/parser/parser.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/tokens.d b/gaem/parser/tokens.d index 3f72dee..602d082 100644 --- a/gaem/parser/tokens.d +++ b/gaem/parser/tokens.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/parser/utils.d b/gaem/parser/utils.d index 6265d1d..261ed7f 100644 --- a/gaem/parser/utils.d +++ b/gaem/parser/utils.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/compiler.d b/gaem/runner/compiler.d index 1eedafc..7330ffe 100644 --- a/gaem/runner/compiler.d +++ b/gaem/runner/compiler.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/objects.d b/gaem/runner/objects.d index c670645..58a7d90 100644 --- a/gaem/runner/objects.d +++ b/gaem/runner/objects.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/opcodes.d b/gaem/runner/opcodes.d index 483ce2c..faf39e8 100644 --- a/gaem/runner/opcodes.d +++ b/gaem/runner/opcodes.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/package.d b/gaem/runner/package.d index 862f24a..3daa5d5 100644 --- a/gaem/runner/package.d +++ b/gaem/runner/package.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/sprites.d b/gaem/runner/sprites.d index 41f55de..1913fff 100644 --- a/gaem/runner/sprites.d +++ b/gaem/runner/sprites.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/strpool.d b/gaem/runner/strpool.d index c6fd39e..4666303 100644 --- a/gaem/runner/strpool.d +++ b/gaem/runner/strpool.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/value.d b/gaem/runner/value.d index 22911ec..e27c100 100644 --- a/gaem/runner/value.d +++ b/gaem/runner/value.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/runner/vm.d b/gaem/runner/vm.d index 8ce1b40..fef5315 100644 --- a/gaem/runner/vm.d +++ b/gaem/runner/vm.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/ungmk/package.d b/gaem/ungmk/package.d index a0b2446..2aad997 100644 --- a/gaem/ungmk/package.d +++ b/gaem/ungmk/package.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/utils/cliarg.d b/gaem/utils/cliarg.d index 18f3127..e92b40a 100644 --- a/gaem/utils/cliarg.d +++ b/gaem/utils/cliarg.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/utils/loader.d b/gaem/utils/loader.d index 46d6583..8b459d2 100644 --- a/gaem/utils/loader.d +++ b/gaem/utils/loader.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gaem/utils/package.d b/gaem/utils/package.d index 5ec5cbc..d94b4da 100644 --- a/gaem/utils/package.d +++ b/gaem/utils/package.d @@ -4,8 +4,7 @@ * * This program 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 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/ung.d b/ung.d index 168ec65..c6e26ac 100644 --- a/ung.d +++ b/ung.d @@ -322,8 +322,13 @@ void exportRoom (Gmk gmk, GMRoom o, string dir) { fo.writeln; foreach (immutable idx, ref i; o.insts) { //fo.writeln; - fo.writefln("inst%s=%s %s %s", idx, gmk.objByNum(i.objidx).name, i.x, i.y); - //fo.writefln("inst%s_id=%s", idx, i.id); // starting from 100000 + auto oo = gmk.objByNum(i.objidx); + if (oo) { + fo.writefln("inst%s=%s %s %s", idx, gmk.objByNum(i.objidx).name, i.x, i.y); + //fo.writefln("inst%s_id=%s", idx, i.id); // starting from 100000 + } else { + fo.writefln("inst%s=%s %s %s", idx, "", i.x, i.y); + } if (i.locked) fo.writefln("inst%s_locked=%s", idx, i.locked); if (i.createcode.strip.length) assert(0); } @@ -331,9 +336,9 @@ void exportRoom (Gmk gmk, GMRoom o, string dir) { } -void main () { +void main (string[] args) { import std.path : buildPath; - auto gmk = new Gmk("/home/ketmar/back/D/prj/spel/spelunky_collection/yasmk8/yasm_k8.gmk"); + auto gmk = new Gmk(args.length > 1 ? args[1] : "/home/ketmar/back/D/prj/spel/spelunky_collection/yasmk8/yasm_k8.gmk"); gmk.forEachObject((o) { auto path = gmk.tree.pathForName(GMResTree.Node.Type.Object, o.name); -- 2.11.4.GIT