stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-18 08:51:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

SRB2 2.1.1 release

Browse source
This commit is contained in:
Alam Ed Arias 2014-03-15 18:55:07 -04:00
parent b93cb1b65a
commit 3e0b5ef1cd
6 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
readme.txt
View file

@ -1,4 +1,4 @@
Here it is! SRB2 v2.0 source code! Here it is! SRB2 v2.1 (.1) source code!
Win32 with Visual C (6SP6+Processor Pack OR 7) Win32 with Visual C (6SP6+Processor Pack OR 7)

7
src/d_main.c
View file

@ -802,6 +802,9 @@ static void IdentifyVersion(void)
// Add the weapons // Add the weapons
D_AddFile(va(pandf,srb2waddir,"rings.dta")); D_AddFile(va(pandf,srb2waddir,"rings.dta"));
// Add our crappy patches to fix our bugs
D_AddFile(va(pandf,srb2waddir,"patch.dta"));
#if !defined (SDL) || defined (HAVE_MIXER) #if !defined (SDL) || defined (HAVE_MIXER)
{ {
#if defined (DC) && 0 #if defined (DC) && 0
@ -817,8 +820,6 @@ static void IdentifyVersion(void)
I_Error("File %s has been modified with non-music lumps",musicfile); I_Error("File %s has been modified with non-music lumps",musicfile);
} }
#endif #endif
// D_AddFile(va(pandf,srb2waddir,"patch.dta")); //for dev
} }
/* ======================================================================== */ /* ======================================================================== */
@ -1095,7 +1096,7 @@ void D_SRB2Main(void)
W_VerifyFileMD5(1, "a894044b555dfcc71865cee16a996e88"); // zones.dta W_VerifyFileMD5(1, "a894044b555dfcc71865cee16a996e88"); // zones.dta
W_VerifyFileMD5(2, "4c410c1de6e0440cc5b2858dcca80c3e"); // player.dta W_VerifyFileMD5(2, "4c410c1de6e0440cc5b2858dcca80c3e"); // player.dta
W_VerifyFileMD5(3, "85901ad4bf94637e5753d2ac2c03ea26"); // rings.dta W_VerifyFileMD5(3, "85901ad4bf94637e5753d2ac2c03ea26"); // rings.dta
//W_VerifyFileMD5(5, ""); // patch.dta (dev changable) W_VerifyFileMD5(4, "c529930ee5aed6dbe33625dc8075520b"); // patch.dta
// don't check music.dta because people like to modify it, and it doesn't matter if they do // don't check music.dta because people like to modify it, and it doesn't matter if they do
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for. // ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.

6
src/doomdef.h
View file

@ -144,8 +144,8 @@ extern FILE *logstream;
#define VERSIONSTRING "Trunk" #define VERSIONSTRING "Trunk"
#else #else
#define VERSION 201 // Game version #define VERSION 201 // Game version
#define SUBVERSION 0 // more precise version number #define SUBVERSION 1 // more precise version number
#define VERSIONSTRING "v2.1.0" #define VERSIONSTRING "v2.1.1"
#endif #endif
// Modification options // Modification options
@ -201,7 +201,7 @@ extern FILE *logstream;
// 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.1.0 is not version "1". // Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
#define MODVERSION 4 #define MODVERSION 5

4
src/m_misc.c
View file

@ -1503,6 +1503,10 @@ void M_StartupLocale(void)
CONS_Printf("M_StartupLocale...\n"); CONS_Printf("M_StartupLocale...\n");
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
// Do not set numeric locale as that affects atof
setlocale(LC_NUMERIC, "C");
// FIXME: global name define anywhere? // FIXME: global name define anywhere?
#ifdef GETTEXTDOMAIN1 #ifdef GETTEXTDOMAIN1
textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN1); textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN1);

3
src/p_mobj.c
View file

@ -1219,6 +1219,9 @@ void P_XYMovement(mobj_t *mo)
else if (mo->player) else if (mo->player)
moved = true; moved = true;
if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
return;
// Check the gravity status. // Check the gravity status.
P_CheckGravity(mo, false); P_CheckGravity(mo, false);

4
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
View file

@ -1212,7 +1212,7 @@
C01FCF4B08A954540054247B /* Debug */ = { C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CURRENT_PROJECT_VERSION = 2.1.0; CURRENT_PROJECT_VERSION = 2.1.1;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
NORMALSRB2, NORMALSRB2,
@ -1224,7 +1224,7 @@
C01FCF4C08A954540054247B /* Release */ = { C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CURRENT_PROJECT_VERSION = 2.1.0; CURRENT_PROJECT_VERSION = 2.1.1;
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (