Skip to content

Commit

Permalink
Cleanup: Replaced tab indentation with spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Nov 19, 2014
1 parent 184511b commit 756f51f
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 51 deletions.
10 changes: 5 additions & 5 deletions doomsday/api/api_render.h
Expand Up @@ -151,22 +151,22 @@ DENG_API_T(Rend);
#ifndef DENG_NO_API_MACROS_RENDER
#define R_SetupFogDefaults _api_Rend.SetupFogDefaults
#define R_SetupFog _api_Rend.SetupFog
#define Rend_CacheForMobjType _api_Rend.CacheForMobjType
#define Models_CacheForState _api_Rend.CacheModelsForState
#define Rend_CacheForMobjType _api_Rend.CacheForMobjType
#define Models_CacheForState _api_Rend.CacheModelsForState
#define R_RenderPlayerView _api_Rend.RenderPlayerView
#define R_SetViewOrigin _api_Rend.SetViewOrigin
#define R_SetViewAngle _api_Rend.SetViewAngle
#define R_SetViewPitch _api_Rend.SetViewPitch
#define R_ViewWindowGeometry _api_Rend.ViewWindowGeometry
#define R_ViewWindowGeometry _api_Rend.ViewWindowGeometry
#define R_ViewWindowOrigin _api_Rend.ViewWindowOrigin
#define R_ViewWindowSize _api_Rend.ViewWindowSize
#define R_SetViewWindowGeometry _api_Rend.SetViewWindowGeometry
#define R_SetViewWindowGeometry _api_Rend.SetViewWindowGeometry
#define R_SetBorderGfx _api_Rend.SetBorderGfx
#define R_ViewPortGeometry _api_Rend.ViewPortGeometry
#define R_ViewPortOrigin _api_Rend.ViewPortOrigin
#define R_ViewPortSize _api_Rend.ViewPortSize
#define R_SetViewPortPlayer _api_Rend.SetViewPortPlayer
#define R_ChooseAlignModeAndScaleFactor _api_Rend.ChooseAlignModeAndScaleFactor
#define R_ChooseAlignModeAndScaleFactor _api_Rend.ChooseAlignModeAndScaleFactor
#define R_ChooseScaleMode2 _api_Rend.ChooseScaleMode2
#define R_ChooseScaleMode _api_Rend.ChooseScaleMode
#define R_GetSpriteInfo _api_Rend.GetSpriteInfo
Expand Down
4 changes: 2 additions & 2 deletions doomsday/api/api_resource.h
Expand Up @@ -143,8 +143,8 @@ DENG_API_T(R);
#define R_AddAnimGroupFrame _api_R.AddAnimGroupFrame
#define R_CreateColorPalette _api_R.CreateColorPalette
#define R_CreateColorPaletteTranslation _api_R.CreateColorPaletteTranslation
#define R_GetColorPaletteNumForName _api_R.GetColorPaletteNumForName
#define R_GetColorPaletteNameForNum _api_R.GetColorPaletteNameForNum
#define R_GetColorPaletteNumForName _api_R.GetColorPaletteNumForName
#define R_GetColorPaletteNameForNum _api_R.GetColorPaletteNameForNum
#define R_GetColorPaletteRGBf _api_R.GetColorPaletteRGBf
#define R_GetColorPaletteRGBubv _api_R.GetColorPaletteRGBubv
#define Textures_UniqueId _api_R.TextureUniqueId
Expand Down
8 changes: 4 additions & 4 deletions doomsday/client/include/network/net_event.h
Expand Up @@ -29,15 +29,15 @@

// Net events.
typedef enum neteventtype_e {
NE_CLIENT_ENTRY,
NE_CLIENT_EXIT,
NE_CLIENT_ENTRY,
NE_CLIENT_EXIT,
//NE_END_CONNECTION
//NE_TERMINATE_NODE
} neteventtype_t;

typedef struct netevent_s {
neteventtype_t type;
nodeid_t id;
neteventtype_t type;
nodeid_t id;
} netevent_t;

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion doomsday/client/src/gl/dgl_common.cpp
Expand Up @@ -323,7 +323,7 @@ void GL_ModulateTexture(int mode)

void GL_SetVSync(dd_bool on)
{
if(CommandLine_Exists("-novsync")) on = false;
if(CommandLine_Exists("-novsync")) on = false;

// Outside the main thread we'll need to defer the call.
if(!Sys_InMainThread())
Expand Down
4 changes: 2 additions & 2 deletions doomsday/client/src/settingsregister.cpp
Expand Up @@ -380,7 +380,7 @@ DENG2_OBSERVES(App, GameChange)
return true;
}
return false; // nothing added
}
}

/**
* Deserializes all the profiles (see aboutToUnloadGame()). In addition,
Expand Down Expand Up @@ -438,7 +438,7 @@ DENG2_OBSERVES(App, GameChange)
{
// Update current profile.
current = App::config()[confName()].value().asText();
}
}

if(!profiles.contains(current))
{
Expand Down
58 changes: 29 additions & 29 deletions doomsday/client/src/ui/clientwindow.cpp
Expand Up @@ -5,7 +5,7 @@
* MacWindowBehavior. This would make the code easier to follow and more adaptable
* to the quirks of each platform.
*
* @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2003-2014 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2008 Jamie Jones <jamie_jones_au@yahoo.com.au>
*
Expand Down Expand Up @@ -522,31 +522,31 @@ DENG2_PIMPL(ClientWindow)
{
if(variable.name() == "fsaa")
{
updateFSAAMode();
updateFSAAMode();
}
else if(variable.name() == "vsync")
{
GL_SetVSync(newValue.isTrue());
}
}

void updateFSAAMode()
{
int sampleCount = 1;
bool configured = App::config().getb(self.configName("fsaa"));
if(CommandLine_Exists("-nofsaa") || !configured)
{
LOG_GL_VERBOSE("Multisampling off");
}
else
{
sampleCount = 4; // four samples is fine?
LOG_GL_VERBOSE("Multisampling on (%i samples)") << sampleCount;
}
// All GLFramebuffer instances using default multisampling will automatically
// switch to the new setting.
GLFramebuffer::setDefaultMultisampling(sampleCount);
}
void updateFSAAMode()
{
int sampleCount = 1;
bool configured = App::config().getb(self.configName("fsaa"));
if(CommandLine_Exists("-nofsaa") || !configured)
{
LOG_GL_VERBOSE("Multisampling off");
}
else
{
sampleCount = 4; // four samples is fine?
LOG_GL_VERBOSE("Multisampling on (%i samples)") << sampleCount;
}
// All GLFramebuffer instances using default multisampling will automatically
// switch to the new setting.
GLFramebuffer::setDefaultMultisampling(sampleCount);
}

void installSidebar(SidebarLocation location, GuiWidget *widget)
{
Expand Down Expand Up @@ -858,13 +858,13 @@ void ClientWindow::setMode(Mode const &mode)

void ClientWindow::closeEvent(QCloseEvent *ev)
{
if(!BusyMode_Active())
{
LOG_DEBUG("Window is about to close, executing 'quit'");
if(!BusyMode_Active())
{
LOG_DEBUG("Window is about to close, executing 'quit'");

/// @todo autosave and quit?
Con_Execute(CMDS_DDAY, "quit", true, false);
}
/// @todo autosave and quit?
Con_Execute(CMDS_DDAY, "quit", true, false);
}

// We are not authorizing immediate closing of the window;
// engine shutdown will take care of it later.
Expand All @@ -873,10 +873,10 @@ void ClientWindow::closeEvent(QCloseEvent *ev)

void ClientWindow::canvasGLReady(Canvas &canvas)
{
d->updateFSAAMode();
d->updateFSAAMode();

// Update the capability flags.
GL_state.features.multisample = GLFramebuffer::defaultMultisampling();// canvas.format().sampleBuffers();
GL_state.features.multisample = GLFramebuffer::defaultMultisampling();// canvas.format().sampleBuffers();
LOGDEV_GL_MSG("GL feature: Multisampling: %b") << GL_state.features.multisample;

if(vrCfg().needsStereoGLFormat() && !canvas.format().stereo())
Expand Down Expand Up @@ -986,7 +986,7 @@ bool ClientWindow::setDefaultGLFormat() // static
fmt.setStereo(true);
}

/*
/*
#ifdef WIN32
if(CommandLine_Exists("-novsync") || !App::config().getb("window.main.vsync"))
{
Expand All @@ -1010,7 +1010,7 @@ bool ClientWindow::setDefaultGLFormat() // static
LOG_GL_VERBOSE("Multisampling on (%i samples)") << sampleCount;
}
GLFramebuffer::setDefaultMultisampling(sampleCount);
*/
*/

if(fmt != QGLFormat::defaultFormat())
{
Expand Down
2 changes: 1 addition & 1 deletion doomsday/libcore/src/c_wrapper.cpp
Expand Up @@ -194,7 +194,7 @@ void LogBuffer_Clear(void)

void LogBuffer_EnableStandardOutput(int enable)
{
de::LogBuffer::get().enableStandardOutput(enable != 0);
de::LogBuffer::get().enableStandardOutput(enable != 0);
}

void LogBuffer_Printf(unsigned int metadata, char const *format, ...)
Expand Down
2 changes: 1 addition & 1 deletion doomsday/libdoomsday/src/console/cmd.cpp
Expand Up @@ -55,7 +55,7 @@ void Con_ClearCommands(void)
ccmdBlockSet = 0;
ccmdListHead = 0;
numUniqueNamedCCmds = 0;
mappedConfigVariables.clear();
mappedConfigVariables.clear();
}

void Con_AddKnownWordsForCommands()
Expand Down
10 changes: 5 additions & 5 deletions doomsday/libgui/src/graphics/gltarget.cpp
Expand Up @@ -516,11 +516,11 @@ void GLTarget::glBind() const
else
{
//DENG2_ASSERT(!d->fbo || glIsFramebuffer(d->fbo));
if(d->fbo && !glIsFramebuffer(d->fbo))
{
qDebug() << "GLTarget: WARNING! Attempting to bind FBO" << d->fbo
<< "that is not a valid OpenGL FBO";
}
if(d->fbo && !glIsFramebuffer(d->fbo))
{
qDebug() << "GLTarget: WARNING! Attempting to bind FBO" << d->fbo
<< "that is not a valid OpenGL FBO";
}

//qDebug() << "GLTarget: binding FBO" << d->fbo;
glBindFramebuffer(GLInfo::extensions().EXT_framebuffer_blit?
Expand Down
2 changes: 1 addition & 1 deletion doomsday/plugins/heretic/src/p_enemy.c
Expand Up @@ -595,7 +595,7 @@ void C_DECL A_Look(mobj_t *actor)
else
{
S_StartSound(sound, actor);
}
}
}

P_MobjChangeState(actor, P_GetState(actor->type, SN_SEE));
Expand Down

0 comments on commit 756f51f

Please sign in to comment.