stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '229-prep' into 'next'

Browse source 
2.2.9 prep

See merge request STJr/SRB2!1499
This commit is contained in:
Tatsuru 2021-05-06 21:42:53 -04:00
commit 8b9b25829a
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 2.2.8.{branch}-{build} version: 2.2.9.{branch}-{build}
os: MinGW os: MinGW
environment: environment:

5
src/config.h.in
View file

@ -34,12 +34,13 @@
* Last updated 2020 / 07 / 10 - v2.2.6 - player.dta & patch.pk3 * Last updated 2020 / 07 / 10 - v2.2.6 - player.dta & patch.pk3
* Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3 * Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3
* Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3 * Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
* Last updated 2020 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3
*/ */
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28" #define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead" #define ASSET_HASH_ZONES_PK3 "f8f3e2b5deacf40f14e36686a07d44bb"
#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb" #define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb"
#ifdef USE_PATCH_DTA #ifdef USE_PATCH_DTA
#define ASSET_HASH_PATCH_PK3 "466cdf60075262b3f5baa5e07f0999e8" #define ASSET_HASH_PATCH_PK3 "7d467a883f7887b3c311798ee2f56b6a"
#endif #endif
#endif #endif

2
src/p_enemy.c
View file

@ -4201,7 +4201,7 @@ void A_CustomPower(mobj_t *actor)
return; return;
} }
if (locvar1 >= NUMPOWERS) if (locvar1 >= NUMPOWERS || locvar1 < 0)
{ {
CONS_Debug(DBG_GAMELOGIC, "Power #%d out of range!\n", locvar1); CONS_Debug(DBG_GAMELOGIC, "Power #%d out of range!\n", locvar1);
return; return;

4
src/version.h
View file

@ -1,4 +1,4 @@
#define SRB2VERSION "2.2.8"/* this must be the first line, for cmake !! */ #define SRB2VERSION "2.2.9"/* this must be the first line, for cmake !! */
// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ). // The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ).
// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server. // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
@ -9,7 +9,7 @@
// it's only for detection of the version the player is using so the MS can alert them of an update. // it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously. // Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1". // Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
#define MODVERSION 49 #define MODVERSION 50
// Define this as a prerelease version suffix // Define this as a prerelease version suffix
// #define BETAVERSION "RC1" // #define BETAVERSION "RC1"

4
src/win32/Srb2win.rc
View file

@ -76,8 +76,8 @@ END
#include "../doomdef.h" // Needed for version string #include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,8,0 FILEVERSION 2,2,9,0
PRODUCTVERSION 2,2,8,0 PRODUCTVERSION 2,2,9,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L