mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
All other modified files: Trailing whitespace cleanup
This commit is contained in:
parent
c17b2a44b3
commit
a68a0b0135
10 changed files with 116 additions and 116 deletions
|
|
@ -722,7 +722,7 @@ struct player_t
|
|||
tic_t spheredigestion;
|
||||
|
||||
SINT8 glanceDir; // Direction the player is trying to look backwards in
|
||||
|
||||
|
||||
//////////////
|
||||
// rideroid //
|
||||
//////////////
|
||||
|
|
@ -734,24 +734,24 @@ struct player_t
|
|||
fixed_t rdaddmomx; // some speed variables to smoothe things out without fighting with the regular momentum system.
|
||||
fixed_t rdaddmomy;
|
||||
fixed_t rdaddmomz;
|
||||
|
||||
|
||||
////////////
|
||||
// bungee //
|
||||
////////////
|
||||
UINT8 bungee; // constants are defined with the object file for the bungee.
|
||||
|
||||
|
||||
////////////////////
|
||||
// dead line zone //
|
||||
////////////////////
|
||||
// hovers
|
||||
tic_t lasthover; // used for the hover mobjs
|
||||
|
||||
|
||||
// rockets
|
||||
tic_t dlzrocket; // counts up as we stay on a rocket.
|
||||
angle_t dlzrocketangle; // current travel angle with the rocket.
|
||||
INT32 dlzrocketanglev; // current vertical travel angle with the rocket. signed instead of angle_t.
|
||||
fixed_t dlzrocketspd; // current rocket travel speed.
|
||||
|
||||
|
||||
// seasaws (variables are shared with other seasaw-like objects)
|
||||
boolean seasaw; // true if using a seasaw
|
||||
tic_t seasawcooldown; // cooldown to avoid triggering the same seasaw over and over
|
||||
|
|
@ -760,13 +760,13 @@ struct player_t
|
|||
INT32 seasawangleadd; // used to spin the seasaw
|
||||
INT32 seasawmoreangle; // used for reverse sesaws in DLZ.
|
||||
boolean seasawdir; // flips or not seasaw rotation
|
||||
|
||||
|
||||
// water palace turbines (or cnz barrels, or whatever the hell people use it for nowadays)
|
||||
tic_t turbine; // ticker (while true, we set the tracer to the turbine)
|
||||
INT32 turbineangle; // angle around the turbine. ...Made in INT32 to make it easier to translate from lua
|
||||
fixed_t turbineheight; // height around the turbine
|
||||
boolean turbinespd; // if true, we used a sneaker and get the altpath.
|
||||
|
||||
|
||||
//
|
||||
|
||||
SINT8 lives;
|
||||
|
|
|
|||
|
|
@ -4671,7 +4671,7 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_CHECKPOINT_SPARK9",
|
||||
"S_CHECKPOINT_SPARK10",
|
||||
"S_CHECKPOINT_SPARK11",
|
||||
|
||||
|
||||
"S_RIDEROID",
|
||||
"S_RIDEROID_ICON",
|
||||
|
||||
|
|
@ -4683,7 +4683,7 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_WPZFOUNTAINANIM",
|
||||
"S_KURAGEN",
|
||||
"S_KURAGENBOMB",
|
||||
|
||||
|
||||
};
|
||||
|
||||
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
||||
|
|
@ -5836,14 +5836,14 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
|||
|
||||
"MT_CHECKPOINT_END",
|
||||
"MT_SCRIPT_THING",
|
||||
|
||||
|
||||
"MT_RIDEROID",
|
||||
"MT_RIDEROIDNODE",
|
||||
|
||||
|
||||
"MT_LSZ_BUNGEE",
|
||||
"MT_LSZ_EGGBALLSPAWNER",
|
||||
"MT_LSZ_EGGBALL",
|
||||
|
||||
|
||||
"MT_DLZ_HOVER",
|
||||
"MT_DLZ_ROCKET",
|
||||
"MT_DLZ_SEASAW_SPAWN",
|
||||
|
|
@ -5851,12 +5851,12 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
|||
"MT_DLZ_SEASAW_VISUAL",
|
||||
"MT_DLZ_RINGVACCUM",
|
||||
"MT_DLZ_SUCKEDRING",
|
||||
|
||||
|
||||
"MT_WATERPALACETURBINE",
|
||||
"MT_WATERPALACEBUBBLE",
|
||||
"MT_WATERPALACEFOUNTAIN",
|
||||
"MT_KURAGEN",
|
||||
"MT_KURAGENBOMB",
|
||||
"MT_KURAGENBOMB",
|
||||
};
|
||||
|
||||
const char *const MOBJFLAG_LIST[] = {
|
||||
|
|
|
|||
38
src/info.c
38
src/info.c
|
|
@ -891,27 +891,27 @@ char sprnames[NUMSPRITES + 1][5] =
|
|||
"CPT1", // Checkpoint Orb
|
||||
"CPT2", // Checkpoint Stick
|
||||
"CPT3", // Checkpoint Base
|
||||
|
||||
|
||||
// rideroid (see info.h for detail)
|
||||
"RDRD",
|
||||
"RDRA",
|
||||
"RDRC",
|
||||
"RDRL",
|
||||
|
||||
|
||||
// leaf storm egg ball.
|
||||
"LSZB",
|
||||
|
||||
|
||||
// Dead Line Zone
|
||||
"DLZH",
|
||||
"DLZR",
|
||||
"DLZS",
|
||||
"DLZA",
|
||||
|
||||
"DLZA",
|
||||
|
||||
// Water Palace Zone
|
||||
"WPWL", // turbine
|
||||
"WPZF", // fountain
|
||||
"WPZK", // klagen
|
||||
|
||||
"WPZK", // klagen
|
||||
|
||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||
"VIEW",
|
||||
};
|
||||
|
|
@ -5437,17 +5437,17 @@ state_t states[NUMSTATES] =
|
|||
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK10}, // S_CHECKPOINT_SPARK9
|
||||
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK11}, // S_CHECKPOINT_SPARK10
|
||||
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK1}, // S_CHECKPOINT_SPARK11
|
||||
|
||||
|
||||
// Las Vegas
|
||||
{SPR_RDRD, 0, -1, {NULL}, 0, 0, S_RIDEROID}, // S_RIDEROID
|
||||
{SPR_RDRC, FF_ANIMATE|FF_FULLBRIGHT|FF_TRANS30, -1, {NULL}, 3, 2, S_RIDEROID_ICON}, // S_RIDEROID_ICON
|
||||
|
||||
|
||||
// Dead Line
|
||||
{SPR_DLZH, 0, -1, {NULL}, 0, 0, S_DLZHOVER}, // S_DLZHOVER
|
||||
|
||||
|
||||
{SPR_DLZR, 0, -1, {NULL}, 0, 0, S_DLZROCKET_L}, // S_DLZROCKET_L
|
||||
{SPR_DLZR, 1, -1, {NULL}, 0, 0, S_DLZROCKET_R}, // S_DLZROCKET_R
|
||||
|
||||
|
||||
// Water Palace
|
||||
{SPR_WPZF, 0, -1, {NULL}, 0, 0, S_WPZFOUNTAIN}, // S_WPZFOUNTAIN
|
||||
{SPR_WPZF, 1|FF_ANIMATE, -1, {NULL}, 3, 2, S_WPZFOUNTAINANIM}, // S_WPZFOUNTAINANIM
|
||||
|
|
@ -30741,7 +30741,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
|
||||
{ // MT_WATERPALACETURBINE
|
||||
3400, // doomednum
|
||||
S_INVISIBLE, // spawnstate
|
||||
|
|
@ -30767,8 +30767,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
sfx_None, // activesound
|
||||
MF_NOGRAVITY|MF_NOBLOCKMAP, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
{ // MT_WATERPALACEBUBBLE
|
||||
-1, // doomednum
|
||||
S_INVISIBLE, // spawnstate
|
||||
|
|
@ -30794,7 +30794,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
sfx_None, // activesound
|
||||
MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIP, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
},
|
||||
|
||||
{ // MT_WATERPALACEFOUNTAIN
|
||||
3401, // doomednum
|
||||
|
|
@ -30822,7 +30822,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
MF_SOLID, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
|
||||
{ // MT_KURAGEN
|
||||
3402, // doomednum
|
||||
S_KURAGEN, // spawnstate
|
||||
|
|
@ -30848,7 +30848,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
sfx_None, // activesound
|
||||
MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
},
|
||||
|
||||
{ // MT_KURAGENBOMB
|
||||
-1, // doomednum
|
||||
|
|
@ -30875,8 +30875,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
sfx_None, // activesound
|
||||
MF_PAIN, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
skincolor_t skincolors[MAXSKINCOLORS] = {
|
||||
|
|
|
|||
34
src/info.h
34
src/info.h
|
|
@ -1241,7 +1241,7 @@ typedef enum sprite
|
|||
SPR_ARK3,
|
||||
SPR_ARK4,
|
||||
SPR_ARK5,
|
||||
|
||||
|
||||
|
||||
SPR_BUMP, // Player/shell bump
|
||||
SPR_FLEN, // Shell hit graphics stuff
|
||||
|
|
@ -1445,24 +1445,24 @@ typedef enum sprite
|
|||
SPR_CPT1, // Checkpoint Orb
|
||||
SPR_CPT2, // Checkpoint Stick
|
||||
SPR_CPT3, // Checkpoint Base
|
||||
|
||||
|
||||
SPR_RDRD, // rideroid
|
||||
SPR_RDRA, // rideroid node sprites
|
||||
SPR_RDRC,
|
||||
SPR_RDRL,
|
||||
|
||||
|
||||
SPR_LSZB, // eggman ball.
|
||||
|
||||
|
||||
SPR_DLZH, // DLZ Hover
|
||||
SPR_DLZR, // DLZ Rocket
|
||||
SPR_DLZS, // DLZ Seasaw
|
||||
SPR_DLZA, // Helper arrows for rocket
|
||||
|
||||
|
||||
SPR_WPWL, // turbine
|
||||
SPR_WPZF, // fountain
|
||||
SPR_WPZK, // klagen
|
||||
|
||||
|
||||
|
||||
|
||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||
SPR_VIEW,
|
||||
|
||||
|
|
@ -5861,23 +5861,23 @@ typedef enum state
|
|||
S_CHECKPOINT_SPARK9,
|
||||
S_CHECKPOINT_SPARK10,
|
||||
S_CHECKPOINT_SPARK11,
|
||||
|
||||
|
||||
// rideroid
|
||||
S_RIDEROID,
|
||||
S_RIDEROID_ICON,
|
||||
|
||||
|
||||
// dead line zone
|
||||
S_DLZHOVER,
|
||||
S_DLZROCKET_L,
|
||||
S_DLZROCKET_R,
|
||||
|
||||
|
||||
// water palace zone
|
||||
S_WPZFOUNTAIN,
|
||||
S_WPZFOUNTAINANIM,
|
||||
S_KURAGEN,
|
||||
S_KURAGENBOMB,
|
||||
|
||||
|
||||
|
||||
|
||||
S_FIRSTFREESLOT,
|
||||
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
||||
NUMSTATES
|
||||
|
|
@ -7048,14 +7048,14 @@ typedef enum mobj_type
|
|||
|
||||
MT_CHECKPOINT_END,
|
||||
MT_SCRIPT_THING,
|
||||
|
||||
|
||||
MT_RIDEROID,
|
||||
MT_RIDEROIDNODE,
|
||||
|
||||
|
||||
MT_LSZ_BUNGEE,
|
||||
MT_LSZ_EGGBALLSPAWNER,
|
||||
MT_LSZ_EGGBALL,
|
||||
|
||||
|
||||
MT_DLZ_HOVER,
|
||||
MT_DLZ_ROCKET,
|
||||
MT_DLZ_SEASAW_SPAWN,
|
||||
|
|
@ -7063,13 +7063,13 @@ typedef enum mobj_type
|
|||
MT_DLZ_SEASAW_VISUAL,
|
||||
MT_DLZ_RINGVACCUM,
|
||||
MT_DLZ_SUCKEDRING,
|
||||
|
||||
|
||||
MT_WATERPALACETURBINE,
|
||||
MT_WATERPALACEBUBBLE,
|
||||
MT_WATERPALACEFOUNTAIN,
|
||||
MT_KURAGEN,
|
||||
MT_KURAGENBOMB,
|
||||
|
||||
|
||||
MT_FIRSTFREESLOT,
|
||||
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
||||
NUMMOBJTYPES
|
||||
|
|
|
|||
12
src/k_kart.c
12
src/k_kart.c
|
|
@ -8268,7 +8268,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
|||
player->incontrol = 0;
|
||||
player->incontrol++;
|
||||
}
|
||||
|
||||
|
||||
player->incontrol = min(player->incontrol, 5*TICRATE);
|
||||
player->incontrol = max(player->incontrol, -5*TICRATE);
|
||||
|
||||
|
|
@ -11871,18 +11871,18 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||
{
|
||||
player->pflags &= ~PF_AIRFAILSAFE;
|
||||
}
|
||||
|
||||
|
||||
Obj_RingShooterInput(player);
|
||||
|
||||
|
||||
if (player->bungee)
|
||||
Obj_playerBungeeThink(player);
|
||||
|
||||
|
||||
if (player->dlzrocket)
|
||||
Obj_playerDLZRocket(player);
|
||||
|
||||
|
||||
if (player->seasawcooldown && !player->seasaw)
|
||||
player->seasawcooldown--;
|
||||
|
||||
|
||||
if (player->turbine)
|
||||
{
|
||||
if (player->mo->tracer && !P_MobjWasRemoved(player->mo->tracer))
|
||||
|
|
|
|||
|
|
@ -465,36 +465,36 @@ static int player_get(lua_State *L)
|
|||
else if (fastcmp(field,"follower"))
|
||||
LUA_PushUserdata(L, plr->follower, META_MOBJ);
|
||||
//
|
||||
|
||||
|
||||
// rideroids
|
||||
else if (fastcmp(field,"rideroid"))
|
||||
lua_pushboolean(L, plr->rideroid);
|
||||
else if (fastcmp(field,"rdnodepull"))
|
||||
lua_pushboolean(L, plr->rdnodepull);
|
||||
lua_pushboolean(L, plr->rdnodepull);
|
||||
else if (fastcmp(field,"rideroidangle"))
|
||||
lua_pushinteger(L, plr->rideroidangle);
|
||||
else if (fastcmp(field,"rideroidspeed"))
|
||||
lua_pushinteger(L, plr->rideroidspeed);
|
||||
lua_pushinteger(L, plr->rideroidspeed);
|
||||
else if (fastcmp(field,"rideroidrollangle"))
|
||||
lua_pushinteger(L, plr->rideroidrollangle);
|
||||
else if (fastcmp(field,"rdaddmomx"))
|
||||
lua_pushinteger(L, plr->rdaddmomx);
|
||||
lua_pushinteger(L, plr->rdaddmomx);
|
||||
else if (fastcmp(field,"rdaddmomy"))
|
||||
lua_pushinteger(L, plr->rdaddmomy);
|
||||
lua_pushinteger(L, plr->rdaddmomy);
|
||||
else if (fastcmp(field,"rdaddmomz"))
|
||||
lua_pushinteger(L, plr->rdaddmomz);
|
||||
|
||||
lua_pushinteger(L, plr->rdaddmomz);
|
||||
|
||||
// bungee
|
||||
else if (fastcmp(field,"bungee"))
|
||||
lua_pushinteger(L, plr->bungee);
|
||||
|
||||
lua_pushinteger(L, plr->bungee);
|
||||
|
||||
// dlz hover
|
||||
else if (fastcmp(field,"lasthover"))
|
||||
lua_pushinteger(L, plr->lasthover);
|
||||
|
||||
lua_pushinteger(L, plr->lasthover);
|
||||
|
||||
// dlz rocket
|
||||
else if (fastcmp(field,"dlzrocket"))
|
||||
lua_pushinteger(L, plr->dlzrocket);
|
||||
lua_pushinteger(L, plr->dlzrocket);
|
||||
else if (fastcmp(field,"dlzrocketangle"))
|
||||
lua_pushinteger(L, plr->dlzrocketangle);
|
||||
else if (fastcmp(field,"dlzrocketanglev"))
|
||||
|
|
@ -516,7 +516,7 @@ static int player_get(lua_State *L)
|
|||
else if (fastcmp(field,"seasawmoreangle"))
|
||||
lua_pushinteger(L, plr->seasawmoreangle);
|
||||
else if (fastcmp(field,"seasawdir"))
|
||||
lua_pushboolean(L, plr->seasawdir);
|
||||
lua_pushboolean(L, plr->seasawdir);
|
||||
|
||||
// turbine
|
||||
else if (fastcmp(field,"turbine"))
|
||||
|
|
@ -526,8 +526,8 @@ static int player_get(lua_State *L)
|
|||
else if (fastcmp(field,"turbineheight"))
|
||||
lua_pushinteger(L, plr->turbineheight);
|
||||
else if (fastcmp(field,"turbinespd"))
|
||||
lua_pushinteger(L, plr->turbinespd);
|
||||
|
||||
lua_pushinteger(L, plr->turbinespd);
|
||||
|
||||
else if (fastcmp(field,"charflags"))
|
||||
lua_pushinteger(L, plr->charflags);
|
||||
else if (fastcmp(field,"followitem"))
|
||||
|
|
@ -932,7 +932,7 @@ static int player_set(lua_State *L)
|
|||
else if (fastcmp(field,"rdnodepull"))
|
||||
plr->rdnodepull = luaL_checkboolean(L, 3);
|
||||
else if (fastcmp(field,"rideroidangle"))
|
||||
plr->rideroidangle = luaL_checkinteger(L, 3);
|
||||
plr->rideroidangle = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"rideroidspeed"))
|
||||
plr->rideroidspeed = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"rideroidrollangle"))
|
||||
|
|
@ -942,11 +942,11 @@ static int player_set(lua_State *L)
|
|||
else if (fastcmp(field,"rdaddmomy"))
|
||||
plr->rdaddmomy = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"rdaddmomz"))
|
||||
plr->rdaddmomz = luaL_checkinteger(L, 3);
|
||||
|
||||
plr->rdaddmomz = luaL_checkinteger(L, 3);
|
||||
|
||||
// bungee
|
||||
else if (fastcmp(field,"bungee"))
|
||||
plr->bungee = luaL_checkinteger(L, 3);
|
||||
plr->bungee = luaL_checkinteger(L, 3);
|
||||
|
||||
// dlz hover
|
||||
else if (fastcmp(field,"lasthover"))
|
||||
|
|
@ -964,7 +964,7 @@ static int player_set(lua_State *L)
|
|||
|
||||
// seasaws
|
||||
else if (fastcmp(field,"seasaw"))
|
||||
plr->seasaw = luaL_checkboolean(L, 3);
|
||||
plr->seasaw = luaL_checkboolean(L, 3);
|
||||
else if (fastcmp(field,"seasawcooldown"))
|
||||
plr->seasawcooldown = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"seasawdist"))
|
||||
|
|
@ -980,14 +980,14 @@ static int player_set(lua_State *L)
|
|||
|
||||
// turbines
|
||||
else if (fastcmp(field,"turbine"))
|
||||
plr->turbine = luaL_checkinteger(L, 3);
|
||||
plr->turbine = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"turbineangle"))
|
||||
plr->turbineangle = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"turbineheight"))
|
||||
plr->turbineheight = luaL_checkinteger(L, 3);
|
||||
else if (fastcmp(field,"turbinespd"))
|
||||
plr->turbinespd = luaL_checkinteger(L, 3);
|
||||
|
||||
plr->turbinespd = luaL_checkinteger(L, 3);
|
||||
|
||||
//
|
||||
else if (fastcmp(field,"charflags"))
|
||||
plr->charflags = (UINT32)luaL_checkinteger(L, 3);
|
||||
|
|
|
|||
|
|
@ -764,7 +764,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
case MT_LSZ_BUNGEE:
|
||||
Obj_BungeeSpecial(special, player);
|
||||
return;
|
||||
|
|
@ -820,11 +820,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||
case MT_RAINBOWDASHRING:
|
||||
Obj_DashRingTouch(special, player);
|
||||
return;
|
||||
|
||||
|
||||
case MT_DLZ_ROCKET:
|
||||
Obj_DLZRocketSpecial(special, player);
|
||||
return;
|
||||
|
||||
|
||||
default: // SOC or script pickup
|
||||
P_SetTarget(&special->target, toucher);
|
||||
break;
|
||||
|
|
|
|||
18
src/p_map.c
18
src/p_map.c
|
|
@ -741,31 +741,31 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
|
|||
}
|
||||
|
||||
// SRB2kart 011617 - Colission[sic] code for kart items //
|
||||
|
||||
|
||||
if (thing->type == MT_DLZ_SEASAW_HITBOX)
|
||||
{
|
||||
if (tm.thing->type == MT_PLAYER)
|
||||
Obj_DLZSeasawCollide(tm.thing, thing); // all checks are performed in there.
|
||||
|
||||
|
||||
return BMIT_CONTINUE;
|
||||
}
|
||||
|
||||
|
||||
if (thing->type == MT_DLZ_HOVER)
|
||||
{
|
||||
if (tm.thing->type == MT_PLAYER)
|
||||
Obj_DLZHoverCollide(tm.thing, thing);
|
||||
|
||||
|
||||
return BMIT_CONTINUE;
|
||||
}
|
||||
|
||||
|
||||
if (thing->type == MT_DLZ_RINGVACCUM)
|
||||
{
|
||||
if (tm.thing->type == MT_FLINGRING)
|
||||
Obj_DLZRingVaccumCollide(tm.thing, thing);
|
||||
|
||||
|
||||
return BMIT_CONTINUE;
|
||||
}
|
||||
|
||||
|
||||
if (tm.thing->type == MT_INSTAWHIP)
|
||||
{
|
||||
if (tm.thing->z > thing->z + thing->height)
|
||||
|
|
@ -1901,7 +1901,7 @@ static BlockItReturn_t PIT_CheckLine(line_t *ld)
|
|||
else if (shouldCollide == 2)
|
||||
return BMIT_CONTINUE; // force no collide
|
||||
}
|
||||
|
||||
|
||||
// a bit of a hacky behaviour, but not that I know where else it would go.
|
||||
if (tm.blockingline->flags & ML_TFERLINE)
|
||||
{
|
||||
|
|
@ -1914,7 +1914,7 @@ static BlockItReturn_t PIT_CheckLine(line_t *ld)
|
|||
Obj_DLZRocketDismount(tm.thing->player);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!ld->backsector) // one sided line
|
||||
{
|
||||
if (P_PointOnLineSide(tm.thing->x, tm.thing->y, ld))
|
||||
|
|
|
|||
26
src/p_mobj.c
26
src/p_mobj.c
|
|
@ -9703,24 +9703,24 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||
case MT_RAINBOWDASHRING:
|
||||
Obj_RainbowDashRingThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_RIDEROID:
|
||||
Obj_RideroidThink(mobj);
|
||||
if (P_MobjWasRemoved(mobj))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
|
||||
|
||||
case MT_RIDEROIDNODE:
|
||||
Obj_RideroidNodeThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_LSZ_EGGBALLSPAWNER:
|
||||
Obj_EggBallSpawnerThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_LSZ_EGGBALL:
|
||||
Obj_EggBallThink(mobj);
|
||||
break;
|
||||
|
|
@ -9728,35 +9728,35 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||
case MT_DLZ_ROCKET:
|
||||
Obj_DLZRocketThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_DLZ_SEASAW_SPAWN:
|
||||
Obj_DLZSeasawThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_DLZ_SUCKEDRING:
|
||||
Obj_DLZSuckedRingThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_WATERPALACETURBINE:
|
||||
Obj_WPZTurbineThinker(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_WATERPALACEBUBBLE:
|
||||
Obj_WPZBubbleThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_WATERPALACEFOUNTAIN:
|
||||
Obj_WPZFountainThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_KURAGEN:
|
||||
Obj_WPZKuragenThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
case MT_KURAGENBOMB:
|
||||
Obj_WPZKuragenBombThink(mobj);
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
// check mobj against possible water content, before movement code
|
||||
P_MobjCheckWater(mobj);
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@ static void P_NetArchivePlayers(savebuffer_t *save)
|
|||
WRITEUINT8(save->p, players[i].ringboxdelay);
|
||||
WRITEUINT8(save->p, players[i].ringboxaward);
|
||||
WRITEFIXED(save->p, players[i].outrun);
|
||||
|
||||
|
||||
WRITEUINT8(save->p, players[i].rideroid);
|
||||
WRITEUINT8(save->p, players[i].rdnodepull);
|
||||
WRITEINT32(save->p, players[i].rideroidangle);
|
||||
|
|
@ -563,16 +563,16 @@ static void P_NetArchivePlayers(savebuffer_t *save)
|
|||
WRITEFIXED(save->p, players[i].rdaddmomx);
|
||||
WRITEFIXED(save->p, players[i].rdaddmomy);
|
||||
WRITEFIXED(save->p, players[i].rdaddmomz);
|
||||
|
||||
|
||||
WRITEUINT8(save->p, players[i].bungee);
|
||||
|
||||
|
||||
WRITEUINT32(save->p, players[i].lasthover);
|
||||
|
||||
|
||||
WRITEUINT32(save->p, players[i].dlzrocket);
|
||||
WRITEANGLE(save->p, players[i].dlzrocketangle);
|
||||
WRITEINT32(save->p, players[i].dlzrocketanglev);
|
||||
WRITEUINT32(save->p, players[i].dlzrocketspd);
|
||||
|
||||
|
||||
WRITEUINT8(save->p, players[i].seasaw);
|
||||
WRITEUINT32(save->p, players[i].seasawcooldown);
|
||||
WRITEUINT32(save->p, players[i].seasawdist);
|
||||
|
|
@ -580,12 +580,12 @@ static void P_NetArchivePlayers(savebuffer_t *save)
|
|||
WRITEINT32(save->p, players[i].seasawangleadd);
|
||||
WRITEINT32(save->p, players[i].seasawmoreangle);
|
||||
WRITEUINT8(save->p, players[i].seasawdir);
|
||||
|
||||
|
||||
WRITEUINT32(save->p, players[i].turbine);
|
||||
WRITEINT32(save->p, players[i].turbineangle);
|
||||
WRITEFIXED(save->p, players[i].turbineheight);
|
||||
WRITEUINT8(save->p, players[i].turbinespd);
|
||||
|
||||
|
||||
// respawnvars_t
|
||||
WRITEUINT8(save->p, players[i].respawn.state);
|
||||
WRITEUINT32(save->p, K_GetWaypointHeapIndex(players[i].respawn.wp));
|
||||
|
|
@ -1064,7 +1064,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
|
|||
players[i].ringboxdelay = READUINT8(save->p);
|
||||
players[i].ringboxaward = READUINT8(save->p);
|
||||
players[i].outrun = READFIXED(save->p);
|
||||
|
||||
|
||||
players[i].rideroid = READUINT8(save->p);
|
||||
players[i].rdnodepull = READUINT8(save->p);
|
||||
players[i].rideroidangle = READINT32(save->p);
|
||||
|
|
@ -1073,16 +1073,16 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
|
|||
players[i].rdaddmomx = READFIXED(save->p);
|
||||
players[i].rdaddmomy = READFIXED(save->p);
|
||||
players[i].rdaddmomz = READFIXED(save->p);
|
||||
|
||||
|
||||
players[i].bungee = READUINT8(save->p);
|
||||
|
||||
|
||||
players[i].lasthover = READUINT32(save->p);
|
||||
|
||||
|
||||
players[i].dlzrocket = READUINT32(save->p);
|
||||
players[i].dlzrocketangle = READANGLE(save->p);
|
||||
players[i].dlzrocketanglev = READINT32(save->p);
|
||||
players[i].dlzrocketspd = READUINT32(save->p);
|
||||
|
||||
|
||||
players[i].seasaw = READUINT8(save->p);
|
||||
players[i].seasawcooldown = READUINT32(save->p);
|
||||
players[i].seasawdist = READUINT32(save->p);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue