deleted old issue templates

deleted local GitHub Action
LICENSE.md -> LICENSE
2025-05-12 06:39:26 +03:00 · 2024-11-20 00:24:39 +03:00 · 2024-11-20 00:24:26 +03:00 · 2024-11-15 17:36:24 +03:00 · 2024-11-04 00:37:44 +03:00 · 2024-11-02 19:43:27 +03:00
31 changed files with 1021 additions and 201 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -5,6 +5,7 @@ on:
    branches: [master]
    paths-ignore:
      - '**.md'
+      - '.github/**'

  pull_request:
    types: [opened, reopened, synchronize]
@ -23,12 +24,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v2

      - name: Build
        run: |
@ -43,7 +44,7 @@ jobs:
          move msvc\${{ env.buildRelease }}\metamod.pdb publish\debug\metamod.pdb

      - name: Deploy artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: win32
          path: publish/*
@ -51,17 +52,28 @@ jobs:
  linux:
    name: 'Linux'
    runs-on: ubuntu-latest
-    container: s1lentq/linux86buildtools:latest
+    container: debian:11-slim

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

-      - name: Build using Intel C++ Compiler 19.0
+      - name: Install dependencies
        run: |
-          rm -rf build && CC=icc CXX=icpc cmake -DCMAKE_BUILD_TYPE=COMPAT_GLIBC -B build && cmake --build build -j8
+          dpkg --add-architecture i386
+          apt-get update
+          apt-get install -y \
+            gcc-multilib g++-multilib \
+            build-essential \
+            libc6-dev libc6-dev-i386 \
+            git cmake rsync \
+            g++ gcc
+
+      - name: Build using Intel GCC Compiler
+        run: |
+          rm -rf build && cmake -DCMAKE_BUILD_TYPE=COMPAT_GLIBC -B build && cmake --build build -j8

      - name: Prepare SDK
        run: |
@ -97,17 +109,12 @@ jobs:
        shell: bash

      - name: Deploy artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        id: upload-job
        with:
          name: linux32
          path: publish/*

-      - name: Cleanup temporary artifacts
-        if: success() && steps.upload-job.outcome == 'success'
-        run: |
-          rm -f appversion.h
-
  publish:
    name: 'Publish'
    runs-on: ubuntu-latest
@ -115,12 +122,12 @@ jobs:

    steps:
      - name: Deploying linux artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
        with:
          name: linux32

      - name: Deploying windows artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
        with:
          name: win32

@ -148,7 +155,7 @@ jobs:
          7z a -tzip metamod-bin-${{ env.APP_VERSION }}.zip addons/ example_plugin/ sdk/

      - name: Publish artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        id: publish-job
        if: |
          startsWith(github.ref, 'refs/tags/') &&
@ -156,9 +163,3 @@ jobs:
        with:
          files: |
            *.zip
-
-      - name: Cleanup temporary artifacts
-        if: success() && steps.publish-job.outcome == 'success'
-        run: |
-          rm -rf addons debug example_plugin sdk
-          rm -f *.zip appversion.h
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,103 @@
+# [Metamod-r](https://github.com/rehlds/metamod-r) Changelog
+
+**Metamod-r** is based on the original version of [Metamod](http://metamod.org/) written by _Will Day_ for Half-Life 1 with some improvements from [Jussi Kivilinna](https://github.com/jkivilin) ([Metamod-p](https://github.com/jkivilin/metamod-p)). This product contains numerous performance optimizations and cleaner code. The core was rewritten with a JIT compiler.
+
+`*` Original changelog [here](https://github.com/Bots-United/metamod-p/blob/master/doc/Changelog).
+
+---
+
+## [`1.3.0.149`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.149) - 2024-04-23
+
+### Fixed
+- Fixed shutdown issue
+
+**Full Changelog**: [1.3.0.138...1.3.0.149](https://github.com/rehlds/metamod-r/compare/1.3.0.138...1.3.0.149)
+
+## [`1.3.0.138`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.138) - 2023-11-28
+
+### Changed
+- Improved ReHLDS API initialization.
+
+### Fixed
+- HLDS compatibility
+- [Fixed](https://github.com/rehlds/metamod-r/commit/ec926a611f4d225bb433609bf827269ad8482618) gracefully shuts down Metamod and plugins when the game is closing (now the _restart command works properly).
+
+**Full Changelog**: [1.3.0.131...1.3.0.138](https://github.com/rehlds/metamod-r/compare/1.3.0.131...1.3.0.138)
+
+## [`1.3.0.131`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.131) - 2018-08-24
+
+### Changed
+- Updated `C++ Intel Compiler` version `17.0` > `19.0`.
+
+**Full Changelog**: [1.3.0.128...1.3.0.131](https://github.com/rehlds/metamod-r/compare/1.3.0.128...1.3.0.131)
+
+## [`1.3.0.128`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.128) - 2018-08-24
+
+### Fixed
+- [Fixed](https://github.com/rehlds/metamod-r/commit/0cf2f709dbeae18ca84d2fafd4481ffbba06ad0c) two bugs in `jit`.
+
+**Full Changelog**: [1.3.0.126...1.3.0.128](https://github.com/rehlds/metamod-r/compare/1.3.0.126...1.3.0.128)
+
+## [`1.3.0.126`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.126) - 2018-05-10
+
+### Fixed
+- [Fixed](https://github.com/rehlds/metamod-r/commit/93b5bd45e279aad6a91e71504dd8deaf9896ab42) crashes in `pfnAlertMessage`.
+
+**Full Changelog**: [1.3.0.125...1.3.0.126](https://github.com/rehlds/metamod-r/compare/1.3.0.125...1.3.0.126)
+
+## [`1.3.0.125`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.125) - 2018-04-30
+
+### Fixed
+- [Fixed](https://github.com/rehlds/metamod-r/commit/6456c5f7ec872cd98d9be964440cf96780899558#diff-f15b77cc15bf608d761260093dfe8e0d) binary names to correctly auto-detect games.
+
+**Full Changelog**: [1.3.0.119...1.3.0.125](https://github.com/rehlds/metamod-r/compare/1.3.0.119...1.3.0.125)
+
+## [`1.3.0.119`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.119) - 2018-03-12
+
+### Added
+- Added support for various gamedll binaries for mods.
+- Added `mm_pluginsfile` option.
+
+**Full Changelog**: [1.3.0.107...1.3.0.119](https://github.com/rehlds/metamod-r/compare/1.3.0.107...1.3.0.119)
+
+## [`1.3.0.107`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.107) - 2018-01-29
+
+### Fixed
+- Fixed problems with API functions returning float.
+
+### Added
+- [Added](https://github.com/rehlds/metamod-r/commit/132cbad0099c9903123d7ff7c3e1c13344efb3c9) support for more games.
+
+### Changed
+- Refactored code.
+
+**Full Changelog**: [1.3.0.86...1.3.0.107](https://github.com/rehlds/metamod-r/compare/1.3.0.86...1.3.0.107)
+
+## [`1.3.0.86`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.86) - 2017-11-15
+
+### Fixed
+- [Fixed crash](https://github.com/rehlds/metamod-r/commit/5b7fe147231df9354a8fe29c3852bd1db8119e81) and reworked `find_memloc`.
+
+**Full Changelog**: [1.3.0.85...1.3.0.86](https://github.com/rehlds/metamod-r/compare/1.3.0.85...1.3.0.86)
+
+## [`1.3.0.85`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.85) - 2017-11-15
+
+### Fixed
+- Fixed parse plugins.ini (loads the plugins for an appropriate platform only).
+- Fixed crash for meta-plugins using UPX.
+
+**Full Changelog**: [1.3.0.84...1.3.0.85](https://github.com/rehlds/metamod-r/compare/1.3.0.84...1.3.0.85)
+
+## [`1.3.0.84`](https://github.com/rehlds/metamod-r/releases/tag/1.3.0.84) - 2017-10-27
+
+### Added
+- First public release.
+
+### Changed
+- Minor refactoring.
+
+## `0.0.0.0` (based on `1.20p35`) - 2016-07-04
+
+### Added
+- Started `metamod-r` project by forking from `metamod-p`. Based on version `1.20p35`.
+- The official changelog of the original version is missing.
--- a/README.md
+++ b/README.md
@ -1,29 +1,26 @@
-# Metamod-r [![Download](https://camo.githubusercontent.com/3d98e8552f23d02a71bc35672904ccc9a1e2201ae6eff9c892539a57035b290d/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f72656c656173652f74686541736d6f6461692f6d6574616d6f642d722e737667)](https://github.com/theAsmodai/metamod-r/releases/latest) [![Downloads](https://camo.githubusercontent.com/a49efb6ce75429709e735ce0c7ba994ace3f6c93241fc2b42ea523dea39c2abc/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f646f776e6c6f6164732f74686541736d6f6461692f6d6574616d6f642d722f746f74616c3f636f6c6f723d696d706f7274616e74)]() [![Percentage of issues still open](http://isitmaintained.com/badge/open/theAsmodai/metamod-r.svg)](http://isitmaintained.com/project/theAsmodai/metamod-r "Percentage of issues still open") [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+# [Metamod-r](https://github.com/rehlds/metamod-r) [![Percentage of issues still open](http://isitmaintained.com/badge/open/rehlds/metamod-r.svg)](http://isitmaintained.com/project/rehlds/metamod-r "Percentage of issues still open") [![GitHub license](https://img.shields.io/github/license/rehlds/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/rehlds/metamod-r/blob/master/LICENSE)

 **Metamod-r** is based on the original version of [Metamod](http://metamod.org/) written by _Will Day_ for Half-Life 1 with some improvements from [Jussi Kivilinna](https://github.com/jkivilin) ([Metamod-p](https://github.com/jkivilin/metamod-p)). This product contains a large number of performance optimizations and more pure code. The core was written using JIT compiler.

-**Metamod-r is incompatible with original `HLDS`. It's necessary to have installed [ReHLDS](https://github.com/dreamstalker/ReHLDS) (`API 3.1+`). There is no guarantee that the product will work in a different environment.**
+**Metamod-r is recommended to be run with [ReHLDS](https://github.com/rehlds/ReHLDS) (`API 3.1+`).
+There is compatible with original `HLDS`**

-|HLDS | [ReHLDS](https://github.com/dreamstalker/ReHLDS) |  OS | Download |
+|HLDS | [ReHLDS](https://github.com/rehlds/ReHLDS) |  OS | Download |
 |---------| -------|    --- | ---   |
-| :x: | `API 3.1+` |![](https://i.imgur.com/AzhAYR4.png)   ![](https://i.imgur.com/t23p9tU.png)   |  [![Download](https://camo.githubusercontent.com/3d98e8552f23d02a71bc35672904ccc9a1e2201ae6eff9c892539a57035b290d/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f72656c656173652f74686541736d6f6461692f6d6574616d6f642d722e737667)](https://github.com/theAsmodai/metamod-r/releases/latest)
+| :heavy_check_mark: | :heavy_check_mark: `API 3.1+` |![](https://i.imgur.com/AzhAYR4.png)   ![](https://i.imgur.com/t23p9tU.png)   |  [![Download](https://img.shields.io/github/downloads/rehlds/metamod-r/latest/total?sort=date&style=flat-square)](https://github.com/rehlds/metamod-r/releases/latest)

 [![Official Site](https://img.shields.io/badge/Link-Official%20site-3CB371.svg?longCache=true&style=flat-square)](https://metamod-r.org/)
-[![Experimental](https://img.shields.io/badge/status-experimental-orange.svg?style=flat-square)](https://github.com/theAsmodai/metamod-r/)
-[![GitHub issues](https://img.shields.io/github/issues/theAsmodai/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/theAsmodai/metamod-r/issues)
-[![GitHub forks](https://img.shields.io/github/forks/theAsmodai/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/theAsmodai/metamod-r/network)
-[![GitHub stars](https://img.shields.io/github/stars/theAsmodai/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/theAsmodai/metamod-r/stargazers)
-
-
-Distributed under
-[![GitHub license](https://img.shields.io/github/license/theAsmodai/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/theAsmodai/metamod-r/blob/master/LICENSE).
+[![Stable](https://img.shields.io/badge/status-stable-default.svg?style=flat-square)](https://github.com/rehlds/metamod-r/)
+[![GitHub issues](https://img.shields.io/github/issues/rehlds/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/rehlds/metamod-r/issues)
+[![GitHub forks](https://img.shields.io/github/forks/rehlds/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/rehlds/metamod-r/network)
+[![GitHub stars](https://img.shields.io/github/stars/rehlds/metamod-r.svg?longCache=true&style=flat-square)](https://github.com/rehlds/metamod-r/stargazers)

 ## Documentation
-* All actual documentation in ![en](https://i.imgur.com/rm67tUZ.png) **English** and ![ru](https://i.imgur.com/ItziiKg.png) **Russian** languages is placed at [this link](https://github.com/theAsmodai/metamod-r/wiki).
+* All actual documentation in ![en](https://i.imgur.com/rm67tUZ.png) **English** and ![ru](https://i.imgur.com/ItziiKg.png) **Russian** languages is placed at [this link](https://github.com/rehlds/metamod-r/wiki).

 ### Supported games
-* ![en](https://i.imgur.com/rm67tUZ.png) Actual [list of supported games](https://github.com/theAsmodai/metamod-r/wiki/Supported-games).
-* ![ru](https://i.imgur.com/ItziiKg.png) Актуальный [список поддерживаемых игр](https://github.com/theAsmodai/metamod-r/wiki/Поддерживаемые-игры).
+* ![en](https://i.imgur.com/rm67tUZ.png) Actual [list of supported games](https://github.com/rehlds/metamod-r/wiki/Supported-games).
+* ![ru](https://i.imgur.com/ItziiKg.png) Актуальный [список поддерживаемых игр](https://github.com/rehlds/metamod-r/wiki/Поддерживаемые-игры).

 ## Build instructions
 ### Checking requirements
--- a/metamod/CMakeLists.txt
+++ b/metamod/CMakeLists.txt
@ -35,7 +35,7 @@ set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")

 set(COMPILE_FLAGS "-m32 -U_FORTIFY_SOURCE")
-set(LINK_FLAGS "-m32 -s")
+set(LINK_FLAGS "-m32")

 set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-builtin -Wno-unknown-pragmas")

@ -43,9 +43,10 @@ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-builtin -Wno-unkn
 set(COMPILE_FLAGS "${COMPILE_FLAGS} -ffunction-sections -fdata-sections")

 if (DEBUG)
-	set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O3 -ggdb")
+	set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O0 -ggdb")
 else()
 	set(COMPILE_FLAGS "${COMPILE_FLAGS} -g0 -O3 -fno-stack-protector")
+	set(LINK_FLAGS "${LINK_FLAGS} -s")
 endif()

 # Check Intel C++ compiler
@ -149,8 +150,7 @@ target_sources(metamod PRIVATE
 	"src/engine_api.cpp"
 	"src/game_support.cpp"
 	"src/h_export.cpp"
-	"src/linkent.cpp"
-	"src/linkgame.cpp"
+	"src/osdep_linkent_linux.cpp"
 	"src/log_meta.cpp"
 	"src/mdebug.cpp"
 	"src/mem_utils.cpp"
@ -174,6 +174,7 @@ target_sources(metamod PRIVATE

 target_link_libraries(metamod PRIVATE
 	dl
+	pthread
 	$<$<CONFIG:COMPAT_GLIBC>:libc-2.11.1.so>
 )

--- a/metamod/extra/example/Makefile
+++ b/metamod/extra/example/Makefile
@ -7,7 +7,7 @@ COMPILER = g++

 OBJECTS = *.cpp

-LINK =
+LINK = -ldl

 OPT_FLAGS = -O3 -msse3 -flto -funroll-loops -fomit-frame-pointer -fno-stack-protector -fPIC

@ -15,9 +15,9 @@ INCLUDE = -I. -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine \
 		-I$(HLSDK)/game_shared -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(METAMOD)

 BIN_DIR = Release
-CFLAGS = $(OPT_FLAGS)
+CFLAGS = $(OPT_FLAGS) -Wno-unused-result

-CFLAGS += -g -DNDEBUG -Dlinux -D__linux__ -D__USE_GNU -std=gnu++11 -shared
+CFLAGS += -g -DNDEBUG -Dlinux -D__linux__ -D__USE_GNU -std=gnu++11 -shared -m32

 OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)

--- a/metamod/extra/example/ex_rehlds_api.cpp
+++ b/metamod/extra/example/ex_rehlds_api.cpp
@ -7,7 +7,7 @@ const RehldsFuncs_t* g_RehldsFuncs;
 IRehldsHookchains* g_RehldsHookchains;
 IRehldsServerStatic* g_RehldsSvs;

-bool rehlds_api_try_init(CSysModule* engineModule, char* failureReason)
+bool rehlds_api_init(CSysModule* engineModule)
 {
 	if (!engineModule) {
 		gpMetaUtilFuncs->pfnLogConsole(PLID, "Failed to locate engine module\n");
@ -16,14 +16,13 @@ bool rehlds_api_try_init(CSysModule* engineModule, char* failureReason)

 	CreateInterfaceFn ifaceFactory = Sys_GetFactory(engineModule);
 	if (!ifaceFactory) {
-		sprintf(failureReason, "Failed to locate interface factory in engine module\n");
+		gpMetaUtilFuncs->pfnLogConsole(PLID, "Failed to locate interface factory in engine module\n");
 		return false;
 	}

 	int retCode = 0;
 	g_RehldsApi = (IRehldsApi*)ifaceFactory(VREHLDS_HLDS_API_VERSION, &retCode);
 	if (!g_RehldsApi) {
-		sprintf(failureReason, "Failed to locate retrieve rehlds api interface from engine module, return code is %d\n", retCode);
 		return false;
 	}

@ -31,12 +30,12 @@ bool rehlds_api_try_init(CSysModule* engineModule, char* failureReason)
 	int minorVersion = g_RehldsApi->GetMinorVersion();

 	if (majorVersion != REHLDS_API_VERSION_MAJOR) {
-		sprintf(failureReason, "REHLDS Api major version mismatch; expected %d, real %d\n", REHLDS_API_VERSION_MAJOR, majorVersion);
+		gpMetaUtilFuncs->pfnLogConsole(PLID, "REHLDS Api major version mismatch; expected %d, real %d\n", REHLDS_API_VERSION_MAJOR, majorVersion);
 		return false;
 	}

 	if (minorVersion < REHLDS_API_VERSION_MINOR) {
-		sprintf(failureReason, "REHLDS Api minor version mismatch; expected at least %d, real %d\n", REHLDS_API_VERSION_MINOR, minorVersion);
+		gpMetaUtilFuncs->pfnLogConsole(PLID, "REHLDS Api minor version mismatch; expected at least %d, real %d\n", REHLDS_API_VERSION_MINOR, minorVersion);
 		return false;
 	}

@ -47,25 +46,31 @@ bool rehlds_api_try_init(CSysModule* engineModule, char* failureReason)
 	return true;
 }

-bool meta_init_rehlds_api() {
-	char failReason[2048];
-
-#ifdef WIN32
-	CSysModule* engineModule = Sys_LoadModule("swds.dll");
-	if (!rehlds_api_try_init(engineModule, failReason)) {
-		engineModule = Sys_LoadModule("filesystem_stdio.dll");
-		if (!rehlds_api_try_init(engineModule, failReason)) {
-			gpMetaUtilFuncs->pfnLogConsole(PLID, "%s", failReason);
-			return false;
-		}
+bool meta_init_rehlds_api()
+{
+#ifdef _WIN32
+	// Find the most appropriate module handle from a list of DLL candidates
+	// Notes:
+	// - "swds.dll" is the library Dedicated Server
+	//
+	//    Let's also attempt to locate the ReHLDS API in the client's library
+	// - "sw.dll" is the client library for Software render, with a built-in listenserver
+	// - "hw.dll" is the client library for Hardware render, with a built-in listenserver
+	const char *dllNames[] = { "swds.dll", "hw.dll", "sw.dll" }; // List of DLL candidates to lookup for the ReHLDS API
+	CSysModule *engineModule = NULL; // The module handle of the selected DLL
+	for (const char *dllName : dllNames)
+	{
+		if (engineModule = Sys_GetModuleHandle(dllName))
+			break; // gotcha
 	}
+
 #else
-	CSysModule* engineModule = Sys_LoadModule("engine_i486.so");
-	if (!rehlds_api_try_init(engineModule, failReason)) {
-		gpMetaUtilFuncs->pfnLogConsole(PLID, "%s", failReason);
+	CSysModule *engineModule = Sys_GetModuleHandle("engine_i486.so");
+#endif
+
+	if (!rehlds_api_init(engineModule)) {
 		return false;
 	}
-#endif

 	return true;
 }
--- a/metamod/extra/example/include/hlsdk/public/interface.cpp
+++ b/metamod/extra/example/include/hlsdk/public/interface.cpp
@ -121,6 +121,14 @@ void *Sys_GetProcAddress(void *pModuleHandle, const char *pName)
 	return GetProcAddress((HMODULE)pModuleHandle, pName);
 }

+// Purpose: Returns a module handle by its name.
+// Input  : pModuleName - module name
+// Output : the module handle or NULL in case of an error
+CSysModule *Sys_GetModuleHandle(const char *pModuleName)
+{
+	return reinterpret_cast<CSysModule *>(GetModuleHandle(pModuleName));
+}
+
 // Purpose: Loads a DLL/component from disk and returns a handle to it
 // Input  : *pModuleName - filename of the component
 // Output : opaque handle to the module (hides system dependency)
--- a/metamod/extra/example/include/hlsdk/public/interface.h
+++ b/metamod/extra/example/include/hlsdk/public/interface.h
@ -114,6 +114,8 @@ extern CreateInterfaceFn Sys_GetFactory(const char *pModuleName);
 // load/unload components
 class CSysModule;

+extern CSysModule *Sys_GetModuleHandle(const char *pModuleName);
+
 // Load & Unload should be called in exactly one place for each module
 // The factory for that module should be passed on to dependent components for
 // proper versioning.
--- a/metamod/include/engine/physint.h
+++ b/metamod/include/engine/physint.h
@ -0,0 +1,173 @@
+/*
+physint.h - Server Physics Interface
+Copyright (C) 2011 Uncle Mike
+
+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.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*/
+
+#ifndef PHYSINT_H
+#define PHYSINT_H
+
+#include "eiface.h" // offsetof
+
+#define SV_PHYSICS_INTERFACE_VERSION	6
+
+#define STRUCT_FROM_LINK( l, t, m )	((t *)((byte *)l - offsetof(t, m)))
+#define EDICT_FROM_AREA( l )		STRUCT_FROM_LINK( l, edict_t, area )
+
+// values that can be returned with pfnServerState
+#define SERVER_DEAD			0
+#define SERVER_LOADING		1
+#define SERVER_ACTIVE		2
+
+// LUMP reading errors
+#define LUMP_LOAD_OK		0
+#define LUMP_LOAD_COULDNT_OPEN	1
+#define LUMP_LOAD_BAD_HEADER		2
+#define LUMP_LOAD_BAD_VERSION		3
+#define LUMP_LOAD_NO_EXTRADATA	4
+#define LUMP_LOAD_INVALID_NUM		5
+#define LUMP_LOAD_NOT_EXIST		6
+#define LUMP_LOAD_MEM_FAILED		7
+#define LUMP_LOAD_CORRUPTED		8
+
+// LUMP saving errors
+#define LUMP_SAVE_OK		0
+#define LUMP_SAVE_COULDNT_OPEN	1
+#define LUMP_SAVE_BAD_HEADER		2
+#define LUMP_SAVE_BAD_VERSION		3
+#define LUMP_SAVE_NO_EXTRADATA	4
+#define LUMP_SAVE_INVALID_NUM		5
+#define LUMP_SAVE_ALREADY_EXIST	6
+#define LUMP_SAVE_NO_DATA		7
+#define LUMP_SAVE_CORRUPTED		8
+
+#ifndef ALLOC_CHECK
+#define ALLOC_CHECK( x )
+#endif
+
+typedef struct areanode_s
+{
+	int		axis;		// -1 = leaf node
+	float		dist;
+	struct areanode_s	*children[2];
+	link_t		trigger_edicts;
+	link_t		solid_edicts;
+	link_t		portal_edicts;
+} areanode_t;
+
+typedef struct server_physics_api_s
+{
+	// unlink edict from old position and link onto new
+	void		( *pfnLinkEdict) ( edict_t *ent, qboolean touch_triggers );
+	double		( *pfnGetServerTime )( void ); // unclamped
+	double		( *pfnGetFrameTime )( void );	// unclamped
+	void*		( *pfnGetModel )( int modelindex );
+	areanode_t*	( *pfnGetHeadnode )( void ); // AABB tree for all physic entities
+	int		( *pfnServerState )( void );
+	void		( *pfnHost_Error )( const char *error, ... );	// cause Host Error
+// ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT.  INTERFACE VERSION IS FROZEN AT 6
+	struct triangleapi_s *pTriAPI;	// draw coliisions etc. Only for local system
+
+	// draw debug messages (must be called from DrawOrthoTriangles). Only for local system
+	int		( *pfnDrawConsoleString )( int x, int y, char *string );
+	void		( *pfnDrawSetTextColor )( float r, float g, float b );
+	void		( *pfnDrawConsoleStringLen )( const char *string, int *length, int *height );
+	void		( *Con_NPrintf )( int pos, const char *fmt, ... );
+	void		( *Con_NXPrintf )( struct con_nprint_s *info, const char *fmt, ... );
+	const char	*( *pfnGetLightStyle )( int style ); // read custom appreance for selected lightstyle
+	void		( *pfnUpdateFogSettings )( unsigned int packed_fog );
+	char		**(*pfnGetFilesList)( const char *pattern, int *numFiles, int gamedironly );
+	struct msurface_s	*(*pfnTraceSurface)( edict_t *pTextureEntity, const float *v1, const float *v2 );
+	const byte	*(*pfnGetTextureData)( unsigned int texnum );
+
+	// static allocations
+	void		*(*pfnMemAlloc)( size_t cb, const char *filename, const int fileline ) ALLOC_CHECK( 1 );
+	void		(*pfnMemFree)( void *mem, const char *filename, const int fileline );
+
+	// trace & contents
+	int		(*pfnMaskPointContents)( const float *pos, int groupmask );
+	trace_t		(*pfnTrace)( const float *p0, float *mins, float *maxs, const float *p1, int type, edict_t *e );
+	trace_t		(*pfnTraceNoEnts)( const float *p0, float *mins, float *maxs, const float *p1, int type, edict_t *e );
+	int		(*pfnBoxInPVS)( const float *org, const float *boxmins, const float *boxmaxs );
+
+	// message handler (missed function to write raw bytes)
+	void		(*pfnWriteBytes)( const byte *bytes, int count );
+
+	// BSP lump management
+	int		(*pfnCheckLump)( const char *filename, const int lump, int *lumpsize );
+	int		(*pfnReadLump)( const char *filename, const int lump, void **lumpdata, int *lumpsize );
+	int		(*pfnSaveLump)( const char *filename, const int lump, void *lumpdata, int lumpsize );
+
+	// FS tools
+	int		(*pfnSaveFile)( const char *filename, const void *data, int len );
+	const byte	*(*pfnLoadImagePixels)( const char *filename, int *width, int *height );
+
+	const char *(*pfnGetModelName)( int modelindex );
+
+	// FWGS extension
+	void       *(*pfnGetNativeObject)( const char *object );
+} server_physics_api_t;
+
+// physic callbacks
+typedef struct physics_interface_s
+{
+	int		version;
+	// passed through pfnCreate (0 is attempt to create, -1 is reject)
+	int		( *SV_CreateEntity )( edict_t *pent, const char *szName );
+	// run custom physics for each entity (return 0 to use built-in engine physic)
+	int		( *SV_PhysicsEntity	)( edict_t *pEntity );
+	// spawn entities with internal mod function e.g. for re-arrange spawn order (0 - use engine parser, 1 - use mod parser)
+	int		( *SV_LoadEntities )( const char *mapname, char *entities );
+	// update conveyor belt for clients
+	void		( *SV_UpdatePlayerBaseVelocity )( edict_t *ent );
+	// The game .dll should return 1 if save game should be allowed
+	int		( *SV_AllowSaveGame )( void );
+// ONLY ADD NEW FUNCTIONS TO THE END OF THIS STRUCT.  INTERFACE VERSION IS FROZEN AT 6
+	// override trigger area checking and touching
+	int		( *SV_TriggerTouch )( edict_t *pent, edict_t *trigger );
+	// some engine features can be enabled only through this function
+	unsigned int	( *SV_CheckFeatures )( void );
+	// used for draw debug collisions for custom physic engine etc
+	void		( *DrawDebugTriangles )( void );
+	// used for draw debug overlay (textured)
+	void		( *DrawNormalTriangles )( void );
+	// used for draw debug messages (2d mode)
+	void		( *DrawOrthoTriangles )( void );
+	// tracing entities with SOLID_CUSTOM mode on a server (not used by pmove code)
+	void		( *ClipMoveToEntity)( edict_t *ent, const float *start, float *mins, float *maxs, const float *end, trace_t *trace );
+	// tracing entities with SOLID_CUSTOM mode on a server (only used by pmove code)
+	void		( *ClipPMoveToEntity)( struct physent_s *pe, const float *start, float *mins, float *maxs, const float *end, struct pmtrace_s *tr );
+	// called at end the frame of SV_Physics call
+	void		( *SV_EndFrame )( void );
+	// obsolete
+	void		(*pfnPrepWorldFrame)( void );
+	// called through save\restore process
+	void		(*pfnCreateEntitiesInRestoreList)( SAVERESTOREDATA *pSaveData, int levelMask, qboolean create_world );
+	// allocate custom string (e.g. using user implementation of stringtable, not engine strings)
+	string_t		(*pfnAllocString)( const char *szValue );
+	// make custom string (e.g. using user implementation of stringtable, not engine strings)
+	string_t		(*pfnMakeString)( const char *szValue );
+	// read custom string (e.g. using user implementation of stringtable, not engine strings)
+	const char*	(*pfnGetString)( string_t iString );
+	// helper for restore custom decals that have custom message (e.g. Paranoia)
+	int		(*pfnRestoreDecal)( struct decallist_s *entry, edict_t *pEdict, qboolean adjacent );
+	// handle custom trigger touching for player
+	void		(*PM_PlayerTouch)( struct playermove_s *ppmove, edict_t *client );
+	// alloc or destroy model custom data (called only for dedicated servers, otherwise using an client version)
+	void		(*Mod_ProcessUserData)( struct model_s *mod, qboolean create, const byte *buffer );
+	// select BSP-hull for trace with specified mins\maxs
+	void		*(*SV_HullForBsp)( edict_t *ent, const float *mins, const float *maxs, float *offset );
+	// handle player custom think function
+	int		(*SV_PlayerThink)( edict_t *ent, float frametime, double time );
+} physics_interface_t;
+
+#endif//PHYSINT_H
--- a/metamod/include/public/interface.cpp
+++ b/metamod/include/public/interface.cpp
@ -121,6 +121,14 @@ void *Sys_GetProcAddress(void *pModuleHandle, const char *pName)
 	return GetProcAddress((HMODULE)pModuleHandle, pName);
 }

+// Purpose: Returns a module handle by its name.
+// Input  : pModuleName - module name
+// Output : the module handle or NULL in case of an error
+CSysModule *Sys_GetModuleHandle(const char *pModuleName)
+{
+	return reinterpret_cast<CSysModule *>(GetModuleHandle(pModuleName));
+}
+
 // Purpose: Loads a DLL/component from disk and returns a handle to it
 // Input  : *pModuleName - filename of the component
 // Output : opaque handle to the module (hides system dependency)
--- a/metamod/include/public/interface.h
+++ b/metamod/include/public/interface.h
@ -114,6 +114,8 @@ extern CreateInterfaceFn Sys_GetFactory(const char *pModuleName);
 // load/unload components
 class CSysModule;

+extern CSysModule *Sys_GetModuleHandle(const char *pModuleName);
+
 // Load & Unload should be called in exactly one place for each module
 // The factory for that module should be passed on to dependent components for
 // proper versioning.
--- a/metamod/msvc/metamod.vcxproj
+++ b/metamod/msvc/metamod.vcxproj
@ -151,8 +151,6 @@
    <ClCompile Include="..\src\engine_api.cpp" />
    <ClCompile Include="..\src\game_support.cpp" />
    <ClCompile Include="..\src\h_export.cpp" />
-    <ClCompile Include="..\src\linkent.cpp" />
-    <ClCompile Include="..\src\linkgame.cpp" />
    <ClCompile Include="..\src\log_meta.cpp" />
    <ClCompile Include="..\src\mdebug.cpp" />
    <ClCompile Include="..\src\mem_utils.cpp" />
@ -164,6 +162,11 @@
    <ClCompile Include="..\src\mplugin.cpp" />
    <ClCompile Include="..\src\mreg.cpp" />
    <ClCompile Include="..\src\mutil.cpp" />
+    <ClCompile Include="..\src\osdep_linkent_linux.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep_linkent_win32.cpp" />
    <ClCompile Include="..\src\precompiled.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
--- a/metamod/msvc/metamod.vcxproj.filters
+++ b/metamod/msvc/metamod.vcxproj.filters
@ -35,12 +35,6 @@
    <ClCompile Include="..\src\h_export.cpp">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\linkent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgame.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\log_meta.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -98,6 +92,12 @@
    <ClCompile Include="..\src\meta_rehlds_api.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\osdep_linkent_win32.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep_linkent_linux.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\api_info.h">
--- a/metamod/src/dllapi.cpp
+++ b/metamod/src/dllapi.cpp
@ -12,8 +12,12 @@ NEW_DLL_FUNCTIONS sNewFunctionTable;
 NEW_DLL_FUNCTIONS sNewFunctionTable_jit;
 NEW_DLL_FUNCTIONS *pHookedNewDllFunctions = &sNewFunctionTable;

-void MM_PRE_HOOK EXT_FUNC mm_GameShutdown()
+// Unload game DLL and meta plugins
+void MM_POST_HOOK EXT_FUNC mm_GameShutdown()
 {
+	g_metamod_active = false;
+	if (g_plugins && !g_dedicated_server) g_plugins->unload_all();
+
 	g_meta_extdll.unload();
 	g_GameDLL.sys_module.unload();
 	g_engine.sys_module.unload();
@ -130,7 +134,7 @@ compile_data_t g_dllfunc_cdata[] =
 compile_data_t g_newdllfunc_cdata[] =
 {
 	CDATA_NEWDLL(pfnOnFreeEntPrivateData),                          // Called right before the object's memory is freed. Calls its destructor.
-	CDATA_NEWDLL_H(pfnGameShutdown, P_PRE, mm_GameShutdown),        //
+	CDATA_NEWDLL_H(pfnGameShutdown, P_POST, mm_GameShutdown),        //
 	CDATA_NEWDLL(pfnShouldCollide),                                 //

 	CDATA_NEWDLL(pfnCvarValue),                                     // (fz) Use mm_CvarValue2 instead
@ -217,6 +221,33 @@ C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *in
 	return TRUE;
 }

+C_DLLEXPORT int Server_GetPhysicsInterface(int iVersion, server_physics_api_t *pfuncsFromEngine, physics_interface_t *pFunctionTable)
+{
+	// TODO: provide physint to plugins
+	if (iVersion != SV_PHYSICS_INTERFACE_VERSION || pfuncsFromEngine == nullptr || pFunctionTable == nullptr)
+		return FALSE;
+
+
+	// we have linkent alternative, shutdown linkent replacement
+	meta_shutdown_linkent_replacement();
+
+	// engine always require for nullptr, only replace single function needed for linkent alternative
+	Q_memset(pFunctionTable, 0, sizeof(*pFunctionTable));
+	pFunctionTable->SV_CreateEntity = [](edict_t *pent, const char *szName)
+	{
+		// check if gamedll implements this entity
+		ENTITY_FN SpawnEdict = reinterpret_cast<ENTITY_FN>(g_GameDLL.sys_module.getsym(szName));
+
+		// should we check metamod module itself? engine will do GPA on metamod module before failing back to this call anyway
+		if( !SpawnEdict )
+			return -1; // failed
+
+		SpawnEdict( &pent->v );
+		return 0; // handled
+	};
+	return TRUE;
+}
+
 void compile_dllfunc_callbacks()
 {
 	jitdata_t jitdata;
--- a/metamod/src/h_export.cpp
+++ b/metamod/src/h_export.cpp
@ -16,6 +16,7 @@ void WINAPI GiveFnptrsToDll(enginefuncs_t* pengfuncsFromEngine, globalvars_t* pG
 	g_engine.funcs = &g_engfuncs;
 	g_engine.globals = pGlobals;
 	g_engfuncs = *pengfuncsFromEngine;
+	g_metamod_module.load(&g_engfuncs);
 	g_engine.sys_module.load(pengfuncsFromEngine);

 	g_engfuncs = *pengfuncsFromEngine;
--- a/metamod/src/linkent.cpp
+++ b/metamod/src/linkent.cpp
@ -1,26 +0,0 @@
-#include "precompiled.h"
-
-// Function to perform common code of LINK_ENTITY_TO_GAME, rather than
-// duplicating the code in ~2000 expanded macros.  Based on code from Jussi
-// Kivilinna <kijuhe00@students.oamk.fi>.
-void NOINLINE do_link_ent(ENTITY_FN* pfnEntity, int* missing, const char* entStr, entvars_t* pev)
-{
-	if (*missing) {
-		META_DEBUG(9, "Skipping entity '%s'; was previously found missing", entStr);
-		return;
-	}
-
-	if (!*pfnEntity) {
-		META_DEBUG(9, "Looking up game entity '%s'", entStr);
-		*pfnEntity = (ENTITY_FN)g_GameDLL.sys_module.getsym(entStr);
-	}
-
-	if (!*pfnEntity) {
-		META_ERROR("Couldn't find game entity '%s' in game DLL '%s': %s", entStr, g_GameDLL.name, CSysModule::getloaderror());
-		*missing = 1;
-		return;
-	}
-
-	META_DEBUG(8, "Linking game entity '%s'", entStr);
-	(*pfnEntity)(pev);
-}
--- a/metamod/src/linkent.h
+++ b/metamod/src/linkent.h
@ -1,19 +1,52 @@
+// vi: set ts=4 sw=4 :
+// vim: set tw=75 :
+
+// linkent.h - export entities from mod "games" back to the HL engine
+
+/*
+ * Copyright (c) 2001-2006 Will Day <willday@hpgx.net>
+ *
+ *    This file is part of Metamod.
+ *
+ *    Metamod 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.
+ *
+ *    Metamod is distributed in the hope that it will be useful, but
+ *    WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Metamod; if not, write to the Free Software Foundation,
+ *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *    In addition, as a special exception, the author gives permission to
+ *    link the code of this program with the Half-Life Game Engine ("HL
+ *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
+ *    L.L.C ("Valve").  You must obey the GNU General Public License in all
+ *    respects for all of the code used other than the HL Engine and MODs
+ *    from Valve.  If you modify this file, you may extend this exception
+ *    to your version of the file, but you are not obligated to do so.  If
+ *    you do not wish to do so, delete this exception statement from your
+ *    version.
+ *
+ */
+
 #pragma once

+// Initializes replacement code
+bool meta_init_linkent_replacement(CSysModule *moduleMetamod, CSysModule *moduleGame);
+
+// Remove replacement code if new linkent mechanism was found
+void meta_shutdown_linkent_replacement();
+
 // Comments from SDK dlls/util.h:
 //! This is the glue that hooks .MAP entity class names to our CPP classes.
 //! The _declspec forces them to be exported by name so we can do a lookup with GetProcAddress().
 //! The function is used to intialize / allocate the object for the entity.

 // Adapted from LINK_ENTITY_TO_FUNC in adminmod linkfunc.cpp.
-typedef void (*ENTITY_FN)(entvars_t *);

-// Function to perform common code of LINK_ENTITY_TO_GAME.
-void do_link_ent(ENTITY_FN* pfnEntity, int* missing, const char* entStr, entvars_t* pev);
-
-#define LINK_ENTITY_TO_GAME(entityName) \
-	C_DLLEXPORT void entityName(entvars_t *pev) { \
-		static ENTITY_FN pfnEntity = nullptr; \
-		static int missing = 0; \
-		do_link_ent(&pfnEntity, &missing, STRINGIZE(entityName, 0), pev); \
-	}
+typedef void (*ENTITY_FN) (entvars_t *);
--- a/metamod/src/linkgame.cpp
+++ b/metamod/src/linkgame.cpp
@ -1,9 +0,0 @@
-#include "precompiled.h"
-
-// Entity list for gamedlls adapted from adminmod linkfunc.cpp.
-
-// NOTE: This list of entities is automatically generated via the script
-// "mklinkgame.sh".  See the files in the directory "ents" for the actual
-// list of entities.
-
-LINK_ENTITY_TO_GAME(worldspawn);
--- a/metamod/src/meta_rehlds_api.cpp
+++ b/metamod/src/meta_rehlds_api.cpp
@ -46,7 +46,26 @@ bool rehlds_api_init(CSysModule* engineModule)

 bool meta_init_rehlds_api()
 {
-	CSysModule* engineModule = Sys_LoadModule(ENGINE_LIB);
+#ifdef _WIN32
+	// Find the most appropriate module handle from a list of DLL candidates
+	// Notes:
+	// - "swds.dll" is the library Dedicated Server
+	//
+	//    Let's also attempt to locate the ReHLDS API in the client's library
+	// - "sw.dll" is the client library for Software render, with a built-in listenserver
+	// - "hw.dll" is the client library for Hardware render, with a built-in listenserver
+	const char *dllNames[] = { "swds.dll", "hw.dll", "sw.dll" }; // List of DLL candidates to lookup for the ReHLDS API
+	CSysModule *engineModule = NULL; // The module handle of the selected DLL
+	for (const char *dllName : dllNames)
+	{
+		if (engineModule = Sys_GetModuleHandle(dllName))
+			break; // gotcha
+	}
+
+#else
+	CSysModule *engineModule = Sys_GetModuleHandle("engine_i486.so");
+#endif
+
 	if (!rehlds_api_init(engineModule)) {
 		return false;
 	}
--- a/metamod/src/metamod.cpp
+++ b/metamod/src/metamod.cpp
@ -18,6 +18,8 @@ option_t g_global_options[] =

 gamedll_t g_GameDLL;

+CSysModule g_metamod_module;
+
 ALIGN16
 meta_globals_t g_metaGlobals;

@ -32,6 +34,9 @@ unsigned int g_CALL_API_count = 0;

 int g_requestid_counter = 0;

+bool g_metamod_active = false;
+bool g_dedicated_server = false;
+
 // Very first metamod function that's run.
 // Do startup operations...
 void metamod_startup()
@ -61,6 +66,8 @@ void metamod_startup()
 		Sys_Error("Failure to init game DLL; exiting...");
 	}

+	g_metamod_active = true;
+
 	// Register various console commands and cvars.
 	// Can I do these here, rather than waiting for GameDLLInit() ?
 	// Looks like it works okay..
@ -160,6 +167,7 @@ void metamod_startup()
 	g_engine.pl_funcs.pfnCVarRegister = meta_CVarRegister;
 	g_engine.pl_funcs.pfnCvar_RegisterVariable = meta_CVarRegister;
 	g_engine.pl_funcs.pfnRegUserMsg = meta_RegUserMsg;
+	g_dedicated_server = g_engine.pl_funcs.pfnIsDedicatedServer() ? true : false;

 	if (g_engine.pl_funcs.pfnQueryClientCvarValue)
 		g_engine.pl_funcs.pfnQueryClientCvarValue = meta_QueryClientCvarValue;
@ -225,10 +233,17 @@ void metamod_startup()
 		// Exit on failure here?  Dunno...
 	}

-	meta_init_rehlds_api();
-
-	if (!g_meta_extdll.init(&g_engine.sys_module)) {
-		Sys_Error("Failure to init extension DLL; exiting...");
+	if (meta_init_rehlds_api()) {
+		if (!g_meta_extdll.init(&g_engine.sys_module)) {
+			Sys_Error("Failure to init extension DLL; exiting...");
+		}
+	} else {
+		// activate linkent-replacement after give_engfuncs so that if game dll is
+		// plugin too and uses same method we get combined export table of plugin
+		// and game dll
+		if (!meta_init_linkent_replacement(&g_metamod_module, &g_GameDLL.sys_module)) {
+			Sys_Error("dll: Couldn't load linkent replacement for game DLL");
+		}
 	}

 	// Allow for commands to metamod plugins at startup.  Autoexec.cfg is
@ -509,6 +524,8 @@ static void meta_apply_fix_data(std::vector<fixdata_t>& data)

 void meta_rebuild_callbacks()
 {
+	if (!g_metamod_active) return;
+
 	std::vector<fixdata_t> fixdata;
 	if (g_metaGlobals.esp_save) {
 		META_LOG("dll: Begin scan to collect callback fix data...");
--- a/metamod/src/metamod.h
+++ b/metamod/src/metamod.h
@ -15,6 +15,9 @@
 // cvar to contain version
 extern cvar_t g_meta_version;

+// metamod module handle
+extern CSysModule g_metamod_module;
+
 // Info about the game dll/mod.
 struct gamedll_t
 {
@ -74,6 +77,9 @@ extern unsigned int g_CALL_API_count;
 // stores previous requestid counter
 extern int g_requestid_counter;

+extern bool g_metamod_active;
+extern bool g_dedicated_server;
+
 // (patch by BAILOPAN)
 // Holds cached player info, right now only things for querying cvars
 // Max players is always 32, small enough that we can use a static array
--- a/metamod/src/mextdll.cpp
+++ b/metamod/src/mextdll.cpp
@ -3,7 +3,7 @@
 CExtDll g_meta_extdll;

 CExtDll::CExtDll()
-	: m_hGameDLL(CSysModule::INVALID_HANDLE), m_dlls(nullptr), m_count(nullptr)
+	: m_hGameDLL(CSysModule::INVALID_HANDLE)
 {
 }

@ -17,10 +17,6 @@ void CExtDll::load()

 		return;
 	}
-
-	auto extdll = &m_dlls[(*m_count)++];
-	Q_memset(extdll, 0, sizeof(*extdll));
-	extdll->lDLLHandle = m_hGameDLL;
 }

 void CExtDll::unload()
@ -29,68 +25,13 @@ void CExtDll::unload()
 		g_RehldsFuncs->RemoveExtDll(m_hGameDLL);
 		return;
 	}
-
-	for (auto i = 0u; i < *m_count; i++)
-	{
-		if (m_dlls[i].lDLLHandle == m_hGameDLL)
-		{
-			--(*m_count);
-			if (*m_count != i)
-			{
-				Q_memmove(&m_dlls[i], &m_dlls[i + 1], (*m_count - i) * sizeof(m_dlls[0]));
-				i = *m_count;
-			}
-
-			Q_memset(&m_dlls[i], 0, sizeof(m_dlls[0]));
-			return;
-		}
-	}
 }

 bool CExtDll::init(CSysModule *module)
 {
 	m_hGameDLL = g_GameDLL.sys_module.gethandle();
-
-	if (g_RehldsFuncs) {
-		return true;
-	}
-
-	m_dlls = (extensiondll_t *)module->getsym("g_rgextdll");
-	m_count = (size_t *)module->getsym("g_iextdllMac");
-
-	if (m_dlls && m_count) {
-		return true;
-	}
-
-	// HACK HACK MORE HACK
-	// HLDS SHIT
-	auto pos = module->find_string_push("SV_SaveGameComment");
-	if (!pos) {
+	if (!m_hGameDLL)
 		return false;
-	}

-	const char patterns[2][2][14] = {
-		{ "\x56\x33\xF6\x39\x2A\x2A\x2A\x2A\x2A\x7E\x2A\x53\x8B", "\x5B\xC3\x90\x90\xA1\x2A\x2A\x2A\x2A\x53\x56\x57\x33" },
-		{ "\x53\x8B\x2A\x2A\x2A\x2A\x2A\x57\xBF\x2A\x2A\x2A\x2A", "\x7E\x2A\x8B\x2A\x2A\x2A\x2A\x2A\xBE\x2A\x2A\x2A\x2A" },
-	};
-
-	for (auto i = 0u; i < ARRAYSIZE(patterns); i++)
-	{
-		auto addr = mem_find_pattern(pos - 33, 20, patterns[0][i], sizeof(patterns[0][i]) - 1);
-		if (!addr) {
-			continue;
-		}
-
-		m_count = *(size_t **)(addr + 5);
-
-		addr = mem_find_pattern(addr, 30, patterns[1][i], sizeof(patterns[1][i]) - 1);
-		if (!addr) {
-			return false;
-		}
-
-		m_dlls = *(extensiondll_t **)(addr + 9);
-		return true;
-	}
-
-	return false;
+	return true;
 }
--- a/metamod/src/mextdll.h
+++ b/metamod/src/mextdll.h
@ -12,8 +12,6 @@ public:

 private:
 	module_handle_t m_hGameDLL;
-	extensiondll_t *m_dlls;
-	size_t *m_count;
 };

 extern CExtDll g_meta_extdll;
--- a/metamod/src/mlist.cpp
+++ b/metamod/src/mlist.cpp
@ -573,6 +573,15 @@ void MPluginList::unpause_all()
 	}
 }

+// Unload all plugins currently loaded
+void MPluginList::unload_all()
+{
+	bool delayed;
+	for (auto p : m_plugins) {
+		p->unload(PT_ANYTIME, PNL_CMD_FORCED, delayed);
+	}
+}
+
 // Retry any pending actions on plugins, for instance load/unload delayed
 // until changelevel.
 void MPluginList::retry_all(PLUG_LOADTIME now)
--- a/metamod/src/mlist.h
+++ b/metamod/src/mlist.h
@ -35,6 +35,7 @@ public:
 	bool load();											// load the list, at startup
 	bool refresh(PLUG_LOADTIME now);						// update from re-read inifile
 	void unpause_all();										// unpause any paused plugins
+	void unload_all();										// unload all plugins
 	void retry_all(PLUG_LOADTIME now);						// retry any pending plugin actions
 	void show(int source_index = 0);						// list plugins to console use dynamic alignment
 	void show_static(int source_index = 0);					// list plugins to console use static alignment
--- a/metamod/src/mplugin.cpp
+++ b/metamod/src/mplugin.cpp
@ -471,7 +471,7 @@ bool MPlugin::unload(PLUG_LOADTIME now, PL_UNLOAD_REASON reason, bool& delayed)
 			return false;
 		}
 	}
-	if (m_action != PA_UNLOAD && m_action != PA_RELOAD) {
+	if (m_action != PA_UNLOAD && m_action != PA_RELOAD && reason != PNL_CMD_FORCED) {
 		META_WARNING("dll: Not unloading plugin '%s'; not marked for unload (action=%s)", m_desc, str_action());
 		return false;
 	}
--- a/metamod/src/mreg.cpp
+++ b/metamod/src/mreg.cpp
@ -64,17 +64,21 @@ MRegCmd* MRegCmdList::add(const char* addname, REG_CMD_FN cmd_handler, MPlugin*

 void MRegCmdList::remove(char* cmd_name)
 {
-	for (auto it = m_list.begin(), end = m_list.end(); it != end; ++it) {
+	for (auto it = m_list.begin(); it != m_list.end(); ) {
 		auto reg = *it;

 		if (!Q_stricmp(reg->m_name, cmd_name)) {
 			if (g_RehldsFuncs) {
 				g_RehldsFuncs->Cmd_RemoveCmd(cmd_name);
-				m_list.erase(it);
+				delete reg;
+				it = m_list.erase(it);
 			}
 			else {
 				reg->disable();
+				it++;
 			}
+		} else {
+			it++;
 		}
 	}
 }
@ -82,17 +86,22 @@ void MRegCmdList::remove(char* cmd_name)
 // Disable any functions belonging to the given plugin (by index id).
 void MRegCmdList::remove(int owner_plugin_id)
 {
-	for (auto it = m_list.begin(), end = m_list.end(); it != end; ++it) {
+	for (auto it = m_list.begin(); it != m_list.end(); ) {
 		auto reg = *it;

-		if (reg->m_plugid == owner_plugin_id) {
-			if (g_RehldsFuncs) {
-				g_RehldsFuncs->Cmd_RemoveCmd(reg->m_name);
-				m_list.erase(it);
-			}
-			else {
-				reg->disable();
-			}
+		if (reg->m_plugid != owner_plugin_id) {
+			it++;
+			continue;
+		}
+
+		if (g_RehldsFuncs) {
+			g_RehldsFuncs->Cmd_RemoveCmd(reg->m_name);
+			delete reg;
+			it = m_list.erase(it);
+		}
+		else {
+			reg->disable();
+			it++;
 		}
 	}
 }
--- a/metamod/src/osdep_linkent_linux.cpp
+++ b/metamod/src/osdep_linkent_linux.cpp
@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2004-2006 Jussi Kivilinna
+ *
+ *    This file is part of "Metamod All-Mod-Support"-patch for Metamod.
+ *
+ *    Metamod 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.
+ *
+ *    Metamod is distributed in the hope that it will be useful, but
+ *    WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Metamod; if not, write to the Free Software Foundation,
+ *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *    In addition, as a special exception, the author gives permission to
+ *    link the code of this program with the Half-Life Game Engine ("HL
+ *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
+ *    L.L.C ("Valve").  You must obey the GNU General Public License in all
+ *    respects for all of the code used other than the HL Engine and MODs
+ *    from Valve.  If you modify this file, you may extend this exception
+ *    to your version of the file, but you are not obligated to do so.  If
+ *    you do not wish to do so, delete this exception statement from your
+ *    version.
+ *
+ */
+
+#include "precompiled.h"
+
+#define PAGE_SIZE 4096UL
+#define PAGE_MASK (~(PAGE_SIZE - 1))
+#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+
+ //
+ // Linux code for dynamic linkents
+ //  -- by Jussi Kivilinna
+ //
+
+ // opcode, e9, + sizeof pointer
+#define BYTES_SIZE (1 + sizeof(void*))
+
+typedef void *(*dlsym_func)(void *module, const char *funcname);
+
+static void *gamedll_module_handle = 0;
+static void *metamod_module_handle = 0;
+
+// pointer to original dlsym
+static dlsym_func dlsym_original;
+
+// contains jmp to replacement_dlsym @dlsym_original
+static unsigned char dlsym_new_bytes[BYTES_SIZE];
+
+// contains original bytes of dlsym
+static unsigned char dlsym_old_bytes[BYTES_SIZE];
+
+// Mutex for our protection
+static pthread_mutex_t mutex_replacement_dlsym = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+
+static int is_original_restored;
+
+// constructs new jmp forwarder
+inline void construct_jmp_instruction(void *x, void *place, void *target)
+{
+	((unsigned char *)x)[0] = 0xe9;
+	*(unsigned long *)((char *)x + 1) = (unsigned long)target - ((unsigned long)place + 5);
+}
+
+// checks if pointer x points to jump forwarder
+inline bool is_code_trampoline_jmp_opcode(void *x)
+{
+	return (((unsigned char *)x)[0] == 0xff || ((unsigned char *)x)[1] == 0x25);
+}
+
+// extracts pointer from "jmp dword ptr[pointer]"
+inline void *extract_function_pointer_from_trampoline_jmp(void *x)
+{
+	return (**(void ***)((char *)(x) + 2));
+}
+
+//
+// restores old dlsym
+//
+inline void restore_original_dlsym()
+{
+	//Copy old dlsym bytes back
+	memcpy((void *)dlsym_original, dlsym_old_bytes, BYTES_SIZE);
+}
+
+//
+// resets new dlsym
+//
+inline void reset_dlsym_hook()
+{
+	//Copy new dlsym bytes back
+	memcpy((void *)dlsym_original, dlsym_new_bytes, BYTES_SIZE);
+}
+
+//
+// Replacement dlsym function
+//
+static void *__replacement_dlsym(void *module, const char *funcname)
+{
+	// these are needed in case dlsym calls dlsym, default one doesn't do
+	// it but some LD_PRELOADed library that hooks dlsym might actually
+	// do so.
+	int was_original_restored = is_original_restored;
+
+	// Lock before modifing original dlsym
+	pthread_mutex_lock(&mutex_replacement_dlsym);
+
+	// restore old dlsym
+	if (!is_original_restored)
+	{
+		restore_original_dlsym();
+		is_original_restored = 1;
+	}
+
+	// check if we should hook this call
+	if (module != metamod_module_handle || !metamod_module_handle || !gamedll_module_handle)
+	{
+		//no metamod/gamedll module? should we remove hook now?
+		void *retval = dlsym_original(module, funcname);
+		if (metamod_module_handle && gamedll_module_handle)
+		{
+			if (!was_original_restored)
+			{
+				// reset dlsym hook
+				reset_dlsym_hook();
+				is_original_restored = 0;
+			}
+		}
+		else
+		{
+			// no metamod/gamedll module? should we remove hook now by not reseting it back?
+		}
+
+		// unlock
+		pthread_mutex_unlock(&mutex_replacement_dlsym);
+		return retval;
+	}
+
+	// dlsym on metamod module
+	void *func = dlsym_original(module, funcname);
+
+	if (!func)
+	{
+		// function not in metamod module, try gamedll
+		func = dlsym_original(gamedll_module_handle, funcname);
+	}
+
+	if (!was_original_restored)
+	{
+		// reset dlsym hook
+		reset_dlsym_hook();
+
+		is_original_restored = 0;
+	}
+
+	// unlock
+	pthread_mutex_unlock(&mutex_replacement_dlsym);
+	return func;
+}
+
+//
+// Initialize
+//
+bool meta_init_linkent_replacement(CSysModule *moduleMetamod, CSysModule *moduleGame)
+{
+	metamod_module_handle = moduleMetamod->gethandle();
+	gamedll_module_handle = moduleGame->gethandle();
+
+	// dlsym is already known to be pointing to valid function, we loaded gamedll using it earlier!
+	void *sym_ptr = (void *)&dlsym;
+	while (is_code_trampoline_jmp_opcode(sym_ptr))
+	{
+		sym_ptr = extract_function_pointer_from_trampoline_jmp(sym_ptr);
+	}
+
+	dlsym_original = (dlsym_func)sym_ptr;
+
+	// Backup old bytes of "dlsym" function
+	memcpy(dlsym_old_bytes, (void *)dlsym_original, BYTES_SIZE);
+
+	// Construct new bytes: "jmp offset[replacement_sendto] @ sendto_original"
+	construct_jmp_instruction((void *)&dlsym_new_bytes[0], (void *)dlsym_original, (void *)&__replacement_dlsym);
+
+	// Check if bytes overlap page border.
+	unsigned long start_of_page = PAGE_ALIGN((long)dlsym_original) - PAGE_SIZE;
+	unsigned long size_of_pages = 0;
+
+	if ((unsigned long)dlsym_original + BYTES_SIZE > PAGE_ALIGN((unsigned long)dlsym_original))
+	{
+		// bytes are located on two pages
+		size_of_pages = PAGE_SIZE * 2;
+	}
+	else
+	{
+		// bytes are located entirely on one page.
+		size_of_pages = PAGE_SIZE;
+	}
+
+	// Remove PROT_READ restriction
+	if (mprotect((void *)start_of_page, size_of_pages, PROT_READ | PROT_WRITE | PROT_EXEC))
+	{
+		META_ERROR("Couldn't initialize dynamic linkents, mprotect failed: %i.  Exiting...", errno);
+		return false;
+	}
+
+	// Write our own jmp-forwarder on "dlsym"
+	reset_dlsym_hook();
+
+	// done
+	return true;
+}
+
+void meta_shutdown_linkent_replacement()
+{
+	// Lock before modifing original dlsym
+	pthread_mutex_lock(&mutex_replacement_dlsym);
+
+	// restore old dlsym
+	if (!is_original_restored)
+	{
+		restore_original_dlsym();
+		is_original_restored = 1;
+	}
+
+	pthread_mutex_unlock(&mutex_replacement_dlsym);
+}
--- a/metamod/src/osdep_linkent_win32.cpp
+++ b/metamod/src/osdep_linkent_win32.cpp
@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2004-2006 Jussi Kivilinna
+ *
+ *    This file is part of "Metamod All-Mod-Support"-patch for Metamod.
+ *
+ *    Metamod 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.
+ *
+ *    Metamod is distributed in the hope that it will be useful, but
+ *    WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Metamod; if not, write to the Free Software Foundation,
+ *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *    In addition, as a special exception, the author gives permission to
+ *    link the code of this program with the Half-Life Game Engine ("HL
+ *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
+ *    L.L.C ("Valve").  You must obey the GNU General Public License in all
+ *    respects for all of the code used other than the HL Engine and MODs
+ *    from Valve.  If you modify this file, you may extend this exception
+ *    to your version of the file, but you are not obligated to do so.  If
+ *    you do not wish to do so, delete this exception statement from your
+ *    version.
+ *
+ */
+
+#include "precompiled.h"
+
+//
+// Win32 code for dynamic linkents
+//  -- by Jussi Kivilinna
+//
+
+//
+// Reads metamod.dll and game.dll function export tables and combines theim to
+// single table that replaces metamod.dll's original table.
+//
+
+typedef struct sort_names_s {
+	unsigned long  name;
+	unsigned short nameOrdinal;
+} sort_names_t;
+
+// relative virtual address to virtual address
+#define rva_to_va(base, rva) ((unsigned long)base + (unsigned long)rva)
+
+// virtual address to relative virtual address
+#define va_to_rva(base, va) ((unsigned long)va - (unsigned long)base)
+
+//
+// Checks module signatures and return ntheaders pointer for valid module
+//
+static IMAGE_NT_HEADERS *get_ntheaders(HMODULE module)
+{
+	union {
+		unsigned long      mem;
+		IMAGE_DOS_HEADER * dos;
+		IMAGE_NT_HEADERS * pe;
+	} mem;
+
+	//Check if valid dos header
+	mem.mem = (unsigned long)module;
+	if (IsBadReadPtr(mem.dos, sizeof(*mem.dos)) || mem.dos->e_magic != IMAGE_DOS_SIGNATURE)
+		return NULL;
+
+	//Get and check pe header
+	mem.mem = rva_to_va(module, mem.dos->e_lfanew);
+	if (IsBadReadPtr(mem.pe, sizeof(*mem.pe)) || mem.pe->Signature != IMAGE_NT_SIGNATURE)
+		return NULL;
+
+	return mem.pe;
+}
+
+//
+// Returns export table for valid module
+//
+static IMAGE_EXPORT_DIRECTORY *get_export_table(HMODULE module)
+{
+	union {
+		unsigned long            mem;
+		void *                   pvoid;
+		IMAGE_DOS_HEADER       * dos;
+		IMAGE_NT_HEADERS       * pe;
+		IMAGE_EXPORT_DIRECTORY * export_dir;
+	} mem;
+
+	// Check module
+	mem.pe = get_ntheaders(module);
+	if (!mem.pe)
+		return NULL;
+
+	// Check for exports
+	if (!mem.pe->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress)
+		return NULL;
+
+	mem.mem = rva_to_va(module, mem.pe->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress);
+	if (IsBadReadPtr(mem.export_dir, sizeof(*mem.export_dir)))
+		return NULL;
+
+	return mem.export_dir;
+}
+
+//
+// Sort function for qsort
+//
+static int sort_names_list(const sort_names_t * A, const sort_names_t * B)
+{
+	const char *str_A = (const char *)A->name;
+	const char *str_B = (const char *)B->name;
+
+	return Q_strcmp(str_A, str_B);
+}
+
+//
+// Combines meta_module and game_module export tables and replaces meta_module table with new one
+//
+static bool combine_module_export_tables(CSysModule *meta_module, CSysModule *game_module)
+{
+	IMAGE_EXPORT_DIRECTORY * exportMM;
+	IMAGE_EXPORT_DIRECTORY * exportGame;
+
+	unsigned long    newNumberOfFunctions;
+	unsigned long    newNumberOfNames;
+	unsigned long  * newFunctions;
+	unsigned long  * newNames;
+	unsigned short * newNameOrdinals;
+	sort_names_t   * newSort;
+
+	unsigned long i;
+	unsigned long u;
+	unsigned long funcCount;
+	unsigned long nameCount;
+	unsigned long listFix;
+
+	HMODULE moduleMeta = meta_module->gethandle();
+	HMODULE moduleGame = game_module->gethandle();
+
+	// Get export tables
+	exportMM   = get_export_table(moduleMeta);
+	exportGame = get_export_table(moduleGame);
+	if (!exportMM || !exportGame)
+	{
+		META_ERROR("Couldn't initialize dynamic linkents, exportMM: %i, exportGame: %i.  Exiting...", exportMM, exportGame);
+		return false;
+	}
+
+	// setup new export table
+	newNumberOfFunctions = exportMM->NumberOfFunctions + exportGame->NumberOfFunctions;
+	newNumberOfNames     = exportMM->NumberOfNames     + exportGame->NumberOfNames;
+
+	// alloc lists
+	*(void**)&newFunctions = calloc(1, newNumberOfFunctions * sizeof(*newFunctions));
+	*(void**)&newSort      = calloc(1, newNumberOfNames * sizeof(*newSort));
+
+	// copy moduleMeta to new export
+	for (funcCount = 0; funcCount < exportMM->NumberOfFunctions; funcCount++)
+		newFunctions[funcCount] = rva_to_va(moduleMeta, ((unsigned long *)rva_to_va(moduleMeta, exportMM->AddressOfFunctions))[funcCount]);
+
+	for (nameCount = 0; nameCount < exportMM->NumberOfNames; nameCount++)
+	{
+		// fix name address
+		newSort[nameCount].name = rva_to_va(moduleMeta, ((unsigned long *)rva_to_va(moduleMeta, exportMM->AddressOfNames))[nameCount]);
+
+		// ordinal is index to function list
+		newSort[nameCount].nameOrdinal = ((unsigned short *)rva_to_va(moduleMeta, exportMM->AddressOfNameOrdinals))[nameCount];
+	}
+
+	// copy moduleGame to new export
+	for (i = 0; i < exportGame->NumberOfFunctions; i++)
+		newFunctions[funcCount + i] = rva_to_va(moduleGame, ((unsigned long *)rva_to_va(moduleGame, exportGame->AddressOfFunctions))[i]);
+
+	for (i = 0, listFix = 0; i < exportGame->NumberOfNames; i++)
+	{
+		const char *name = (const char *)rva_to_va(moduleGame, ((unsigned long *)rva_to_va(moduleGame, exportGame->AddressOfNames))[i]);
+		//Check if name already in the list
+		for (u = 0; u < nameCount; u++)
+		{
+			if (!Q_stricmp(name, (const char *)newSort[u].name))
+			{
+				listFix -= 1;
+				break;
+			}
+		}
+
+		if (u < nameCount) //already in the list.. skip
+			continue;
+
+		newSort[nameCount + i + listFix].name = (unsigned long)name;
+		newSort[nameCount + i + listFix].nameOrdinal = (unsigned short)funcCount + ((unsigned short *)rva_to_va(moduleGame, exportGame->AddressOfNameOrdinals))[i];
+	}
+
+	//set new number
+	newNumberOfNames = nameCount + i + listFix;
+
+	//sort names list
+	qsort(newSort, newNumberOfNames, sizeof(*newSort), (int(*)(const void*, const void*))&sort_names_list);
+
+	//make newNames and newNameOrdinals lists (VirtualAlloc so we dont waste heap memory to stuff that isn't freed)
+	*(void**)&newNames        = VirtualAlloc(0, newNumberOfNames * sizeof(*newNames), MEM_COMMIT, PAGE_READWRITE);
+	*(void**)&newNameOrdinals = VirtualAlloc(0, newNumberOfNames * sizeof(*newNameOrdinals), MEM_COMMIT, PAGE_READWRITE);
+
+	for (i = 0; i < newNumberOfNames; i++)
+	{
+		newNames[i]        = newSort[i].name;
+		newNameOrdinals[i] = newSort[i].nameOrdinal;
+	}
+
+	free(newSort);
+
+	// translate VAs to RVAs
+	for (i = 0; i < newNumberOfFunctions; i++)
+		newFunctions[i] = va_to_rva(moduleMeta, newFunctions[i]);
+
+	for (i = 0; i < newNumberOfNames; i++)
+	{
+		newNames[i] = va_to_rva(moduleMeta, newNames[i]);
+		newNameOrdinals[i] = (unsigned short)va_to_rva(moduleMeta, newNameOrdinals[i]);
+	}
+
+	DWORD OldProtect;
+	if (!VirtualProtect(exportMM, sizeof(*exportMM), PAGE_READWRITE, &OldProtect))
+	{
+		META_ERROR("Couldn't initialize dynamic linkents, VirtualProtect failed: %i.  Exiting...", GetLastError());
+		return false;
+	}
+
+	exportMM->Base              = 1;
+	exportMM->NumberOfFunctions = newNumberOfFunctions;
+	exportMM->NumberOfNames     = newNumberOfNames;
+	*(unsigned long*)&(exportMM->AddressOfFunctions)    = va_to_rva(moduleMeta, newFunctions);
+	*(unsigned long*)&(exportMM->AddressOfNames)        = va_to_rva(moduleMeta, newNames);
+	*(unsigned long*)&(exportMM->AddressOfNameOrdinals) = va_to_rva(moduleMeta, newNameOrdinals);
+
+	VirtualProtect(exportMM, sizeof(*exportMM), OldProtect, &OldProtect);
+	return true;
+}
+
+bool meta_init_linkent_replacement(CSysModule *moduleMetamod, CSysModule *moduleGame)
+{
+	return combine_module_export_tables(moduleMetamod, moduleGame);
+}
+
+void meta_shutdown_linkent_replacement()
+{
+	// no-op
+}
--- a/metamod/src/precompiled.h
+++ b/metamod/src/precompiled.h
@ -53,6 +53,7 @@
 #include "mem_utils.h"
 #include "callback_jit.h"
 #include "meta_rehlds_api.h"
+#include "physint.h"

 #undef CreateInterface
 #include "linkent.h"
--- a/metamod/src/sys_module.cpp
+++ b/metamod/src/sys_module.cpp
@ -68,6 +68,7 @@ module_handle_t CSysModule::load(const char *filepath)
 {
 	if (!m_handle) {
 		m_handle = LoadLibrary(filepath);
+		if (m_handle) m_free = true;

 		MODULEINFO module_info;
 		if (GetModuleInformation(GetCurrentProcess(), m_handle, &module_info, sizeof(module_info))) {
@ -157,6 +158,7 @@ module_handle_t CSysModule::load(const char *filepath)
 {
 	if (!m_handle) {
 		m_handle = dlopen(filepath, RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
+		if (m_handle) m_free = true;

 		char buf[1024], dummy[1024], path[260];
 		Q_sprintf(buf, "/proc/%i/maps", getpid());
@ -192,7 +194,7 @@ bool CSysModule::unload()

 	bool ret = true;
 	if (m_free) {
-		ret = dlclose(m_handle) != 0;
+		ret = dlclose(m_handle) == 0;
 	}

 	m_handle = INVALID_HANDLE;
Author	SHA1	Message	Date
STAM	273618c684	deleted old issue templates	2024-11-20 00:24:39 +03:00
STAM	0424bed00e	deleted local GitHub Action	2024-11-20 00:24:26 +03:00
STAM	ae86a6f41e	LICENSE.md -> LICENSE	2024-11-15 17:36:24 +03:00
STAM	d24c1994b7	metainfo updated: issue configs	2024-11-04 00:37:44 +03:00
STAM	616d208a25	Automatic sync with Gitlab's read-only mirror	2024-11-02 19:43:27 +03:00
STAM	1027ed0515	Automatic sync with Gitlab's read-only mirror	2024-11-02 19:30:27 +03:00
STAM	98879bdaac	metainfo updated: REAMDE.md - fixed broken images and updated links	2024-10-30 18:19:54 +03:00
STAM	d8ddb05638	Merge pull request #73 from rehlds/feature/changelog-support Added Changelog file	2024-10-30 14:44:36 +03:00
STAM	22c0ec665b	Update CHANGELOG.md Co-authored-by: Sergey Shorokhov <wopox1337@ya.ru>	2024-10-30 13:28:32 +03:00
STAM	8e4b8af1c4	sync with master	2024-10-30 13:26:07 +03:00
Sergey Shorokhov	011e8234e2	chore(ci): update CI workflows for compatibility and consistency (#74 ) - Updated action versions (`checkout@v4`, `upload-artifact@v4`, `download-artifact@v4`, `gh-release@v2`) for enhanced compatibility and security - Upgraded MSBuild setup action to `v2` - Switched to a Debian slim container for the Linux build to ensure compatibility - Simplified dependency installation on Linux and included multilib support for 32-bit builds - Removed unnecessary cleanup steps for temporary artifacts - Ensured consistent action versions across jobs and steps Co-authored-by: s1lentq <s1lentsk@yandex.ru>	2024-10-29 09:19:26 +03:00
STAM	8dcdd6833c	Changelog fixes. Thanks @a1batross	2024-10-28 17:49:05 +03:00
STAM	720a63eacd	changelog refactoring	2024-10-28 12:59:08 +03:00
STAM	29b24fb9ea	backporting changelogs to file	2024-10-23 18:00:56 +03:00
STAM	a2cc1fb8bd	converted original changelog to md	2024-10-23 17:42:41 +03:00
STAM	31c8b41738	rollbacked original changelog	2024-10-23 17:37:12 +03:00
Alibek Omarov	cedda15813	Basic Xash3D support (#71 ) Use Xash3D physics interface as an alternative linkent method	2024-05-01 21:06:54 +07:00
s1lentq	603a2574e9	Fixed wrong result condition	2024-01-16 01:20:13 +07:00
s1lentq	096f4383b0	UNDONE: Gracefully shutdown metamod plugins for dedicated server (amxx modules unload unstable)	2024-01-16 00:35:31 +07:00
STAM	265a818856	issue templates updated #66	2023-12-06 18:41:59 +03:00
STAM	cd11920267	GitHub improvements v2 GitHub improvements	2023-12-06 18:33:50 +03:00
STAM	d7125e99e9	fix yaml lint #66	2023-12-06 18:29:51 +03:00
STAM	3d783bdb9b	Merge branch 'master' into feature/github-improvements	2023-12-06 16:06:43 +03:00
STAM	0e0d84013e	updated "task" and "feature" issue templates	2023-12-06 16:05:29 +03:00
STAM	385a2229da	GitHub improvements (#64 ) * bug template * updated "paths-ignore" in build rules for ".github" folder dont trigger and publish build when changes only in ".github" folder * added "task" and "feature" issue templates	2023-12-06 19:30:13 +07:00
STAM	a05af41a82	added "task" and "feature" issue templates	2023-12-03 21:08:12 +03:00
STAM	6d3a663c33	updated "paths-ignore" in build rules for ".github" folder dont trigger and publish build when changes only in ".github" folder	2023-12-03 21:01:01 +03:00
STAM	d672d76bbd	bug template	2023-12-03 20:57:03 +03:00
s1lentq	5179c25986	Update README.md	2023-11-28 18:34:38 +07:00
s1lentq	24e086ae2f	Fix stub plugin (Closes #43 )	2023-11-28 18:23:17 +07:00
s1lentq	0c99300d8d	Update stub plugin	2023-11-28 18:10:30 +07:00
s1lentq	3af38129f4	Update workflows/build.yml Fixes CI warnings	2023-11-28 18:03:29 +07:00
s1lentq	83c9d6e177	Backport linkent for hlds (and listenserver) without rehlds	2023-11-28 17:56:52 +07:00
s1lentq	0118e05280	Improved initialization of rehlds api Prefer Sys_GetModuleHandle over Sys_LoadModule to avoid unnecessary reference count increase	2023-11-28 16:39:09 +07:00
s1lentq	ec926a611f	Gracefully shutdown metamod and plugins when game is closing (for a proper reload using _restart command)	2023-11-28 16:28:55 +07:00