marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable standard fow

Tobias Zwick 2011-09-11 22:05:29 +02:00
parent 44a4a521f3
commit d748d1ece1
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/C4Viewport.cpp
View File

@ -139,10 +139,6 @@ void C4Viewport::DrawOverlay(C4TargetFacet &cgo, const ZoomData &GameZoom)
{
if (!Game.C4S.Head.Film || !Game.C4S.Head.Replay)
{
C4ST_STARTNEW(FoWStat, "C4Viewport::DrawOverlay: FoW")
// Player fog of war
DrawPlayerFogOfWar(cgo);
C4ST_STOP(FoWStat)
// Player info
C4ST_STARTNEW(PInfoStat, "C4Viewport::DrawOverlay: Player Info")
DrawPlayerInfo(cgo);
@ -169,7 +165,6 @@ void C4Viewport::DrawOverlay(C4TargetFacet &cgo, const ZoomData &GameZoom)
void C4Viewport::DrawMenu(C4TargetFacet &cgo)
{
// Get player
C4Player *pPlr = ::Players.Get(Player);
@ -254,6 +249,9 @@ void C4Viewport::Draw(C4TargetFacet &cgo0, bool fDrawOverlay)
last_game_draw_cgo = cgo;
// landscape mod by FoW
/*
Fog of war disabled until proper Shader-implementation is around
C4Player *pPlr=::Players.Get(Player);
if (pPlr && pPlr->fFogOfWar)
{
@ -264,6 +262,7 @@ void C4Viewport::Draw(C4TargetFacet &cgo0, bool fDrawOverlay)
}
else
lpDDraw->SetClrModMapEnabled(false);
*/
C4ST_STARTNEW(SkyStat, "C4Viewport::Draw: Sky")
::Landscape.Sky.Draw(cgo);
@ -296,9 +295,12 @@ void C4Viewport::Draw(C4TargetFacet &cgo0, bool fDrawOverlay)
// Draw overlay
if (!Game.C4S.Head.Film || !Game.C4S.Head.Replay) Game.DrawCursors(cgo, Player);
/* Fog of war disabled, see above
// FogOfWar-mod off
lpDDraw->SetClrModMapEnabled(false);
*/
if (fDrawOverlay)
{
// Determine zoom of overlay
@ -729,14 +731,6 @@ void C4Viewport::ClearPointers(C4Object *pObj)
Regions.ClearPointers(pObj);
}
void C4Viewport::DrawPlayerFogOfWar(C4TargetFacet &cgo)
{
/*
C4Player *pPlr=::Players.Get(Player);
if (!pPlr || !pPlr->FogOfWar) return;
pPlr->FogOfWar->Draw(cgo);*/ // now done by modulation
}
void C4Viewport::NextPlayer()
{
C4Player *pPlr; int32_t iPlr;

1
src/gui/C4Viewport.h
View File

@ -89,7 +89,6 @@ protected:
C4Viewport *Next;
class C4ViewportWindow * pWindow;
CClrModAddMap ClrModMap; // color modulation map for viewport drawing
void DrawPlayerFogOfWar(C4TargetFacet &cgo);
void DrawPlayerStartup(C4TargetFacet &cgo);
void Draw(C4TargetFacet &cgo, bool fDrawOverlay);
void DrawOverlay(C4TargetFacet &cgo, const ZoomData &GameZoom);