stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 10:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverting friction, but left a note for iceman's magic number.

Browse source 
Intermission timer is back down to 20 seconds unless something breaks with auto-transmissions again.
Also I remembered to enable Magnets this time. Super low odds on it though.
This commit is contained in:
ZTsukei 2017-02-27 18:15:48 -05:00
parent 5d0b9ef551
commit f1f78a2349
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -376,7 +376,7 @@ consvar_t cv_maxping = {"maxping", "0", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NUL
#endif
// Intermission time Tails 04-19-2002
static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
consvar_t cv_inttime = {"inttime", "3000", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_inttime = {"inttime", "20", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}};
consvar_t cv_advancemap = {"advancemap", "Next", CV_NETVAR, advancemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

10
src/doomdef.h
View file

@ -143,16 +143,16 @@ extern FILE *logstream;
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP
#define VERSION 102 // Game version
#define SUBVERSION 1 // more precise version number
#define SUBVERSION 3 // more precise version number
#define VERSIONSTRING "Development EXE"
#define VERSIONSTRINGW "v1.2.01"
#define VERSIONSTRINGW "v1.2.03"
// most interface strings are ignored in development mode.
// we use comprevision and compbranch instead.
#else
#define VERSION 102 // Game version
#define SUBVERSION 1 // more precise version number
#define VERSIONSTRING "DevEXE v1.2.01"
#define VERSIONSTRINGW L"v1.2.01"
#define SUBVERSION 3 // more precise version number
#define VERSIONSTRING "DevEXE v1.2.03"
#define VERSIONSTRINGW L"v1.2.03"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif

3
src/k_kart.c
View file

@ -675,8 +675,7 @@ static void K_KartGetItemResult(player_t *player, fixed_t getitem, boolean retro
switch (getitem)
{
case 1: // Magnet
player->kartstuff[k_mushroom] = 1; // TEMPORARY COVER UNTIL OTHER ITEMS ARE WORKING
//player->kartstuff[k_magnet] = 1;
player->kartstuff[k_magnet] = 1;
break;
case 2: // Boo
player->kartstuff[k_boo] = 1;

3
src/p_spec.h
View file

@ -392,8 +392,9 @@ typedef struct
UINT8 roverfriction; ///< flag for whether friction originated from a FOF or not
} friction_t;
// SRB2kart - TODO: To satisfy Iceman's craving, I'll leave this here: 62914 : Is the number he wants friction to be.
// Friction defines.
#define ORIG_FRICTION 62914 //(0xE8 << (FRACBITS-8)) ///< Original value.
#define ORIG_FRICTION (0xE8 << (FRACBITS-8)) ///< Original value.
#define ORIG_FRICTION_FACTOR (8 << (FRACBITS-8)) ///< Original value.
void T_Friction(friction_t *f);