Merge pull request #425 from SylveonBottle/master

Quotations, dupes, and camelCase

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"

class_dumping/generate-class-headers.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) {}
 
 const file = fs.readFileSync(process.argv[2]).toString().split("\n");
@@ -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]);	
+	var classInfo = /\[(\d+)\] (\w+)/gi.exec(file[i]);	
-	if (class_info) {
+	if (classInfo) {
-		full_class_table[class_info[2]] = true;
+		fullClassTable[classInfo[2]] = true;
-		classes[class_info[2]] = parseInt(class_info[1]);
+		classes[classInfo[2]] = parseInt(classInfo[1]);
 	}
 }
 
-fs.writeFileSync("full-class-table.json", JSON.stringify(full_class_table));
+fs.writeFileSync("full-class-table.json", JSON.stringify(fullClassTable));
 
-var header_constexpr = `/*
+var headerConstexpr = `/*
 	AUTO-GENERATED HEADER - DO NOT MODIFY
 	CONSTEXPR HEADER FOR $mod
 */
@@ -49,10 +49,10 @@ 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];
-	header_constexpr += "\t\tstatic constexpr int " + clz + " = " + value + ";\n";
+	headerConstexpr += "\t\tstatic constexpr int " + clz + " = " + value + ";\n";
 	header += "\t\tint " + clz + " { " + value + " };\n";
 }
 
@@ -64,14 +64,14 @@ header += `
 
 #endif /* $mod_AUTOGEN_HPP */`;
 
-header_constexpr += `
+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);

class_dumping/generate-dummy-header.js

@@ -1,12 +1,12 @@
 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");
-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";
 }
 

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";
 }
 
@@ -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`;
 }
 

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(