zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-05-31 01:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- bump version number.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1597 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2013-06-09 07:36:25 +00:00
parent d5026ad1f7
commit 49480e123e
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/p_spec.cpp
View file

@ -57,13 +57,13 @@
#include "gi.h" #include "gi.h"
#include "statnums.h" #include "statnums.h"
#include "g_level.h" #include "g_level.h"
#include "v_font.h" #include "v_font.h"
#include "a_sharedglobal.h" #include "a_sharedglobal.h"
#include "farchive.h" #include "farchive.h"
#include "a_keys.h" #include "a_keys.h"
// State. // State.
#include "r_state.h" #include "r_state.h"
#include "c_console.h" #include "c_console.h"
@ -233,14 +233,14 @@ bool P_ActivateLine (line_t *line, AActor *mo, int side, int activationType)
BYTE special; BYTE special;
if (!P_TestActivateLine (line, mo, side, activationType)) if (!P_TestActivateLine (line, mo, side, activationType))
{ {
return false; return false;
} }
bool remote = (line->special != 7 && line->special != 8 && (line->special < 11 || line->special > 14)); bool remote = (line->special != 7 && line->special != 8 && (line->special < 11 || line->special > 14));
if (line->locknumber > 0 && !P_CheckKeys (mo, line->locknumber, remote)) return false; if (line->locknumber > 0 && !P_CheckKeys (mo, line->locknumber, remote)) return false;
lineActivation = line->activation; lineActivation = line->activation;
repeat = line->flags & ML_REPEAT_SPECIAL; repeat = line->flags & ML_REPEAT_SPECIAL;
buttonSuccess = false; buttonSuccess = false;
buttonSuccess = P_ExecuteSpecial(line->special, buttonSuccess = P_ExecuteSpecial(line->special,
line, mo, side == 1, line->args[0], line, mo, side == 1, line->args[0],
line->args[1], line->args[2], line->args[1], line->args[2],

4
src/svnrevision.h
View file

@ -3,5 +3,5 @@
// This file was automatically generated by the // This file was automatically generated by the
// updaterevision tool. Do not edit by hand. // updaterevision tool. Do not edit by hand.
#define ZD_SVN_REVISION_STRING "4341" #define ZD_SVN_REVISION_STRING "4342"
#define ZD_SVN_REVISION_NUMBER 4341 #define ZD_SVN_REVISION_NUMBER 4342

8
src/version.h
View file

@ -41,17 +41,17 @@
/** Lots of different version numbers **/ /** Lots of different version numbers **/
#define DOTVERSIONSTR_NOREV "1.7.1" #define DOTVERSIONSTR_NOREV "1.8.0"
#define ZDVER_STRING "2.7.0" #define ZDVER_STRING "2.7.0"
// The version string the user actually sees. // The version string the user actually sees.
#define DOTVERSIONSTR DOTVERSIONSTR_NOREV " (r" SVN_REVISION_STRING ") / ZDoom " ZDVER_STRING " (r" ZD_SVN_REVISION_STRING ")" #define DOTVERSIONSTR DOTVERSIONSTR_NOREV " (r" SVN_REVISION_STRING ") / ZDoom " ZDVER_STRING " (r" ZD_SVN_REVISION_STRING ")"
// The version as seen in the Windows resource // The version as seen in the Windows resource
#define RC_FILEVERSION 1,7,1,SVN_REVISION_NUMBER #define RC_FILEVERSION 1,8,0,SVN_REVISION_NUMBER
#define RC_PRODUCTVERSION 1,7,1,0 #define RC_PRODUCTVERSION 1,8,0,0
#define RC_FILEVERSION2 DOTVERSIONSTR #define RC_FILEVERSION2 DOTVERSIONSTR
#define RC_PRODUCTVERSION2 "1.7" #define RC_PRODUCTVERSION2 "1.8"
// Version identifier for network games. // Version identifier for network games.
// Bump it every time you do a release unless you're certain you // Bump it every time you do a release unless you're certain you