From 223e209527d8a403597d51c728ae6de0af671bde Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:17:27 -0500 Subject: [PATCH 01/10] Expressions don't expand in single quotes, use double quotes for that. Single quotes prevent expansion of everything, including variables and command substitution. If you want to use the values of variables and such, use double quotes instead. --- attach-backtrace-scramble.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attach-backtrace-scramble.sh b/attach-backtrace-scramble.sh index 469cc44b..0c3fac7d 100755 --- a/attach-backtrace-scramble.sh +++ b/attach-backtrace-scramble.sh @@ -39,7 +39,7 @@ gdb -n -q -batch \ -ex "set \$dlopen = (void*(*)(char*, int)) dlopen" \ -ex "call \$dlopen(\"$FILENAME\", 1)" \ -ex "call dlerror()" \ - -ex 'print (char *) $2' \ + -ex "print (char *) $2" \ -ex "catch syscall exit exit_group" \ -ex "continue" \ -ex "backtrace" From 38fc62b9e7dc993ad256957d71b4bc9ac2096d43 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:20:11 -0500 Subject: [PATCH 02/10] Variable 'nextcrit' is reassigned a value before the old one has been used. --- src/crits.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/crits.cpp b/src/crits.cpp index 54ee3829..319a431f 100644 --- a/src/crits.cpp +++ b/src/crits.cpp @@ -226,8 +226,6 @@ void draw() { float nextcrit = ((float) number - (float) lastusercmd) / (float) 90; - nextcrit = - ((float) number - (float) lastusercmd) / (float) 90; if (nextcrit > 0.0f) { AddCenterString( From 6cddb175e218e3b0bf3d4f3dca420ceeeca86aa2 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:22:33 -0500 Subject: [PATCH 03/10] Identifier 'full_class_table' is not in camel case. When it comes to naming variables, styleguides generally fall into one of two camps: camelcase (variableName) and underscores (variable_name). This rule focuses on using the camelcase approach. If your styleguide calls for camelcasing your variable names, then this rule is for you! This rule looks for any underscores (_) located within the source code. It ignores leading and trailing underscores and only checks those in the middle of a variable name. If ESLint decides that the variable is a constant (all uppercase), then no warning will be thrown. Otherwise, a warning will be thrown. This rule only flags definitions and assignments but not function calls. --- class_dumping/generate-class-headers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class_dumping/generate-class-headers.js b/class_dumping/generate-class-headers.js index 479a3ade..512dea06 100755 --- a/class_dumping/generate-class-headers.js +++ b/class_dumping/generate-class-headers.js @@ -2,7 +2,7 @@ const fs = require("fs"); var full_class_table = {}; try { - full_class_table = JSON.parse(fs.readFileSync("full-class-table.json").toString()); + fullClassTable = JSON.parse(fs.readFileSync("full-class-table.json").toString()); } catch (e) {} const file = fs.readFileSync(process.argv[2]).toString().split("\n"); From 1026cc1d9c8df45e03a996fb64d1db9d9b457d81 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:24:17 -0500 Subject: [PATCH 04/10] More camelCase --- class_dumping/generate-class-headers.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/class_dumping/generate-class-headers.js b/class_dumping/generate-class-headers.js index 512dea06..d4ef237a 100755 --- a/class_dumping/generate-class-headers.js +++ b/class_dumping/generate-class-headers.js @@ -1,6 +1,6 @@ const fs = require("fs"); -var full_class_table = {}; +var fullClassTable = {}; try { fullClassTable = JSON.parse(fs.readFileSync("full-class-table.json").toString()); } catch (e) {} @@ -12,16 +12,16 @@ console.log("Generating info for", modname, "from", process.argv[2]); var classes = {}; for (var i in file) { - var class_info = /\[(\d+)\] (\w+)/gi.exec(file[i]); - if (class_info) { + var classInfo = /\[(\d+)\] (\w+)/gi.exec(file[i]); + if (classInfo) { full_class_table[class_info[2]] = true; - classes[class_info[2]] = parseInt(class_info[1]); + classes[classInfo[2]] = parseInt(class_info[1]); } } fs.writeFileSync("full-class-table.json", JSON.stringify(full_class_table)); -var header_constexpr = `/* +var headerConstexpr = `/* AUTO-GENERATED HEADER - DO NOT MODIFY CONSTEXPR HEADER FOR $mod */ @@ -52,7 +52,7 @@ namespace client_classes { for (var clz in full_class_table) { var value = "0"; if (classes[clz]) value = classes[clz]; - header_constexpr += "\t\tstatic constexpr int " + clz + " = " + value + ";\n"; + headerConstexpr += "\t\tstatic constexpr int " + clz + " = " + value + ";\n"; header += "\t\tint " + clz + " { " + value + " };\n"; } @@ -64,7 +64,7 @@ header += ` #endif /* $mod_AUTOGEN_HPP */`; -header_constexpr += ` +headerConstexpr += ` }; } From 208ea2478bad90fc7275a21f26fe94543ab02180 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:24:57 -0500 Subject: [PATCH 05/10] More camelCase --- class_dumping/generate-dummy-header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class_dumping/generate-dummy-header.js b/class_dumping/generate-dummy-header.js index 90a82f95..f0f425f4 100755 --- a/class_dumping/generate-dummy-header.js +++ b/class_dumping/generate-dummy-header.js @@ -2,7 +2,7 @@ const fs = require("fs"); var full_class_table = {}; try { - full_class_table = JSON.parse(fs.readFileSync("full-class-table.json").toString()); + fullClassTable = JSON.parse(fs.readFileSync("full-class-table.json").toString()); } catch (e) {} console.log("Generating dummy class header"); From 35953a18d0738122f9300c206745440b07fca12c Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:25:50 -0500 Subject: [PATCH 06/10] More camelCase --- class_dumping/generate-dynamic-header.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class_dumping/generate-dynamic-header.js b/class_dumping/generate-dynamic-header.js index 520cf2b2..07cafe4a 100755 --- a/class_dumping/generate-dynamic-header.js +++ b/class_dumping/generate-dynamic-header.js @@ -1,8 +1,8 @@ const fs = require("fs"); -var full_class_table = {}; +var fullClassTable = {}; try { - full_class_table = JSON.parse(fs.readFileSync("full-class-table.json").toString()); + fullClassTable = JSON.parse(fs.readFileSync("full-class-table.json").toString()); } catch (e) {} console.log("Generating dummy class header"); @@ -23,7 +23,7 @@ namespace client_classes { void Populate(); `; -for (var clz in full_class_table) { +for (var clz in fullClassTable) { header += "\t\tint " + clz + " { 0 };\n"; } From 72c672e31f23b75a21cacce9e8142d0344d5abb8 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:31:28 -0500 Subject: [PATCH 07/10] Moar camelCase --- class_dumping/generate-class-headers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class_dumping/generate-class-headers.js b/class_dumping/generate-class-headers.js index d4ef237a..a2df23c5 100755 --- a/class_dumping/generate-class-headers.js +++ b/class_dumping/generate-class-headers.js @@ -14,12 +14,12 @@ var classes = {}; for (var i in file) { var classInfo = /\[(\d+)\] (\w+)/gi.exec(file[i]); if (classInfo) { - full_class_table[class_info[2]] = true; + fullClassTable[class_info[2]] = true; classes[classInfo[2]] = parseInt(class_info[1]); } } -fs.writeFileSync("full-class-table.json", JSON.stringify(full_class_table)); +fs.writeFileSync("full-class-table.json", JSON.stringify(fullClassTable)); var headerConstexpr = `/* AUTO-GENERATED HEADER - DO NOT MODIFY @@ -49,7 +49,7 @@ namespace client_classes { public: `; -for (var clz in full_class_table) { +for (var clz in fullClassTable) { var value = "0"; if (classes[clz]) value = classes[clz]; headerConstexpr += "\t\tstatic constexpr int " + clz + " = " + value + ";\n"; From 4c313e811de12e0e10427e36d3fc1196ffd77922 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:35:22 -0500 Subject: [PATCH 08/10] More camelCase --- class_dumping/generate-class-headers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class_dumping/generate-class-headers.js b/class_dumping/generate-class-headers.js index a2df23c5..221ba683 100755 --- a/class_dumping/generate-class-headers.js +++ b/class_dumping/generate-class-headers.js @@ -14,8 +14,8 @@ var classes = {}; for (var i in file) { var classInfo = /\[(\d+)\] (\w+)/gi.exec(file[i]); if (classInfo) { - fullClassTable[class_info[2]] = true; - classes[classInfo[2]] = parseInt(class_info[1]); + fullClassTable[classInfo[2]] = true; + classes[classInfo[2]] = parseInt(classInfo[1]); } } @@ -71,7 +71,7 @@ headerConstexpr += ` #endif /* $mod_CONSTEXPR_AUTOGEN_HPP */`; fs.writeFileSync("include/classinfo/" + modname + ".gen.hpp", header.replace(/\$mod/g, modname)); -fs.writeFileSync("include/classinfo/" + modname + "_constexpr.gen.hpp", header_constexpr.replace(/\$mod/g, modname)); +fs.writeFileSync("include/classinfo/" + modname + "_constexpr.gen.hpp", headerConstexpr.replace(/\$mod/g, modname)); console.log(classes); From 76fefe6638a87181d1ebafa40a66d8686b3ee40b Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:35:59 -0500 Subject: [PATCH 09/10] More camelCase --- class_dumping/generate-dummy-header.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class_dumping/generate-dummy-header.js b/class_dumping/generate-dummy-header.js index f0f425f4..0faf65a7 100755 --- a/class_dumping/generate-dummy-header.js +++ b/class_dumping/generate-dummy-header.js @@ -1,12 +1,12 @@ const fs = require("fs"); -var full_class_table = {}; +var fullClassTable = {}; try { fullClassTable = JSON.parse(fs.readFileSync("full-class-table.json").toString()); } catch (e) {} console.log("Generating dummy class header"); -console.log(full_class_table.Stringify); +console.log(fullClassTable.Stringify); var header = `/* AUTO-GENERATED HEADER - DO NOT MODIFY NON-CONSTEXPR HEADER FOR $mod @@ -21,7 +21,7 @@ namespace client_classes { public: `; -for (var clz in full_class_table) { +for (var clz in fullClassTable) { header += "\t\tint " + clz + " { 0 };\n"; } From 3f407ff570a9b3180352ac1138f1d8dc93c9ca23 Mon Sep 17 00:00:00 2001 From: SylveonBottle Date: Tue, 8 May 2018 12:36:25 -0500 Subject: [PATCH 10/10] More camelCase --- class_dumping/generate-dynamic-header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class_dumping/generate-dynamic-header.js b/class_dumping/generate-dynamic-header.js index 07cafe4a..57df6496 100755 --- a/class_dumping/generate-dynamic-header.js +++ b/class_dumping/generate-dynamic-header.js @@ -37,7 +37,7 @@ header += ` var POPULATED_MAP = ""; -for (var clz in full_class_table) { +for (var clz in fullClassTable) { POPULATED_MAP += `\t\tclassid_mapping["${clz}"] = &${clz};\n`; }