Compare revisions

82f019b8 · e3e76c2b · aecb1e67 · 17987918 · 0a6ee07b · 4e36099b
--- a/.editorconfig
+++ b/.editorconfig
+[*.cs]
+indent_style = tab
\ No newline at end of file
--- a/.github/workflows/continuous_integration_other.yml
+++ b/.github/workflows/continuous_integration_other.yml
@@ -10,10 +10,10 @@ jobs:
      fail-fast: false
      matrix:
        config:
-        - {
-            name: "macOS",
-            os: macos-latest
-          }
+#        - {
+#            name: "macOS",
+#            os: macos-latest
+#          }
        - {
            name: "Linux",
            os: ubuntu-latest
@@ -27,7 +27,8 @@ jobs:
        if [[ "${{ runner.os }}" == 'macOS' ]]; then
          make mac
        elif [[ "${{ runner.os }}" == 'Linux' ]]; then
-          sudo apt install mesa-common-dev
+          sudo apt-get update
+          sudo apt install mesa-common-dev libxfixes-dev
          make linux
        fi

@@ -56,11 +57,6 @@ jobs:
          fi
        done

-    - name: Prepare Package
-      run: |
-        # Delete unwanted files
-        rm -r Build/Setup
-
    - name: Upload Package
      uses: actions/upload-artifact@v1
      with:

--- a/.github/workflows/continuous_integration_windows.yml
+++ b/.github/workflows/continuous_integration_windows.yml
@@ -22,13 +22,13 @@ jobs:
        $options = @( `
          '-property:Configuration=${{ matrix.configuration }}', `
          '-property:Platform=${{ matrix.platform }}', `
-          '-property:WindowsTargetPlatformVersion=10.0', `
-          '-property:PlatformToolset=v142', `
          '-maxcpucount', `
          '-verbosity:minimal' `
        )
        & $msbuild Builder.sln $options
+        if (-not $?) { throw "Build failed" }
        & $msbuild Source\Tools\Updater\Updater.csproj $options
+        if (-not $?) { throw "Build failed" }

    - name: Test Files Presence
      run: |

--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,13 @@ bin
 /Source/Core/*.user
 /Build/libBuilderNative.so
 /Build/OpenGLDebug.log
+/Source/Native/*.log
+/Build/builder
+/Build/System.Buffers.dll
+/Build/System.Memory.dll
+/Build/System.Numerics.Vectors.dll
+/Build/System.Runtime.CompilerServices.Unsafe.dll
+/Build/Updater.ini
+/Build.Native
+/builder
+*.csproj.dtbcache.json
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+variables:
+  BUILDTYPE: Release
+
+default:
+  image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable
+
+  cache:
+    - key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
+      fallback_keys:
+        - cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
+        - cache-$CI_PROJECT_PATH_SLUG-default
+      paths:
+        - ccache
+        #- ccache_statslog
+
+    - key: apt-$CI_JOB_IMAGE
+      paths:
+        - apt-cache
+      unprotect: true
+
+  before_script:
+    - - |
+         # debconf
+         echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+      - export DEBIAN_FRONTEND="noninteractive"
+      - export DEBIAN_PRIORITY="low"
+      - export DEBCONF_NONINTERACTIVE_SEEN="true"
+      - |
+          # debconf
+          echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
+    - - |
+          # dpkg_aa
+          echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+      - dpkg --add-architecture i386
+      - dpkg --add-architecture amd64
+      - dpkg --add-architecture arm64
+      - |
+          # dpkg_aa
+          echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
+
+    - - |
+          # apt_conf
+          echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+      - export APT_CACHE_DIR=`pwd`/apt-cache
+      - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+      - touch /etc/apt/apt.conf.d/99build
+      - |
+          # apt.conf
+          echo Adding options to apt.conf':'
+      - |
+          # APT::Install-Recommends
+          echo APT::Install-Recommends "false"\;       | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # quit
+          echo quiet "1"\;                             | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # APT::Get::Assume-Yes
+          echo APT::Get::Assume-Yes "true"\;           | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # Dir::Cache::Archives
+          echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # apt_conf
+          echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
+
+    - - |
+          # apt_update
+          echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+      - apt-get update
+      - |
+          # apt_update
+          echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+
+    - - |
+          # apt_pre
+          echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+      - apt-get install apt-utils
+      - |
+          # apt_pre
+          echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+
+    - - |
+          # apt_upgrade
+          echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+      - apt-get upgrade
+      - |
+          # apt_update
+          echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
+
+    - - |
+          # apt_common
+          echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+      - apt-get install make git ccache
+      - |
+          # apt_common
+          echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+
+    - - |
+          # ccache_config
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
+      - mkdir --parents --verbose ~/.ccache/
+      - touch ~/.ccache/ccache.conf
+      - |
+          # cache.conf
+          echo Adding ccache configution option
+      - |
+          # base_dir
+          echo base_dir = $PWD                  | tee --append ~/.ccache/ccache.conf
+      - |
+          # cache_dir
+          echo cache_dir = $PWD/ccache          | tee --append ~/.ccache/ccache.conf
+      - |
+          # compiler_check
+          echo compiler_check = content         | tee --append ~/.ccache/ccache.conf
+      - |
+          # stats_log
+          echo #stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+      - |
+          # max_size
+          echo max_size = 50M                   | tee --append ~/.ccache/ccache.conf
+      - |
+          # ccache_config
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+
+    - - |
+          # cache_reset
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+      - ccache --zero-stats
+      - ccache --show-stats
+      - |
+          # ccache_reset
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+
+  artifacts:
+    paths:
+      - "Build/"
+    exclude:
+      - "Build/Source/Native/*.d"
+      - "Build/Source.Native/*.o"
+      - "Build/Source.Native/OpenGL/*.d"
+      - "Build/Source.Native/OpenGL/*.o"
+      - "Build/Source.Native/OpenGL/gl_load/*.d"
+      - "Build/Source.Native/OpenGL/gl_load/*.o"
+      - "Build/Source.Native/VPO/*.d"
+      - "Build/Source.Native/VPO/*.o"
+      - "Build/libBuilderNative.so"
+    expose_as: "Base"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  after_script:
+    - - |
+           # apt_clean
+           echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+      - apt-get autoclean
+      - |
+          # apt_clean
+          echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+
+    - - |
+          # ccache_stats
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
+      - ccache --show-stats --verbose || ccache --show-stats
+      - ccache --show-log-stats --verbose || ccache --show-log-stats || true
+      - |
+          # ccahe_stats
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+
+stages:
+  - build
+
+Release:
+  stage: build
+
+  variables:
+    CC: ccache clang
+    CXX: ccache clang
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install clang msbuild
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling UZB"
+     - make --keep-going --silent || make --keep-going
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+i386:
+  stage: build
+
+  variables:
+    CC: ccache i686-linux-gnu-gcc
+    CXX: ccache i686-linux-gnu-g++
+    CPPFLAGS: -msse2
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux i386"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-i686-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:i386
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+amd64:
+  stage: build
+
+  variables:
+    CC: ccache x86_64-linux-gnu-gcc
+    CXX: ccache x86_64-linux-gnu-gcc
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux amd64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-x86-64-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:amd64
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+arm64:
+  stage: build
+
+  variables:
+    CC: ccache aarch64-linux-gnu-gcc
+    CXX: ccache aarch64-linux-gnu-g++
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux arm64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-aarch64-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:arm64
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+win32:
+  stage: build
+
+  variables:
+    CC: ccache i686-w64-mingw32-gcc-posix
+    CXX: ccache i686-w64-mingw32-g++-posix
+
+  artifacts:
+    paths:
+      - "Build/BuilderNative.dll"
+    expose_as: "Windows x86"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-mingw-w64-i686
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/BuilderNative.dll MINGW=1 || make --keep-going Build/BuilderNative.dll MINGW=1
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+win64:
+  stage: build
+
+  variables:
+    CC: ccache x86_64-w64-mingw32-gcc-posix
+    CXX: ccache x86_64-w64-mingw32-g++-posix
+
+  artifacts:
+    paths:
+      - "Build/BuilderNative.dll"
+    expose_as: "Windows amd64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-mingw-w64-x86-64
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/BuilderNative.dll MINGW=1 || make --keep-going Build/BuilderNative.dll MINGW=1
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+Debug:
+  extends:
+    - Release
+
+  allow_failure: true
+
+  variables:
+    BUILDTYPE: Debug
--- a/Build/.gitignore
+++ b/Build/.gitignore
-Updater.exe
-Updater.ini
-Updater.pdb
-DevIL.dll
-Screenshots
\ No newline at end of file
+Updater.exe
+Updater.ini
+Updater.pdb
+DevIL.dll
+Screenshots
+/Source
--- a/Build/Compilers/BCC/bcc.cfg
+++ b/Build/Compilers/BCC/bcc.cfg
@@ -7,9 +7,9 @@ compilers
 	// All others are the required files (the setting names do not matter)
 	bcc
 	{
-		interface = "AccCompiler";
+		interface = "BccCompiler";
 		program = "bcc.exe";
-		zcommon = "zcommon.acs";
+		zcommon = "zcommon.bcs";
 		std = "std.acs";
 	}
 }
--- a/Build/Compilers/BCC/zcommon.acs
+++ b/Build/Compilers/BCC/zcommon.acs
--- a/Build/Compilers/ZDaemon/zdaemon.acs
+++ b/Build/Compilers/ZDaemon/zdaemon.acs
@@ -29,9 +29,9 @@
 //**    It will give you online info about the ZDaemon extensions.
 //**
 //***************************************************************************
- 
+
 // ZDaemon ACSF Functions ---------------------------------------------------
- 
+
 special
 //	-19620:GetTeamScore(1),			//already defined in zspecial.acs
 //	-19621:SetTeamScore(2),			//already defined in zspecial.acs
@@ -53,50 +53,63 @@ special
 	-19637:Arti_Execute(2,5),
 	-19638:Arti_ExecuteAlways(2,5),
 	-19639:Arti_NamedExecute(2,5),
-	-19640:Arti_NamedExecuteAlways(2,5);
+	-19640:Arti_NamedExecuteAlways(2,5),
+	-19641:ZD_SetActorCameraHeight(2),
+	-19642:ZD_SetMarineSkin(2),
+	-19643:ZD_GetSkinName(1),
+	-19644:ZD_GetSkinTopIndex(0),
+	-19645:ZD_GetGameInfo(1),
+	-19646:ZD_GetMarineSkin(1);

 // Team specifiers you can use with GetTeamScore/SetTeamScore ---------------
- 
-//#define TEAM_BLUE               0		//already defined in zdefs.acs
-//#define TEAM_RED                1		//already defined in zdefs.acs
-#define TEAM_GREEN              2
-#define TEAM_WHITE              3
+
+//#define TEAM_BLUE                  0		//already defined in zdefs.acs
+//#define TEAM_RED                   1		//already defined in zdefs.acs
+#define TEAM_GREEN                 2
+#define TEAM_WHITE                 3

 // More Properties you can use with GetPlayerInfo/SetPlayerInfo -------------

-#define PLAYERINFO_ITEMS        100
-#define PLAYERINFO_HEALTH       101
-#define PLAYERINFO_ARMOR        102
-#define PLAYERINFO_SECRETS      103
-#define PLAYERINFO_KILLS        104
-#define PLAYERINFO_DEATHS       105
-#define PLAYERINFO_SUICIDES     106
-#define PLAYERINFO_PTS_1        107
-#define PLAYERINFO_PTS_2        108
-#define PLAYERINFO_PTS_3        109
-#define PLAYERINFO_TIME	        110
-#define PLAYERINFO_USR_1        111
-#define PLAYERINFO_USR_2        112
-#define PLAYERINFO_USR_3        113
-#define PLAYERINFO_USR_4        114
-#define PLAYERINFO_USR_5        115
-#define PLAYERINFO_USR_6        116
-#define PLAYERINFO_USR_7        117
-#define PLAYERINFO_USR_8        118
-#define PLAYERINFO_USR_9        119
-#define PLAYERINFO_USR_10       120
-#define PLAYERINFO_MORPHTICS    121
-#define PLAYERINFO_MORPHED      122
-#define PLAYERINFO_READYWEAPON  123
+#define PLAYERINFO_ITEMS           100
+#define PLAYERINFO_HEALTH          101
+#define PLAYERINFO_ARMOR           102
+#define PLAYERINFO_SECRETS         103
+#define PLAYERINFO_KILLS           104
+#define PLAYERINFO_DEATHS          105
+#define PLAYERINFO_SUICIDES        106
+#define PLAYERINFO_PTS_1           107
+#define PLAYERINFO_PTS_2           108
+#define PLAYERINFO_PTS_3           109
+#define PLAYERINFO_TIME            110
+#define PLAYERINFO_USR_1           111
+#define PLAYERINFO_USR_2           112
+#define PLAYERINFO_USR_3           113
+#define PLAYERINFO_USR_4           114
+#define PLAYERINFO_USR_5           115
+#define PLAYERINFO_USR_6           116
+#define PLAYERINFO_USR_7           117
+#define PLAYERINFO_USR_8           118
+#define PLAYERINFO_USR_9           119
+#define PLAYERINFO_USR_10          120
+#define PLAYERINFO_MORPHTICS       121
+#define PLAYERINFO_MORPHED         122
+#define PLAYERINFO_READYWEAPON     123

 // Return values for PLAYERINFO_MORPHED -------------------------------------

-#define MORPHEDTO_NONE          0
-#define MORPHEDTO_CHICK         1
-#define MORPHEDTO_PIG           2
+#define MORPHEDTO_NONE             0
+#define MORPHEDTO_CHICK            1
+#define MORPHEDTO_PIG              2

 // Return values for NetMode ------------------------------------------------

-#define NM_SINGLEPLAYER         1
-#define NM_SERVER               2
-#define NM_CLIENT               3
+#define NM_SINGLEPLAYER            1
+#define NM_SERVER                  2
+#define NM_CLIENT                  3
+
+// Return values for ZD_GetGameInfo -----------------------------------------
+
+#define ZD_GAMEINFO_SURVIVALRESET  0
+#define ZD_GAMEINFO_IN_OVERTIME    1
+#define ZD_GAMEINFO_IN_WARMUP      2
+#define ZD_GAMEINFO_IN_LOBBY       3
--- a/Build/Compilers/ZDoom/acc.exe
+++ b/Build/Compilers/ZDoom/acc.exe
--- a/Build/Compilers/ZDoom/zcommon.acs
+++ b/Build/Compilers/ZDoom/zcommon.acs
-
-//**************************************************************************
-//**
-//** zcommon.acs
-//**
-//**************************************************************************
-
-// If you are not using the -h command line switch and do not want to use
-// WadAuthor's error checker, you can uncomment the following line to shave
-// a few bytes off the size of compiled scripts.
-//#nowadauthor
-
-#include "zspecial.acs"
-#include "zdefs.acs"
-#include "zwvars.acs"
+
+//**************************************************************************
+//**
+//** zcommon.acs
+//**
+//**************************************************************************
+
+// If you are not using the -h command line switch and do not want to use
+// WadAuthor's error checker, you can uncomment the following line to shave
+// a few bytes off the size of compiled scripts.
+//#nowadauthor
+
+#include "zspecial.acs"
+#include "zdefs.acs"
+#include "zwvars.acs"
--- a/Build/Compilers/ZDoom/zdefs.acs
+++ b/Build/Compilers/ZDoom/zdefs.acs
--- a/Build/Compilers/ZDoom/zspecial.acs
+++ b/Build/Compilers/ZDoom/zspecial.acs
--- a/Build/Compilers/ZDoom/zwvars.acs
+++ b/Build/Compilers/ZDoom/zwvars.acs
-
-//**************************************************************************
-//**
-//** zwvars.acs
-//**
-//**************************************************************************
-
-// include your world-variable declarations here.
+
+//**************************************************************************
+//**
+//** zwvars.acs
+//**
+//**************************************************************************
+
+// include your world-variable declarations here.
--- a/Build/Compilers/Zandronum/acc.exe
+++ b/Build/Compilers/Zandronum/acc.exe
--- a/Build/Compilers/Zandronum/zdefs.acs
+++ b/Build/Compilers/Zandronum/zdefs.acs
@@ -193,6 +193,10 @@
 #define CR_DARKGRAY				20
 #define CR_DARKGREY				20
 #define CR_CYAN					21
+#define CR_ICE					22
+#define CR_FIRE					23
+#define CR_SAPPHIRE				24
+#define CR_TEAL					25

 // HUD message types --------------------------------------------------------

@@ -289,6 +293,21 @@
 #define APROP_ViewHeight	39
 #define APROP_AttackZOffset	40
 #define APROP_StencilColor	41
+#define APROP_Friction		42
+#define APROP_DamageMultiplier	43
+#define APROP_MaxStepHeight 44
+#define APROP_MaxDropOffHeight 45
+#define APROP_DamageType	46
+
+// New to Eternity
+#define APROP_Counter0      100
+#define APROP_Counter1      101
+#define APROP_Counter2      102
+#define APROP_Counter3      103
+#define APROP_Counter4      104
+#define APROP_Counter5      105
+#define APROP_Counter6      106
+#define APROP_Counter7      107

 // Render Styles ------------------------------------------------------------

@@ -298,6 +317,8 @@
 #define STYLE_SoulTrans		3	// Draw translucent with amount in r_transsouls
 #define STYLE_OptFuzzy		4	// Draw as fuzzy, translucent or shadow, based on user preference
 #define STYLE_Stencil		5	// Draw as solid color
+#define STYLE_AddStencil	6	// Draw as additive solid color
+#define STYLE_AddShaded		7	// 
 #define STYLE_Translucent	64	// Draw translucent
 #define STYLE_Add			65	// Draw additive
 #define STYLE_Shaded		66	// 
@@ -346,6 +367,7 @@
 #define DAMAGE_NONPLAYERS			2
 #define DAMAGE_IN_AIR				4
 #define DAMAGE_SUBCLASSES_PROTECT	8
+#define DAMAGE_NO_ARMOR			16

 // Flags for MorphActor -----------------------------------------------------

@@ -362,6 +384,8 @@
 #define MRF_UNDOBYDEATH			0x00000200
 #define MRF_UNDOBYDEATHFORCED	0x00000400
 #define MRF_UNDOBYDEATHSAVES	0x00000800
+#define MRF_UNDOALWAYS			0x00001000
+#define MRF_TRANSFERTRANSLATION 0x00002000

 // Shared spawnable things from Hexen. You can spawn these in the other -----
 // games if you provide sprites for them, otherwise they'll be invisible. ---
@@ -687,6 +711,9 @@
 #define CHAN_VOICE				2
 #define CHAN_ITEM				3
 #define CHAN_BODY				4
+#define CHAN_5					5
+#define CHAN_6					6
+#define CHAN_7					7

 // Modifier flags for PlaySound

@@ -741,6 +768,12 @@
 #DEFINE	AAPTR_PLAYER8 0x2000

 #DEFINE AAPTR_FRIENDPLAYER 0x4000
+#DEFINE AAPTR_GET_LINETARGET 0x8000
+
+// [AK] Actor pointers used exclusively for GAMEEVENT_ACTOR_DAMAGED
+#DEFINE AAPTR_DAMAGE_SOURCE 0x10000000
+#DEFINE AAPTR_DAMAGE_INFLICTOR 0x40000000
+#DEFINE AAPTR_DAMAGE_TARGET 0x80000000

 // Actor pointer operation flags

@@ -764,6 +797,15 @@

 #define SPAC_None			0

+// GetArmorInfo
+
+#define ARMORINFO_CLASSNAME		0
+#define ARMORINFO_SAVEAMOUNT		1
+#define ARMORINFO_SAVEPERCENT		2
+#define ARMORINFO_MAXABSORB		3
+#define ARMORINFO_MAXFULLABSORB		4
+#define ARMORINFO_ACTUALSAVEAMOUNT	5
+
 // ==========================================================================
 // Skulltag Definitions
 // ==========================================================================
@@ -860,6 +902,28 @@
 #define DB_ORDER_ASC			0
 #define DB_ORDER_DESC			1

+// Zandronum gamemode states ------------------------------------------------
+#define GAMESTATE_UNSPECIFIED		-1
+#define GAMESTATE_WAITFORPLAYERS	0
+#define GAMESTATE_COUNTDOWN		1
+#define GAMESTATE_INPROGRESS		2
+#define GAMESTATE_INRESULTSEQUENCE	3
+
+// Zandronum EVENT script types ---------------------------------------------
+#define GAMEEVENT_PLAYERFRAGS		0
+#define GAMEEVENT_MEDALS		1
+#define GAMEEVENT_CAPTURES		2
+#define GAMEEVENT_TOUCHES		3
+#define GAMEEVENT_RETURNS		4
+#define GAMEEVENT_ROUND_STARTS		5
+#define GAMEEVENT_ROUND_ENDS		6
+#define GAMEEVENT_ROUND_ABORTED		7
+#define GAMEEVENT_CHAT			8
+#define GAMEEVENT_PLAYERCONNECT		9
+#define GAMEEVENT_ACTOR_SPAWNED		10
+#define GAMEEVENT_ACTOR_DAMAGED		11
+#define GAMEEVENT_ACTOR_ARMORDAMAGED	12
+
 // Events when you have input grabbed

 #define EV_KeyDown				1	// data1: unshifted ASCII, data2: shifted ASCII
@@ -941,6 +1005,13 @@
 #define SECF_NOFALLINGDAMAGE 2
 #define SECF_FLOORDROP 4
 #define SECF_NORESPAWN 8
+#define SECF_FRICTION 16
+#define SECF_PUSH 32
+#define SECF_SILENTMOVE 64
+#define SECF_DMGTERRAINFX	128
+#define SECF_DMGENDGODMODE 256
+#define SECF_DMGENDLEVEL 512
+#define SECF_DMGHAZARD 1024

 #define BLOCKF_CREATURES 1
 #define BLOCKF_MONSTERS 2
@@ -952,6 +1023,7 @@
 #define BLOCKF_USE 128
 #define BLOCKF_SIGHT 256
 #define BLOCKF_HITSCAN 512
+#define BLOCKF_SOUND 1024

 #define FOGP_DENSITY 0
 #define FOGP_OUTSIDEDENSITY 1
@@ -960,11 +1032,150 @@
 #define PRINTNAME_LEVELNAME -1
 #define PRINTNAME_LEVEL -2
 #define PRINTNAME_SKILL -3
+#define PRINTNAME_NEXTLEVEL -4
+#define PRINTNAME_NEXTSECRET -5

 #define CSF_NOFAKEFLOORS 1
 #define CSF_NOBLOCKALL 2

 #define FHF_NORANDOMPUFFZ	1
+#define FHF_NOIMPACTDECAL	2
+
+// PickActor flags
+
+#define	PICKAF_FORCETID			1
+#define	PICKAF_RETURNTID		2
+
+// magic value to set the ice translation through ACS
+#define TRANSLATION_ICE 0x100007
+
+// Actor flags
+#define MF_SPECIAL          0x00000001
+#define MF_SOLID            0x00000002
+#define MF_SHOOTABLE        0x00000004
+#define MF_NOSECTOR         0x00000008
+#define MF_NOBLOCKMAP       0x00000010
+#define MF_AMBUSH           0x00000020
+#define MF_JUSTHIT          0x00000040
+#define MF_JUSTATTACKED     0x00000080
+#define MF_SPAWNCEILING     0x00000100
+#define MF_NOGRAVITY        0x00000200
+#define MF_DROPOFF          0x00000400
+#define MF_PICKUP           0x00000800
+#define MF_NOCLIP           0x00001000
+#define MF_INCHASE          0x00002000
+#define MF_FLOAT            0x00004000
+#define MF_TELEPORT         0x00008000
+#define MF_MISSILE          0x00010000
+#define MF_DROPPED          0x00020000
+#define MF_SHADOW           0x00040000
+#define MF_NOBLOOD          0x00080000
+#define MF_CORPSE           0x00100000
+#define MF_INFLOAT          0x00200000
+#define MF_INBOUNCE         0x00200000
+#define MF_COUNTKILL        0x00400000
+#define MF_COUNTITEM        0x00800000
+#define MF_SKULLFLY         0x01000000
+#define MF_NOTDMATCH        0x02000000
+#define MF_SPAWNSOUNDSOURCE 0x04000000
+#define MF_FRIENDLY         0x08000000
+#define MF_UNMORPHED        0x10000000
+#define MF_NOLIFTDROP       0x20000000
+#define MF_STEALTH          0x40000000
+#define MF_ICECORPSE        0x80000000
+
+// Linedef flags
+#define ML_BLOCKING            0x00000001
+#define ML_BLOCKMONSTERS       0x00000002
+#define ML_TWOSIDED            0x00000004
+#define ML_DONTPEGTOP          0x00000008
+#define ML_DONTPEGBOTTOM       0x00000010
+#define ML_SECRET              0x00000020
+#define ML_SOUNDBLOCK          0x00000040
+#define ML_DONTDRAW            0x00000080
+#define ML_MAPPED              0x00000100
+#define ML_REPEAT_SPECIAL      0x00000200
+#define ML_ADDTRANS            0x00000400
+#define ML_MONSTERSCANACTIVATE 0x00002000
+#define ML_BLOCK_PLAYERS       0x00004000
+#define ML_BLOCKEVERYTHING     0x00008000
+#define ML_ZONEBOUNDARY        0x00010000
+#define ML_RAILING             0x00020000
+#define ML_BLOCK_FLOATERS      0x00040000
+#define ML_CLIP_MIDTEX         0x00080000
+#define ML_WRAP_MIDTEX         0x00100000
+#define ML_3DMIDTEX            0x00200000
+#define ML_CHECKSWITCHRANGE    0x00400000
+#define ML_FIRSTSIDEONLY       0x00800000
+#define ML_BLOCKPROJECTILE     0x01000000
+#define ML_BLOCKUSE            0x02000000
+#define ML_BLOCKSIGHT          0x04000000
+#define ML_BLOCKHITSCAN        0x08000000
+
+#define QF_RELATIVE		1
+#define QF_SCALEDOWN		1 << 1
+#define QF_SCALEUP		1 << 2
+#define QF_MAX			1 << 3
+#define QF_FULLINTENSITY	1 << 4
+#define QF_WAVE			1 << 5
+
+#define WARPF_ABSOLUTEOFFSET 0x1
+#define WARPF_ABSOLUTEANGLE 0x2
+#define WARPF_USECALLERANGLE 0x4
+#define WARPF_NOCHECKPOSITION 0x8
+#define WARPF_INTERPOLATE 0x10
+#define WARPF_WARPINTERPOLATION 0x20
+#define WARPF_COPYINTERPOLATION 0x40
+#define WARPF_STOP 0x80
+#define WARPF_TOFLOOR 0x100
+#define WARPF_TESTONLY 0x200
+#define WARPF_ABSOLUTEPOSITION 0x400
+#define WARPF_BOB 0x800
+#define WARPF_MOVEPTR 0x1000
+#define WARPF_USEPTR 0x2000
+#define WARPF_COPYVELOCITY 0x4000
+#define WARPF_COPYPITCH 0x8000
+
+#define CPXF_ANCESTOR    (1 << 0)
+#define CPXF_LESSOREQUAL (1 << 1)
+#define CPXF_NOZ         (1 << 2)
+#define CPXF_COUNTDEAD   (1 << 3)
+#define CPXF_DEADONLY    (1 << 4)
+#define CPXF_EXACT       (1 << 5)
+#define CPXF_SETTARGET   (1 << 6)
+#define CPXF_SETMASTER   (1 << 7)
+#define CPXF_SETTRACER   (1 << 8)
+#define CPXF_FARTHEST    (1 << 9)
+#define CPXF_CLOSEST     (1 << 10)
+#define CPXF_SETONPTR    (1 << 11)
+#define CPXF_CHECKSIGHT  (1 << 12)
+
+#define SECPART_Floor 0
+#define SECPART_Ceiling 1
+#define SECPART_3D 2
+
+// For Line_SetAutomapFlags; These are or'd together
+#define AMLF_Secret		(1 << 0)
+#define AMLF_DontDraw		(1 << 1)
+#define AMLF_Mapped		(1 << 2)
+#define AMLF_Revealed		(1 << 3)
+
+// For Line_SetAutomapStyle
+#define AMLS_Default		0
+#define AMLS_OneSided		1
+#define AMLS_TwoSided		2
+#define AMLS_FloorDiff		3
+#define AMLS_CeilingDiff	4
+#define AMLS_ExtraFloor		5
+#define AMLS_Special		6
+#define AMLS_Secret		7
+#define AMLS_NotSeen		8
+#define AMLS_Locked		9
+#define AMLS_IntraTeleport	10
+#define AMLS_InterTeleport	11
+#define AMLS_UnexploredSecret	12
+#define AMLS_Portal		13
+

 // [TP] For GetTimeProperty
 #define TM_SECOND 0
@@ -974,3 +1185,29 @@
 #define TM_MONTH 4
 #define TM_YEAR 5
 #define TM_WEEKDAY 6
+
+// [AK] For SetGamemodeLimit
+#define GAMELIMIT_FRAGS 0
+#define GAMELIMIT_TIME 1
+#define GAMELIMIT_POINTS 2
+#define GAMELIMIT_DUELS 3
+#define GAMELIMIT_WINS 4
+#define GAMELIMIT_WAVES 5
+
+// [AK] For SetPlayerScore and GetPlayerScore
+#define SCORE_FRAGS 0
+#define SCORE_POINTS 1
+#define SCORE_WINS 2
+#define SCORE_DEATHS 3
+#define SCORE_KILLS 4
+#define SCORE_ITEMS 5
+#define SCORE_SECRETS 6
+#define SCORE_SPREAD 7
+#define SCORE_RANK 8
+
+// [AK] For GetMapRotationInfo
+#define MAPROTATION_Name 0
+#define MAPROTATION_LumpName 1
+#define MAPROTATION_Used 2
+#define MAPROTATION_MinPlayers 3
+#define MAPROTATION_MaxPlayers 4
\ No newline at end of file
--- a/Build/Compilers/Zandronum/zspecial.acs
+++ b/Build/Compilers/Zandronum/zspecial.acs
@@ -21,15 +21,15 @@ special
 	 14:Door_Animated(3,4),
 	 15:Autosave(0),
 //	 16:Transfer_WallLight
-	 17:Thing_Raise(1),
+	 17:Thing_Raise(1,2),
 	 18:StartConversation(1,2),
 	 19:Thing_Stop(1),
-	 20:Floor_LowerByValue(3),
-	 21:Floor_LowerToLowest(2),
-	 22:Floor_LowerToNearest(2),
-	 23:Floor_RaiseByValue(3),
-	 24:Floor_RaiseToHighest(2),
-	 25:Floor_RaiseToNearest(2),
+	 20:Floor_LowerByValue(3,4),
+	 21:Floor_LowerToLowest(2,3),
+	 22:Floor_LowerToNearest(2,3),
+	 23:Floor_RaiseByValue(3,5),
+	 24:Floor_RaiseToHighest(2,5),
+	 25:Floor_RaiseToNearest(2,4),
 	 26:Stairs_BuildDown(5),
 	 27:Stairs_BuildUp(5),
 	 28:Floor_RaiseAndCrush(3,4),
@@ -39,21 +39,21 @@ special
 	 32:Stairs_BuildUpSync(4),
 	 33:ForceField(0),
 	 34:ClearForceField(1),
-	 35:Floor_RaiseByValueTimes8(3),
-	 36:Floor_LowerByValueTimes8(3),
-	 37:Floor_MoveToValue(3,4),
+	 35:Floor_RaiseByValueTimes8(3,5),
+	 36:Floor_LowerByValueTimes8(3,4),
+	 37:Floor_MoveToValue(3,5),
 	 38:Ceiling_Waggle(5),
 	 39:Teleport_ZombieChanger(2),
-	 40:Ceiling_LowerByValue(3),
-	 41:Ceiling_RaiseByValue(3),
+	 40:Ceiling_LowerByValue(3,5),
+	 41:Ceiling_RaiseByValue(3,4),
 	 42:Ceiling_CrushAndRaise(3,4),
 	 43:Ceiling_LowerAndCrush(3,4),
-	 44:Ceiling_CrushStop(1),
+	 44:Ceiling_CrushStop(1,2),
 	 45:Ceiling_CrushRaiseAndStay(3,4),
 	 46:Floor_CrushStop(1),
-	 47:Ceiling_MoveToValue(3,4),
+	 47:Ceiling_MoveToValue(3,5),
 //	 48:Sector_Attach3dMidtex
-	 49:GlassBreak(0,1),
+	 49:GlassBreak(0,2),
 //	 50:ExtraFloor_LightOnly
 	 51:Sector_SetLink(4),
 	 52:Scroll_Wall(5),
@@ -65,15 +65,15 @@ special
 //	 58: Sector_CopyScroller
 	 59:Polyobj_OR_MoveToSpot(3),
 	 60:Plat_PerpetualRaise(3),
- 	 61:Plat_Stop(1),
+ 	 61:Plat_Stop(1,2),
 	 62:Plat_DownWaitUpStay(3),
 	 63:Plat_DownByValue(4),
 	 64:Plat_UpWaitDownStay(3),
 	 65:Plat_UpByValue(4),
-	 66:Floor_LowerInstant(3),
-	 67:Floor_RaiseInstant(3),
-	 68:Floor_MoveToValueTimes8(4),
-	 69:Ceiling_MoveToValueTimes8(4),
+	 66:Floor_LowerInstant(3,4),
+	 67:Floor_RaiseInstant(3,5),
+	 68:Floor_MoveToValueTimes8(4,5),
+	 69:Ceiling_MoveToValueTimes8(4,5),
 	 70:Teleport(1,3),
 	 71:Teleport_NoFog(1,4),
 	 72:ThrustThing(2,4),
@@ -108,6 +108,10 @@ special
 //	101:Scroll_Texture_Right
 //	102:Scroll_Texture_Up
 //	103:Scroll_Texture_Down
+	104:Ceiling_CrushAndRaiseSilentDist(4,5),
+	105:Door_WaitRaise(4,5),
+	106:Door_WaitClose(3,4),
+	107:Line_SetPortalTarget(2),

 	109:Light_ForceLightning(1),
 	110:Light_RaiseByValue(2),
@@ -143,6 +147,8 @@ special
 	143:Player_RemoveItem(2),			// Skulltag Functions
 	144:Player_GiveItem(2),				// Skulltag Functions
 	145:Player_SetTeam(1),				// Skulltag Functions
+	150:Line_SetHealth(2),
+	151:Sector_SetHealth(3),
 	152:Team_Score(2),					// Skulltag Functions
 	153:Team_GivePoints(3),				// Skulltag Functions
 	154:Teleport_NoStop(2, 3),
@@ -176,14 +182,14 @@ special
 	188:Sector_SetCeilingScale(5),
 	189:Sector_SetFloorScale(5),
 	191:SetPlayerProperty(3),
-	192:Ceiling_LowerToHighestFloor(2),
-	193:Ceiling_LowerInstant(3),
-	194:Ceiling_RaiseInstant(3),
+	192:Ceiling_LowerToHighestFloor(2,5),
+	193:Ceiling_LowerInstant(3,5),
+	194:Ceiling_RaiseInstant(3,4),
 	195:Ceiling_CrushRaiseAndStayA(4,5),
 	196:Ceiling_CrushAndRaiseA(4,5),
 	197:Ceiling_CrushAndRaiseSilentA(4,5),
-	198:Ceiling_RaiseByValueTimes8(3),
-	199:Ceiling_LowerByValueTimes8(3),
+	198:Ceiling_RaiseByValueTimes8(3,4),
+	199:Ceiling_LowerByValueTimes8(3,5),
 	200:Generic_Floor(5),
 	201:Generic_Ceiling(5),
 	202:Generic_Door(5),
@@ -198,8 +204,8 @@ special
 //	211:Transfer_CeilingLight,
 	212:Sector_SetColor(4,5),
 	213:Sector_SetFade(4),
-	214:Sector_SetDamage(3),
-	215:Teleport_Line(2),
+	214:Sector_SetDamage(3,5),
+	215:Teleport_Line(2,3),
 	216:Sector_SetGravity(3),
 	217:Stairs_BuildUpDoom(5),
 	218:Sector_SetWind(4),
@@ -222,9 +228,9 @@ special
 	235:Floor_TransferTrigger(1),
 	236:Floor_TransferNumeric(1),
 	237:ChangeCamera(3),
-	238:Floor_RaiseToLowestCeiling(2),
+	238:Floor_RaiseToLowestCeiling(2,5),
 	239:Floor_RaiseByValueTxTy(3),
-	240:Floor_RaiseByTexture(2),
+	240:Floor_RaiseByTexture(2,4),
 	241:Floor_LowerToLowestTxTy(2),
 	242:Floor_LowerToHighest(3,4),
 	243:Exit_Normal(1),
@@ -236,10 +242,46 @@ special
 	249:Door_CloseWaitOpen(3, 4),
 	250:Floor_Donut(3),
 	251:FloorAndCeiling_LowerRaise(3,4),
-	252:Ceiling_RaiseToNearest(2),
-	253:Ceiling_LowerToLowest(2),
-	254:Ceiling_LowerToFloor(2),
+	252:Ceiling_RaiseToNearest(2,3),
+	253:Ceiling_LowerToLowest(2,4),
+	254:Ceiling_LowerToFloor(2,5),
 	255:Ceiling_CrushRaiseAndStaySilA(4,5),
+
+	// These are specialized versions of the Generic_* specials which are defined for EE Extradata.
+	256:Floor_LowerToHighestEE(2, 3),
+	257:Floor_RaiseToLowest(2, 3),
+	258:Floor_LowerToLowestCeiling(2,3),
+	259:Floor_RaiseToCeiling(2, 5),
+	260:Floor_ToCeilingInstant(1, 4),
+	261:Floor_LowerByTexture(2, 3),
+	262:Ceiling_RaiseToHighest(2, 3),
+	263:Ceiling_ToHighestInstant(1, 3),
+	264:Ceiling_LowerToNearest(2, 4),
+	265:Ceiling_RaiseToLowest(2, 3),
+	266:Ceiling_RaiseToHighestFloor(2, 3),
+	267:Ceiling_ToFloorInstant(1, 4),
+	268:Ceiling_RaiseByTexture(2, 3),
+	269:Ceiling_LowerByTexture(2, 4),
+	270:Stairs_BuildDownDoom(5),
+	271:Stairs_BuildUpDoomSync(4),
+	272:Stairs_BuildDownDoomSync(4),
+	
+	// New additions can go above 255 now.
+	273:Stairs_BuildUpDoomCrush(5),
+	274:Door_AnimatedClose(2),
+	275:Floor_Stop(1),
+	276:Ceiling_Stop(1),
+	277:Sector_SetFloorGlow(5),
+	278:Sector_SetCeilingGlow(5),
+	279:Floor_MoveToValueAndCrush(4, 5),
+	280:Ceiling_MoveToValueAndCrush(4, 5),
+	281:Line_SetAutomapFlags(3),
+	282:Line_SetAutomapStyle(2),
+	
+	// new to Eternity
+//	300:Portal_Define(5),
+//	301:Line_QuickPortal(1),
+	
 	
 	// internal functions have negative values
 	-1:GetLineUDMFInt(2),
@@ -292,7 +334,7 @@ special
 	-48:Sqrt(1),
 	-49:FixedSqrt(1),
 	-50:VectorLength(2),
-	-51:SetHUDClipRect(4,5),
+	-51:SetHUDClipRect(4,6),
 	-52:SetHUDWrapWidth(1),
 	-53:SetCVar(2),
 	-54:GetUserCVar(2),
@@ -301,8 +343,8 @@ special
 	-57:SetCVarString(2),
 	-58:GetUserCVarString(2),
 	-59:SetUserCVarString(3),
-	-60:LineAttack(4,8),
-	-61:PlaySound(2,6),
+	-60:LineAttack(4,9),
+	-61:PlaySound(2,7),
 	-62:StopSound(1,2),
 	-63:strcmp(2,3),
 	-64:stricmp(2,3),
@@ -321,6 +363,27 @@ special
 	-76:SetLineActivation(2),
 	-77:GetLineActivation(1),
 	-78:GetActorPowerupTics(2),
+	-79:ChangeActorAngle(2,3),
+	-80:ChangeActorPitch(2,3),
+	-81:GetArmorInfo(1),
+	-82:DropInventory(2),
+	-83:PickActor(5,8),
+	-84:IsPointerEqual(2,4),
+	-85:CanRaiseActor(1),
+	-86:SetActorTeleFog(3),
+	-87:SwapActorTeleFog(1),
+	-88:SetActorRoll(2),
+	-89:ChangeActorRoll(2,3),
+	-90:GetActorRoll(1),
+	-91:QuakeEx(8,16),
+	-92:Warp(6,11),
+	-93:GetMaxInventory(2),
+	-94:SetSectorDamage(2,5),
+	-95:SetSectorTerrain(3),
+	-96:SpawnParticle(1,16),
+	-97:SetMusicVolume(1),
+	-98:CheckProximity(3, 6),
+	-99:CheckActorState(2,3),
 	
 	// Zandronum's
 	-100:ResetMap(0),
@@ -353,10 +416,54 @@ special
 	-127:SystemTime(0),
 	-128:GetTimeProperty(2,3),
 	-129:Strftime(2,3),
+	-130:SetDeadSpectator(2),
+	-131:SetActivatorToPlayer(1),
+	-132:SetCurrentGamemode(1),
+	-133:GetCurrentGamemode(0),
+	-134:SetGamemodeLimit(2),
+	-135:SetPlayerClass(3),
+	-136:SetPlayerChasecam(2),
+	-137:GetPlayerChasecam(1),
+	-138:SetPlayerScore(3),
+	-139:GetPlayerScore(2),
+	-140:InDemoMode(0),
+	-144:ExecuteClientScript(2,6),
+	-145:NamedExecuteClientScript(2,6),
+	-146:SendNetworkString(2,3),
+	-147:NamedSendNetworkString(2,3),
+	-148:GetChatMessage(2),
+	-149:GetMapRotationSize(0),
+	-150:GetMapRotationInfo(2),
+
+	// -1xx are reserved for Zandronum
+	-200:CheckClass(1),
+	-201:DamageActor(6), // [arookas]
+	-202:SetActorFlag(3),
+	-203:SetTranslation(2),
+	-204:GetActorFloorTexture(1),
+	-205:GetActorFloorTerrain(1),
+	-206:StrArg(1),
+	-207:Floor(1),
+	-208:Round(1),
+	-209:Ceil(1),
+	-210:ScriptCall(2, 100),	// ACS does not know varargs so use something large as maximum.
+	-211:StartSlideshow(1),
+	-212:GetSectorHealth(2),
+	-213:GetLineHealth(1),
+	
+	
+	// Eternity's
+	-300:GetLineX(3),
+	-301:GetLineY(3),
+	-302:SetAirFriction(1),
+	
+	// GZDoom OpenGL
+	-400:SetSectorGlow(6),
+	-401:SetFogDensity(2),
 	
 	// ZDaemon's
-	-19260:GetTeamScore(1),
-	-19261:SetTeamScore(2),
+	-19620:GetTeamScore(1),
+	-19621:SetTeamScore(2),
 	
 	-100000:__EndOfList__(10);
 	
--- a/Build/Configurations/Boom_Doom2Doom.cfg
+++ b/Build/Configurations/Boom_Doom2Doom.cfg
@@ -32,6 +32,9 @@ include("Includes\\Boom_common.cfg", "mapformat_doom");
 // Settings common to Doom games
 include("Includes\\Game_Doom.cfg");

+// Map name format for Doom 2.
+mapnameformat = "MAPxy";
+
 //mxd. No DECORATE support in vanilla
 decorategames = "";

@@ -61,3 +64,9 @@ enums
 	// Basic game enums
 	include("Includes\\Doom_misc.cfg", "enums");
 }
+
+// Dehacked data
+dehacked
+{
+  include("Includes\\Dehacked_Doom.cfg");
+}
\ No newline at end of file
--- a/Build/Configurations/Boom_DoomDoom.cfg
+++ b/Build/Configurations/Boom_DoomDoom.cfg
@@ -29,6 +29,9 @@ include("Includes\\Boom_common.cfg", "mapformat_doom");
 // Settings common to Doom games
 include("Includes\\Game_Doom.cfg");

+// Map name format for Doom.
+mapnameformat = "ExMy";
+
 //mxd. No DECORATE support in vanilla
 decorategames = "";

@@ -72,3 +75,9 @@ enums
 	// Basic game enums
 	include("Includes\\Doom_misc.cfg", "enums");
 }
+
+// Dehacked data
+dehacked
+{
+  include("Includes\\Dehacked_Doom.cfg");
+}
\ No newline at end of file
--- a/Build/Configurations/DSDADoom_DoomUDMF.cfg
+++ b/Build/Configurations/DSDADoom_DoomUDMF.cfg
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "DSDADoom: Doom 2 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "dsda";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// Some common settings
+include("Includes\\Common.cfg");
+
+// Default testing parameters
+include("Includes\\Test_params.cfg", "vanilla_mapxx");
+
+// Action special help (mxd)
+actionspecialhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+
+// Thing class help (mxd)
+thingclasshelp = "http://www.zdoom.org/wiki/Classes:%K";
+
+// Default nodebuilder configurations
+defaultsavecompiler = "zdbsp_udmf_normal";
+defaulttestcompiler = "zdbsp_udmf_fast";
+
+// Generalized actions
+generalizedsectors = true;
+generalizedlinedefs = false;
+
+//mxd. Maximum safe map size check (0 means skip check)
+safeboundary = 0;
+
+// Texture loading options
+mixtexturesflats = false;
+defaulttexturescale = 1.0f;
+defaultflatscale = 1.0f;
+scaledtextureoffsets = true;
+
+//mxd. Sidedefs compression
+sidedefcompressionignoresaction = true;
+
+// Texture sources
+textures
+{
+  include("Includes\\Doom_misc.cfg", "textures");
+}
+
+// Patch sources
+patches
+{
+  include("Includes\\Doom_misc.cfg", "patches");
+}
+
+// Sprite sources
+sprites
+{
+  include("Includes\\Doom_misc.cfg", "sprites");
+}
+
+// Flat sources
+flats
+{
+  include("Includes\\Doom_misc.cfg", "flats");
+}
+
+// Colormap sources
+colormaps
+{
+  include("Includes\\Boom_misc.cfg", "colormaps");
+}
+
+// Generalized sector types
+gen_sectortypes
+{
+  include("Includes\\ZDoom_generalized.cfg", "gen_sectortypes");
+}
+
+damagetypes = "";
+internalsoundnames = "";
+
+compatibility
+{
+  fixnegativepatchoffsets = true;
+  fixmaskedpatchoffsets = true;
+}
+
+// The format interface handles the map data format
+formatinterface = "UniversalMapSetIO";
+
+//mxd. The default script compiler to use
+defaultscriptcompiler = "";
+
+// Enables support for individual offsets of upper/middle/lower sidedef textures
+localsidedeftextureoffsets = true;
+
+// Enables setting brightness for floor, ceiling, and walls independently from each other
+distinctfloorandceilingbrightness = true;
+distinctwallbrightness = true;
+
+// Enabled setting brightness for upper, middle, and lower sidedef independently from each other
+distinctsidedefpartbrightness = true;
+
+// Enables multiple tags on sectors
+sectormultitag = true;
+
+// When this is set to true, sectors with the same tag will light up when a line is highlighted
+linetagindicatesectors = false;
+
+// Special linedefs
+singlesidedflag = "blocking";
+doublesidedflag = "twosided";
+impassableflag = "blocking";
+upperunpeggedflag = "dontpegtop";
+lowerunpeggedflag = "dontpegbottom";
+defaultlinedefactivation = "playercross"; //mxd. Used when translating a map to UDMF
+
+// Door making
+makedooraction = 202;	// See linedeftypes
+makedoorflags { playeruse; repeatspecial; }
+makedoorarg0 = 0;
+makedoorarg1 = 16;
+makedoorarg2 = 0;
+makedoorarg3 = 34;
+makedoorarg4 = 0;
+
+// SECTOR FLAGS
+sectorflags
+{
+  silent = "Silent";
+	hidden = "Not shown on textured automap";
+	damagehazard = "Strife damage model";
+	noattack = "Monsters in this sector do not attack";
+}
+
+// SECTOR TYPES
+sectortypes
+{
+  0 = "None";
+	1 = "Light Phased";
+	2 = "Light Sequence Start";
+	3 = "Light Sequence Special 1";
+	4 = "Light Sequence Special 2";
+	26 = "Stairs Special 1";
+	27 = "Stairs Special 2";
+	40 = "Wind East weak";
+	41 = "Wind East medium";
+	42 = "Wind East strong";
+	43 = "Wind North weak";
+	44 = "Wind North medium";
+	45 = "Wind North strong";
+	46 = "Wind South weak";
+	47 = "Wind South medium";
+	48 = "Wind South strong";
+	49 = "Wind West weak";
+	50 = "Wind West medium";
+	51 = "Wind West strong";
+	65 = "Light Flicker";
+	66 = "Light Strobe Fast";
+	67 = "Light Strobe Slow";
+	68 = "Light Strobe Hurt -20% health";
+	69 = "Damage Hellslime -10% health";
+	71 = "Damage Nukage -5% health";
+	72 = "Light Glow";
+	74 = "Sector Door Close (30 sec)";
+	75 = "Damage End Level -20% health";
+	76 = "Light StrobeSlowSync";
+	77 = "Light StrobeFastSync";
+	78 = "Sector Door Raise (5 min)";
+	79 = "Low Friction";
+	80 = "Damage Super Hellslime -20% health";
+	81 = "Light Fire Flicker";
+	82 = "Damage -5% health (no protection)";
+	83 = "Damage -8% health (no protection)";
+	84 = "Scroll east + -2 or -5% health (no protection)";
+	85 = "Damage Sludge -4% health";
+  104 = "sLight_Strobe_Hurt";
+	105 = "Delayed damage weak (hazardcount +2/16 per second)";
+	115 = "Instant death";
+	116 = "Delayed damage strong (hazardcount +4/16 per second)";
+	118 = "Carry player by tag";
+	195 = "Hidden Sector (automap)";
+	196 = "Healing Sector";
+	201 = "Scroll North (slow)";
+	202 = "Scroll North (medium)";
+	203 = "Scroll North (fast)";
+	204 = "Scroll East (slow)";
+	205 = "Scroll East (medium)";
+	206 = "Scroll East (fast)";
+	207 = "Scroll South (slow)";
+	208 = "Scroll South (medium)";
+	209 = "Scroll South (fast)";
+	210 = "Scroll West (slow)";
+	211 = "Scroll West (medium)";
+	212 = "Scroll West (fast)";
+	213 = "Scroll NorthWest (slow)";
+	214 = "Scroll NorthWest (medium)";
+	215 = "Scroll NorthWest (fast)";
+	216 = "Scroll NorthEast (slow)";
+	217 = "Scroll NorthEast (medium)";
+	218 = "Scroll NorthEast (fast)";
+	219 = "Scroll SouthEast (slow)";
+	220 = "Scroll SouthEast (medium)";
+	221 = "Scroll SouthEast (fast)";
+	222 = "Scroll SouthWest (slow)";
+	223 = "Scroll SouthWest (medium)";
+	224 = "Scroll SouthWest (fast)";
+	225 = "Carry East Slow";
+	226 = "Carry East Med.Slow";
+	227 = "Carry East Medium";
+	228 = "Carry East Med.Fast";
+	229 = "Carry East Fast";
+	230 = "Carry North Slow";
+	231 = "Carry North Med.Slow";
+	232 = "Carry North Medium";
+	233 = "Carry North Med.Fast";
+	234 = "Carry North Fast";
+	235 = "Carry South Slow";
+	236 = "Carry South Med.Slow";
+	237 = "Carry South Medium";
+	238 = "Carry South Med.Fast";
+	239 = "Carry South Fast";
+	240 = "Carry West Slow";
+	241 = "Carry West Med.Slow";
+	242 = "Carry West Medium";
+	243 = "Carry West Med.Fast";
+	244 = "Carry West Fast";
+}
+
+include("Includes\\DSDADoom_misc.cfg");
+
+// LINEDEF TYPES
+linedeftypes
+{
+  include("Includes\\DSDADoom_linedefs.cfg");
+}
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	include("Includes\\Boom_things.cfg");
+	include("Includes\\DSDADoom_things.cfg");
+}
+
+// Dehacked data
+dehacked
+{
+  include("Includes\\Dehacked_Doom.cfg");
+}
No results found