Skip to content

Commit

Permalink
Minor cleanup and correction. Nothing important
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed May 14, 2018
1 parent 07d57d7 commit 23d25a2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
4 changes: 1 addition & 3 deletions src/Layers/xrRender/PSLibrary.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#pragma hdrstop

#include "PSLibrary.h"
#include "ParticleEffect.h"
#include "ParticleGroup.h"
Expand All @@ -8,8 +8,6 @@
#include "editors/ECore/Editor/ui_main.h"
#endif

#define _game_data_ "$game_data$"

bool ped_sort_pred(const PS::CPEDef* a, const PS::CPEDef* b) { return xr_strcmp(a->Name(), b->Name()) < 0; }
bool pgd_sort_pred(const PS::CPGDef* a, const PS::CPGDef* b) { return xr_strcmp(a->m_Name, b->m_Name) < 0; }
bool ped_find_pred(const PS::CPEDef* a, LPCSTR b) { return xr_strcmp(a->Name(), b) < 0; }
Expand Down
6 changes: 3 additions & 3 deletions src/Layers/xrRender/ResourceManager_Resources.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#pragma hdrstop


#pragma warning(push)
#pragma warning(disable : 4995)
Expand All @@ -12,8 +12,8 @@

#include "ResourceManager.h"
#include "tss.h"
#include "blenders\blender.h"
#include "blenders\blender_recorder.h"
#include "blenders/blender.h"
#include "blenders/blender_recorder.h"

void fix_texture_name(LPSTR fn);

Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRenderPC_R1/FStaticRender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ void CRender::Calculate()
PortalTraverser.traverse(pLastSector, ViewBase, Device.vCameraPosition, Device.mFullTransform,
CPortalTraverser::VQ_HOM + CPortalTraverser::VQ_SSA + CPortalTraverser::VQ_FADE);

// Determine visibility for static geometry hierrarhy
// Determine visibility for static geometry hierarchy
if (psDeviceFlags.test(rsDrawStatic))
{
for (u32 s_it = 0; s_it < PortalTraverser.r_sectors.size(); s_it++)
Expand Down Expand Up @@ -645,7 +645,7 @@ void CRender::Render()
r_pmask(true, false); // disable priority "1"
o.vis_intersect = TRUE;
HOM.Disable();
L_Dynamic->render(0); // addititional light sources
L_Dynamic->render(0); // additional light sources
if (Wallmarks)
{
g_r = 0;
Expand Down
3 changes: 1 addition & 2 deletions src/xrEngine/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

#include "xrCore/FTimer.h"
#include "Stats.h"
#include "xrCommon/xr_list.h"
#include "xrCore/Threading/Event.hpp"
#include "xrCore/fastdelegate.h"
#include "xrCommon/xr_list.h"
#include "xrCore/ModuleLookup.hpp"

#define VIEWPORT_NEAR 0.2f
Expand All @@ -26,7 +26,6 @@
#include "Include/xrRender/FactoryPtr.h"
#include "Render.h"


class engine_impl;

#pragma pack(push, 4)
Expand Down

0 comments on commit 23d25a2

Please sign in to comment.