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

- added option to set item pickup color through MAPINFO's GAMEINFO block.

Browse source 
SVN r2539 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-14 06:25:38 +00:00
parent 1063a98c47
commit b288a7a416
8 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/shared_sbar.cpp
View file

@ -1504,7 +1504,9 @@ void DBaseStatusBar::BlendView (float blend[4])
if (CPlayer->bonuscount) if (CPlayer->bonuscount)
{ {
cnt = CPlayer->bonuscount << 3; cnt = CPlayer->bonuscount << 3;
AddBlend (0.8431f, 0.7333f, 0.2706f, cnt > 128 ? 0.5f : cnt / 255.f, blend);
AddBlend (RPART(gameinfo.pickupcolor)/255.f, GPART(gameinfo.pickupcolor)/255.f,
BPART(gameinfo.pickupcolor)/255.f, cnt > 128 ? 0.5f : cnt / 255.f, blend);
} }
if (CPlayer->mo->DamageFade.a != 0) if (CPlayer->mo->DamageFade.a != 0)

1
src/gi.cpp
View file

@ -266,6 +266,7 @@ void FMapInfoParser::ParseGameInfo()
GAMEINFOKEY_INT(defKickback, "defKickback") GAMEINFOKEY_INT(defKickback, "defKickback")
GAMEINFOKEY_CSTRING(SkyFlatName, "SkyFlatName", 8) GAMEINFOKEY_CSTRING(SkyFlatName, "SkyFlatName", 8)
GAMEINFOKEY_STRING(translator, "translator") GAMEINFOKEY_STRING(translator, "translator")
GAMEINFOKEY_COLOR(pickupcolor, "pickupcolor")
GAMEINFOKEY_COLOR(defaultbloodcolor, "defaultbloodcolor") GAMEINFOKEY_COLOR(defaultbloodcolor, "defaultbloodcolor")
GAMEINFOKEY_COLOR(defaultbloodparticlecolor, "defaultbloodparticlecolor") GAMEINFOKEY_COLOR(defaultbloodparticlecolor, "defaultbloodparticlecolor")
GAMEINFOKEY_STRING(backpacktype, "backpacktype") GAMEINFOKEY_STRING(backpacktype, "backpacktype")

1
src/gi.h
View file

@ -106,6 +106,7 @@ struct gameinfo_t
int defaultrespawntime; int defaultrespawntime;
int defaultdropstyle; int defaultdropstyle;
int player5start; int player5start;
DWORD pickupcolor;
const char *GetFinalePage(unsigned int num) const; const char *GetFinalePage(unsigned int num) const;
}; };

1
wadsrc/static/mapinfo/chex.txt
View file

@ -42,6 +42,7 @@ gameinfo
endoom = "ENDOOM" endoom = "ENDOOM"
player5start = 4001 player5start = 4001
drawreadthis = true drawreadthis = true
pickupcolor = "d6 ba 45"
} }
skill baby skill baby

1
wadsrc/static/mapinfo/doomcommon.txt
View file

@ -40,6 +40,7 @@ gameinfo
defaultdropstyle = 1 defaultdropstyle = 1
endoom = "ENDOOM" endoom = "ENDOOM"
player5start = 4001 player5start = 4001
pickupcolor = "d6 ba 45"
} }
skill baby skill baby

1
wadsrc/static/mapinfo/heretic.txt
View file

@ -41,6 +41,7 @@ gameinfo
defaultdropstyle = 1 defaultdropstyle = 1
endoom = "ENDTEXT" endoom = "ENDTEXT"
player5start = 4001 player5start = 4001
pickupcolor = "d6 ba 45"
} }
skill baby skill baby

1
wadsrc/static/mapinfo/hexen.txt
View file

@ -39,6 +39,7 @@ gameinfo
defaultrespawntime = 12 defaultrespawntime = 12
defaultdropstyle = 1 defaultdropstyle = 1
player5start = 9100 player5start = 9100
pickupcolor = "d6 ba 45"
} }
skill baby skill baby

1
wadsrc/static/mapinfo/strife.txt
View file

@ -42,6 +42,7 @@ gameinfo
defaultdropstyle = 2 defaultdropstyle = 2
endoom = "ENDSTRF" endoom = "ENDSTRF"
player5start = 5 player5start = 5
pickupcolor = "d6 ba 45"
} }
skill baby skill baby