zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added Karate Chris's 'sv_losefrag' submission. 

SVN r628 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-23 17:45:53 +00:00
parent e5ed1c4be3
commit 1aa191421a
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/rh-log.txt
View File

@ -1,4 +1,5 @@
December 23, 2007 (Changes by Graf Zahl) December 23, 2007 (Changes by Graf Zahl)
- Added Karate Chris's 'sv_losefrag' submission.
- Added Karate Chris's 'sv_degeneration' submission. - Added Karate Chris's 'sv_degeneration' submission.
- Fixed: 'Bot joined the team' message was passing an FString to Printf. - Fixed: 'Bot joined the team' message was passing an FString to Printf.
- Backported GZDoom's true color font mappings for use with native textures - Backported GZDoom's true color font mappings for use with native textures

1
src/d_main.cpp
View File

@ -390,6 +390,7 @@ CVAR (Int, dmflags2, 0, CVAR_SERVERINFO);
CVAR (Flag, sv_weapondrop, dmflags2, DF2_YES_WEAPONDROP); CVAR (Flag, sv_weapondrop, dmflags2, DF2_YES_WEAPONDROP);
CVAR (Flag, sv_doubleammo, dmflags2, DF2_YES_DOUBLEAMMO); CVAR (Flag, sv_doubleammo, dmflags2, DF2_YES_DOUBLEAMMO);
CVAR (Flag, sv_degeneration, dmflags2, DF2_YES_DEGENERATION); CVAR (Flag, sv_degeneration, dmflags2, DF2_YES_DEGENERATION);
CVAR (Flag, sv_losefrag, dmflags2, DF2_YES_LOSEFRAG);
CVAR (Flag, sv_nobfgaim, dmflags2, DF2_NO_FREEAIMBFG); CVAR (Flag, sv_nobfgaim, dmflags2, DF2_NO_FREEAIMBFG);
CVAR (Flag, sv_respawnprotect, dmflags2, DF2_YES_INVUL); CVAR (Flag, sv_respawnprotect, dmflags2, DF2_YES_INVUL);
CVAR (Flag, sv_barrelrespawn, dmflags2, DF2_BARRELS_RESPAWN); CVAR (Flag, sv_barrelrespawn, dmflags2, DF2_BARRELS_RESPAWN);

2
src/doomdef.h
View File

@ -250,7 +250,7 @@ enum
//#define DF2_NO_CLEARFRAGS 2048 // Don't clear frags after each level //#define DF2_NO_CLEARFRAGS 2048 // Don't clear frags after each level
//#define DF2_FORCE_NORESPAWN 4096 // Player cannot respawn //#define DF2_FORCE_NORESPAWN 4096 // Player cannot respawn
DF2_YES_DEGENERATION = 1 << 13, // Quake-style degeneration DF2_YES_DEGENERATION = 1 << 13, // Quake-style degeneration
//#define DF2_YES_LOSEFRAG 16384 // Lose a frag when killed. More incentive to try to DF2_YES_LOSEFRAG = 1 << 14, // Lose a frag when killed. More incentive to try to
// // not get yerself killed // // not get yerself killed
DF2_NO_FREEAIMBFG = 1 << 15, // Don't allow BFG to be aimed at the ground DF2_NO_FREEAIMBFG = 1 << 15, // Don't allow BFG to be aimed at the ground
// or ceiling. Prevents cheap BFG frags // or ceiling. Prevents cheap BFG frags

1
src/m_options.cpp
View File

@ -1037,6 +1037,7 @@ static menuitem_t DMFlagsItems[] = {
{ bitflag, "Allow exit", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_EXIT} }, { bitflag, "Allow exit", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_EXIT} },
{ bitflag, "Barrels respawn", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_BARRELS_RESPAWN} }, { bitflag, "Barrels respawn", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_BARRELS_RESPAWN} },
{ bitflag, "Respawn protection", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_INVUL} }, { bitflag, "Respawn protection", {&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_INVUL} },
{ bitflag, "Lose frag when fragged",{&dmflags2}, {0}, {0}, {0}, {(value_t *)DF2_YES_LOSEFRAG} },
{ redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} }, { redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} },
{ whitetext,"Cooperative Settings", {NULL}, {0}, {0}, {0}, {NULL} }, { whitetext,"Cooperative Settings", {NULL}, {0}, {0}, {0}, {NULL} },
{ bitflag, "Spawn multi. weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_COOP_WEAPON_SPAWN} }, { bitflag, "Spawn multi. weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_COOP_WEAPON_SPAWN} },

3
src/p_interaction.cpp
View File

@ -425,6 +425,9 @@ void AActor::Die (AActor *source, AActor *inflictor)
} }
else else
{ {
if ((dmflags2 & DF2_YES_LOSEFRAG) && deathmatch)
player->fragcount--;
++source->player->fragcount; ++source->player->fragcount;
++source->player->spreecount; ++source->player->spreecount;
if (source->player->morphTics) if (source->player->morphTics)