mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-12-11 21:11:31 +00:00
missed 2 lines
This commit is contained in:
parent
844b2d5f84
commit
3f483431d9
3 changed files with 1 additions and 19 deletions
|
@ -284,8 +284,6 @@ void CG_SetConfigValues( void ) {
|
|||
s = CG_ConfigString( CS_FLAGSTATUS );
|
||||
cgs.redflag = s[0] - '0';
|
||||
cgs.blueflag = s[1] - '0';
|
||||
cgs.greenflag = s[2] - '0';
|
||||
cgs.yellowflag = s[3] - '0';
|
||||
}
|
||||
|
||||
else if ( cgs.gametype == GT_DOMINATION ) {
|
||||
|
|
|
@ -70,23 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define BASETA "missionpack"
|
||||
|
||||
#ifndef PRODUCT_VERSION
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
#define PRODUCT_VERSION "v0.5 r607"
|
||||
=======
|
||||
#define PRODUCT_VERSION "v0.5 r605"
|
||||
>>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
|
||||
=======
|
||||
#define PRODUCT_VERSION "v0.5 r605"
|
||||
>>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
|
||||
=======
|
||||
#define PRODUCT_VERSION "v0.5 r605"
|
||||
>>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
|
||||
=======
|
||||
#define PRODUCT_VERSION "v0.5 r607"
|
||||
>>>>>>> 4347bd4648d9315f81c43fe093cb4a6b6ef8a030
|
||||
#define PRODUCT_VERSION "v0.5 (r613)"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
BIN
q3rallycode.ppr
BIN
q3rallycode.ppr
Binary file not shown.
Loading…
Reference in a new issue