dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-20 18:05:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 8ba37856ba into cd8c3662e2

Browse source
This commit is contained in:
cjayho 2017-05-01 14:03:23 +00:00 committed by GitHub
commit ba67b12dc4
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/d3xp/Player.cpp
View file

@ -7963,7 +7963,7 @@ void idPlayer::CalcDamagePoints( idEntity *inflictor, idEntity *attacker, const
// check for completely getting out of the damage
if ( !damageDef->GetBool( "noGod" ) ) {
// check for godmode
if ( godmode ) {
if ( godmode || ( cvarSystem->GetCVarBool( "ch_god" ) ) ) {
damage = 0;
}
#ifdef _D3XP

3
neo/d3xp/gamesys/SysCvar.cpp
View file

@ -69,6 +69,9 @@ struct gameVersion_s {
char string[256];
} gameVersion;
// cjayho: add cheat cvars. cheaters are people too
idCVar ch_god( "ch_god", "0", CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL | CVAR_CHEAT, "set game to permanent god mode" );
idCVar g_version( "g_version", gameVersion.string, CVAR_GAME | CVAR_ROM, "game version" );
// noset vars

2
neo/game/Player.cpp
View file

@ -6633,7 +6633,7 @@ void idPlayer::CalcDamagePoints( idEntity *inflictor, idEntity *attacker, const
// check for completely getting out of the damage
if ( !damageDef->GetBool( "noGod" ) ) {
// check for godmode
if ( godmode ) {
if ( godmode || ( cvarSystem->GetCVarBool( "ch_god" ) ) ) {
damage = 0;
}
}

3
neo/game/gamesys/SysCvar.cpp
View file

@ -59,6 +59,9 @@ struct gameVersion_s {
char string[256];
} gameVersion;
// cjayho: add cheat cvars. cheaters are people too
idCVar ch_god( "ch_god", "0", CVAR_GAME | CVAR_ARCHIVE | CVAR_BOOL | CVAR_CHEAT, "set game to permanent god mode" );
idCVar g_version( "g_version", gameVersion.string, CVAR_GAME | CVAR_ROM, "game version" );
// noset vars