Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Oct 26, 2016
1 parent cd8dd55 commit d02b164
Showing 1 changed file with 9 additions and 18 deletions.
27 changes: 9 additions & 18 deletions doomsday/apps/client/include/resource/clientresources.h
Expand Up @@ -21,10 +21,6 @@
#ifndef DENG_CLIENT_RESOURCES_H
#define DENG_CLIENT_RESOURCES_H

#ifndef __CLIENT__
# error "resource/clientresources.h is only for the Client"
#endif

#include <QList>
#include <QMap>
#include <QSet>
Expand All @@ -46,15 +42,13 @@

#include "resource/rawtexture.h"

#ifdef __CLIENT__
# include "AbstractFont"
# include "BitmapFont"
# include "CompositeBitmapFont"
# include "FontScheme"
# include "MaterialVariantSpec"
# include "resource/framemodel.h"
# include "resource/framemodeldef.h"
#endif
#include "AbstractFont"
#include "BitmapFont"
#include "CompositeBitmapFont"
#include "FontScheme"
#include "MaterialVariantSpec"
#include "resource/framemodel.h"
#include "resource/framemodeldef.h"

class ClientMaterial;

Expand Down Expand Up @@ -93,7 +87,6 @@ class ClientMaterial;
class ClientResources : public Resources
{
public:
#ifdef __CLIENT__
/// The referenced model def was not found. @ingroup errors
DENG2_ERROR(MissingModelDefError);

Expand All @@ -102,7 +95,6 @@ class ClientResources : public Resources

typedef QMap<de::String, de::FontScheme *> FontSchemes;
typedef QList<AbstractFont *> AllFonts;
#endif

static ClientResources &get();

Expand All @@ -113,14 +105,14 @@ class ClientResources : public Resources
*/
ClientResources();

#ifdef __CLIENT__

void clear() override;
void clearAllRuntimeResources() override;
void clearAllSystemResources() override;

void initSystemTextures() override;

void reloadAllResources() override;

/**
* Returns a rawtex_t for the given lump if one already exists; otherwise @c 0.
*/
Expand Down Expand Up @@ -432,7 +424,6 @@ class ClientResources : public Resources
* Register the console commands, variables, etc..., of this module.
*/
static void consoleRegister();
#endif

private:
DENG2_PRIVATE(d)
Expand Down

0 comments on commit d02b164

Please sign in to comment.