zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert r2173.

Browse source 
SVN r2192 (trunk)
This commit is contained in:
Randy Heit 2010-03-05 23:09:31 +00:00
parent 5c4af020d9
commit dfd963ba1a
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/m_cheat.cpp
View file

@ -46,8 +46,6 @@
#include "d_dehacked.h" #include "d_dehacked.h"
#include "gi.h" #include "gi.h"
EXTERN_CVAR(Bool, r_forceplayertranslation)
// [RH] Actually handle the cheat. The cheat code in st_stuff.c now just // [RH] Actually handle the cheat. The cheat code in st_stuff.c now just
// writes some bytes to the network data stream, and the network code // writes some bytes to the network data stream, and the network code
// later calls us. // later calls us.
@ -321,7 +319,6 @@ void cht_DoCheat (player_t *player, int cheat)
player->mo->special1 = 0; // required for the Hexen fighter's fist attack. player->mo->special1 = 0; // required for the Hexen fighter's fist attack.
// This gets set by AActor::Die as flag for the wimpy death and must be reset here. // This gets set by AActor::Die as flag for the wimpy death and must be reset here.
player->mo->SetState (player->mo->SpawnState); player->mo->SetState (player->mo->SpawnState);
if (multiplayer || r_forceplayertranslation)
player->mo->Translation = TRANSLATION(TRANSLATION_Players, BYTE(player-players)); player->mo->Translation = TRANSLATION(TRANSLATION_Players, BYTE(player-players));
player->mo->DamageType = NAME_None; player->mo->DamageType = NAME_None;
// player->mo->GiveDefaultInventory(); // player->mo->GiveDefaultInventory();

11
src/p_mobj.cpp
View file

@ -114,14 +114,6 @@ CUSTOM_CVAR (Float, sv_gravity, 800.f, CVAR_SERVERINFO|CVAR_NOSAVE)
level.gravity = self; level.gravity = self;
} }
CUSTOM_CVAR(Bool, r_forceplayertranslation, false, CVAR_ARCHIVE|CVAR_NOINITCALL)
{
if (!multiplayer && players[0].mo != NULL)
{
players[0].mo->Translation = self? TRANSLATION(TRANSLATION_Players, 0) : 0;
}
}
CVAR (Bool, cl_missiledecals, true, CVAR_ARCHIVE) CVAR (Bool, cl_missiledecals, true, CVAR_ARCHIVE)
CVAR (Bool, addrocketexplosion, false, CVAR_ARCHIVE) CVAR (Bool, addrocketexplosion, false, CVAR_ARCHIVE)
@ -3992,10 +3984,7 @@ APlayerPawn *P_SpawnPlayer (FMapThing *mthing, bool tempplayer)
R_BuildPlayerTranslation (playernum); R_BuildPlayerTranslation (playernum);
// [RH] set color translations for player sprites // [RH] set color translations for player sprites
if (multiplayer || r_forceplayertranslation)
mobj->Translation = TRANSLATION(TRANSLATION_Players,playernum); mobj->Translation = TRANSLATION(TRANSLATION_Players,playernum);
else
mobj->Translation = 0;
mobj->angle = spawn_angle; mobj->angle = spawn_angle;
mobj->pitch = mobj->roll = 0; mobj->pitch = mobj->roll = 0;