Merge pull request #14 from yogstation13/bee

1561 Test

Author: JamieD1

.appveyor.yml

@@ -5,27 +5,12 @@ branches:
   only:
   - master
 shallow_clone: true
-image: 
-  - Visual Studio 2017
-  - Ubuntu
+image: Visual Studio 2017
 build_script:
   - mkdir build
   - cd build
   - cmake ../byond-extools
-  - cmd: cmake --build . --config RelWithDebInfo
-  - sh: sudo apt-get install -y gcc-multilib g++-multilib
-  - sh: make
-
-for:
-- matrix:
-    only:
-      - image: Visual Studio 2017
+  - cmake --build . --config RelWithDebInfo
 artifacts:
   - path: build/RelWithDebInfo/byond-extools.dll
   - path: build/RelWithDebInfo/byond-extools.pdb
-
-- matrix:
-    only:
-      - image: Ubuntu
-  artifacts:
-    - path: build/libbyond-extools.so

.vscode/settings.json

@@ -1,12 +1,8 @@
 # BYOND extools
 External tools for BYOND. Used to fiddle with the game engine's internals.
 
-# This project is archived
-Extools will no longer be receiving updates. I recommend switching to Rust-based [Auxtools](https://github.com/willox/auxtools), which I contribute to as well.
-<br/><br/><br/><br/>
-
 <table>
-<tr><td align="right" valign="middle">Find an action run with an artifact and download it</td></tr>
+<tr><td align="right" valign="middle"><a href="https://ci.appveyor.com/project/yogstation13/extools"><img src="https://ci.appveyor.com/api/projects/status/github/MCHSL/extools?svg=true" alt="Appveyor status" /></a></td><td>Windows build (with <a href="https://ci.appveyor.com/project/yogstation13/extools/build/artifacts">binaries</a>)</td></tr>
 </table>
 
 ## Isn't there a project just like this already?
@@ -18,28 +14,12 @@ Here are the modules currently available (not counting the core). Scroll to the
 #### Proc hooking
 Not exactly a module, but still useful. Hooking allows you to reimplement procs in C++, which usually run much faster, especially if the hooked proc is, for example, just math operations.
 
-#### Debug server
-Interfaces with debugger frontends, providing various information and managing breakpoints.  
-[SpacemanDMM](https://github.com/SpaceManiac/SpacemanDMM) by SpaceManiac enables line-by-line debugging and live viewing of variables. More to come.  
-Steamport's [Somnium](https://github.com/steamp0rt/somnium) is currently non-functional, but will allow debugging of low-level bytecode.  
-
 #### TFFI
 Threaded FFI for BYOND. Automagically threads off all DLL calls and prevents them from locking up the game until they return. You may use a Promise datum, pass a callback (global or an object) or simply sleep until the call returns.
 
 #### Optimizer
 Currently a proof of concept. The only optimization available is inlining - the optimizer will go through all procs and attempt to inline global proc calls to eliminate call overhead. At the time of writing optimizing takes an incredibly long time to finish, which makes it infeasible to use.
 
-#### Memory Profiler
-
-Counts all soft-code objects currently instantiated in the game world and dumps
-these numbers into a JSON file of your choosing for later inspection. The code
-also attempts to approximate the number of bytes that each object type takes
-up, though the accuracy is not guaranteed.
-
-To use, simply invoke `dump_memory_usage("myfile.json")` with the appropriate
-`call()()` syntax and away you go. This will halt the server for a moment as the
-counting is done.
-
 #### Maptick
 Hooks an internal BYOND function which sends map updates to players, and measures time taken to execute it. The result is written to a global variable called `internal_tick_usage`. SS13 servers can use this information to adjust how much of a tick running subsystems can take, which reduces lag spikes perceived by players.
 
@@ -59,6 +39,7 @@ These modules are planned to be included in the future.
 - Proxy objects: Forward variable reads and writes to C++.
 - Websockets: Send and receive data using the websocket protocol.
 - Lua: Allows writing lua scripts that replace builtin procs. Mostly for messing about.
+- ~~Optimizer: Optimizes bytecode and inlines procs into each other to avoid call overhead.~~
 
 ## I want to use this!
 Download the DLL and .dm file from [Releases](https://github.com/MCHSL/extools/releases). Place the DLL next to your DMB and plop the .dm somewhere where you can easily tick it. Afterwards, add `extools_initialize()` to `world/New()` or equivalent. To load modules, call `<module>_initialize()`, for example `tffi_initialize()`. Module initialization functions must be called after `extools_initialize()`!

README.md

@@ -361,24 +361,24 @@ ManagedValue::~ManagedValue()
 
 Params MiscEntry::as_params()
 {
-		return Params {
-			parameters2.count(),
-			parameters2.params,
-		};
-	}
+	return Params {
+		parameters2.count(),
+		parameters2.params,
+	};
+}
 
 LocalVars MiscEntry::as_locals()
 {
-		return LocalVars {
-			local_vars2.count,
-			local_vars2.var_name_indices,
-		};
-	}
+	return LocalVars {
+		local_vars2.count,
+		local_vars2.var_name_indices,
+	};
+}
 
 ProcBytecode MiscEntry::as_bytecode()
 {
-		return ProcBytecode {
-			bytecode2.bytecode_length,
-			&bytecode2.bytecode,
-		};
-}
+	return ProcBytecode {
+		bytecode2.bytecode_length,
+		&bytecode2.bytecode,
+	};
+} 

byond-extools/src/core/byond_structures.cpp

@@ -111,7 +111,7 @@ void Core::Alert(int what)
 }
 
 unsigned int Core::GetStringId(std::string str, bool increment_refcount) {
-	if (ByondVersion > 513) {
+	if (ByondVersion == 514) {
 		return GetStringTableIndexUTF8(str.c_str(), 0xFFFFFFFF, 0, 1);
 	}
 	return 0;