missed 2 lines

This commit is contained in:
perle 2024-08-01 07:51:20 +02:00
parent 844b2d5f84
commit 3f483431d9
3 changed files with 1 additions and 19 deletions

View file

@ -284,8 +284,6 @@ void CG_SetConfigValues( void ) {
s = CG_ConfigString( CS_FLAGSTATUS ); s = CG_ConfigString( CS_FLAGSTATUS );
cgs.redflag = s[0] - '0'; cgs.redflag = s[0] - '0';
cgs.blueflag = s[1] - '0'; cgs.blueflag = s[1] - '0';
cgs.greenflag = s[2] - '0';
cgs.yellowflag = s[3] - '0';
} }
else if ( cgs.gametype == GT_DOMINATION ) { else if ( cgs.gametype == GT_DOMINATION ) {

View file

@ -70,23 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
<<<<<<< HEAD #define PRODUCT_VERSION "v0.5 (r613)"
<<<<<<< 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
#endif #endif

Binary file not shown.