Skip to content

Commit

Permalink
First test release of 1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaldaien committed Dec 28, 2016
1 parent 4b7c0c1 commit 0c840a2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tzf_dsound/DLL_VERSION.H
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@


#define TZF_MAJOR 1
#define TZF_MINOR 6
#define TZF_BUILD 1
#define TZF_MINOR 7
#define TZF_BUILD 0
#define TZF_REV 0


Expand Down
8 changes: 8 additions & 0 deletions tzf_dsound/render.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,8 @@ void
STDMETHODCALLTYPE
D3D9EndFrame_Pre (void)
{
tzf::RenderFix::draw_state.cegui_active = true;

void TZFix_LogUsedTextures (void);
TZFix_LogUsedTextures ();

Expand All @@ -482,6 +484,8 @@ D3D9EndFrame_Post (HRESULT hr, IUnknown* device)
if (device != tzf::RenderFix::pDevice)
return SK_EndBufferSwap (hr, device);

tzf::RenderFix::draw_state.cegui_active = false;

scene_count = 0;

tzf::RenderFix::dwRenderThreadID = GetCurrentThreadId ();
Expand Down Expand Up @@ -637,6 +641,10 @@ D3D9SetScissorRect_Detour (IDirect3DDevice9* This,
if (This != tzf::RenderFix::pDevice)
return D3D9SetScissorRect_Original (This, pRect);

// Let the mod's GUI render without any restrictions.
if (tzf::RenderFix::draw_state.cegui_active)
return D3D9SetScissorRect_Original (This, pRect);

// If we don't care about aspect ratio, then just early-out
if (! config.render.aspect_correction)
return D3D9SetScissorRect_Original (This, pRect);
Expand Down
1 change: 1 addition & 0 deletions tzf_dsound/textures.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ namespace RenderFix {

int draws = 0; // Number of draw calls
int frames = 0;
bool cegui_active = false;
} extern draw_state;


Expand Down
Binary file modified version.ini
Binary file not shown.

0 comments on commit 0c840a2

Please sign in to comment.