Skip to content

Commit

Permalink
Fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
deathkiller committed Dec 29, 2024
1 parent 61b8b26 commit 2d3c9c0
Show file tree
Hide file tree
Showing 34 changed files with 38 additions and 9 deletions.
1 change: 1 addition & 0 deletions Sources/Jazz2/Direction.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Direction, supports a bitwise combination of its member values */
enum class Direction
{
None = 0,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/EventType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Event type */
enum class EventType : std::uint16_t
{
Empty = 0,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/ExitType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Exit type, supports a bitwise combination of its member values */
enum class ExitType : std::uint8_t
{
None,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/GameDifficulty.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Game difficulty */
enum class GameDifficulty : std::uint8_t
{
Default,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/IStateHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Jazz2
{
/** @brief Base interface of a state handler */
/** @brief Base interface of a state handler, only one handler runs at a time */
class IStateHandler
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/LevelFlags.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Level flags, supports a bitwise combination of its member values */
enum class LevelFlags : std::uint16_t
{
None = 0,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/PlayerActions.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Jazz2
{
/** @brief Player actions */
enum class PlayerActions
{
Left,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/PlayerType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Player type */
enum class PlayerType : std::uint8_t
{
None,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/PreferencesCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ namespace Jazz2

# pragma pack(pop)

/** @brief Provides access to a user preferences */
class PreferencesCache
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/Resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ namespace Jazz2

DEFINE_ENUM_OPERATORS(MetadataFlags);

/** @brief Contains assets for specific object type */
struct Metadata
{
String Path;
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/ShieldType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Shield type */
enum class ShieldType : uint8_t
{
None,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/SuspendType.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Jazz2
{
/** @brief Suspend type */
enum class SuspendType
{
None,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Canvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ using namespace nCine;

namespace Jazz2::UI
{
/** @brief Canvas */
class Canvas : public SceneNode
{
friend class Font;
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/ControlScheme.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ namespace Jazz2::UI
Vector2f Movement;
};

/** @brief Provides access to a user configured control scheme */
class ControlScheme
{
friend class Menu::RemapControlsSection;
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/DiscordRpcClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ using namespace nCine;

namespace Jazz2::UI
{
/** @brief Allows interactions with running Discord client */
class DiscordRpcClient
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Font.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ using namespace nCine;

namespace Jazz2::UI
{
/** @brief Bitmap font */
class Font
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/HUD.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace Jazz2::Scripting

namespace Jazz2::UI
{
/** @brief Player HUD */
class HUD : public Canvas
{
#if defined(WITH_ANGELSCRIPT)
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/InGameConsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Jazz2::UI
Fatal
};

/** @brief In-game console */
class InGameConsole : public Canvas
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Menu/IMenuContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace Jazz2::UI::Menu

DEFINE_ENUM_OPERATORS(ChangedPreferencesType);

/** @brief Base interface of a menu container */
class IMenuContainer
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Menu/InGameMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ using namespace Jazz2::Tiles;

namespace Jazz2::UI::Menu
{
/** @brief In-game menu */
class InGameMenu : public IMenuContainer
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Menu/MainMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace Jazz2::UI::Menu
class CreateServerOptionsSection;
#endif

/** @brief Main menu */
class MainMenu : public IStateHandler, public IMenuContainer
{
friend class BeginSection;
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/UI/Menu/MenuSection.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

namespace Jazz2::UI::Menu
{
/** @brief Base class of a menu section */
class MenuSection
{
public:
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/WeaponType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Weapon type */
enum class WeaponType : std::uint8_t {
Blaster = 0,
Bouncer,
Expand Down
1 change: 1 addition & 0 deletions Sources/Jazz2/WeatherType.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Jazz2
{
/** @brief Weather type, supports a bitwise combination of its member values */
enum class WeatherType : std::uint8_t
{
None,
Expand Down
3 changes: 3 additions & 0 deletions Sources/Shared/Containers/StringConcatenable.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Death { namespace Containers {
{ typedef String ConvertTo; };
}

/** @brief Resulting object of a deferred string concatenation */
template<typename Builder, typename T>
struct StringBuilderBase
{
Expand Down Expand Up @@ -77,6 +78,7 @@ namespace Death { namespace Containers {
StringBuilder& operator=(const StringBuilder&) = delete;
};

#ifndef DOXYGEN_GENERATING_OUTPUT
template<>
struct StringConcatenable<char>
{
Expand Down Expand Up @@ -214,6 +216,7 @@ namespace Death { namespace Containers {
StringConcatenableEx<B>::appendTo(c.b, out);
}
};
#endif

template<typename A, typename B,
typename = std::void_t<typename StringConcatenableEx<A>::type, typename StringConcatenableEx<B>::type>>
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Audio/AudioBufferPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace nCine
{
class AudioBuffer;

/// Audio buffer player class
/// Audio buffer player
class AudioBufferPlayer : public IAudioPlayer
{
DEATH_RUNTIME_OBJECT(IAudioPlayer);
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Audio/AudioStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace nCine
class IAudioReader;
class IAudioLoader;

/// Audio stream class
/// Audio stream
class AudioStream
{
public:
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Audio/AudioStreamPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace nCine
{
/// Audio stream player class
/// Audio stream player
class AudioStreamPlayer : public IAudioPlayer
{
DEATH_RUNTIME_OBJECT(IAudioPlayer);
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Graphics/Material.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace nCine
class GLUniformCache;
class GLAttribute;

/// The class containing material data for a drawable node
/// Contains material data for a drawable node
class Material
{
public:
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Graphics/Shader.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace nCine
{
/// Shader class
/// Shader
class Shader : public Object
{
public:
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Graphics/Texture.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace nCine
Repeat
};

/// Texture class
/// Texture
class Texture : public Object
{
public:
Expand Down
3 changes: 3 additions & 0 deletions Sources/nCine/I18n.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@

using namespace Death;
using namespace Death::Containers::Literals;

#if defined(DEATH_TARGET_ANDROID)
using namespace nCine::Backends;
#endif

namespace nCine
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Threading/IThreadPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace nCine
{
/// Thread pool interface class
/// Thread pool interface
class IThreadPool
{
public:
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Threading/ThreadPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using namespace Death::Containers;

namespace nCine
{
/// Thread pool class
/// Thread pool
class ThreadPool : public IThreadPool
{
public:
Expand Down

0 comments on commit 2d3c9c0

Please sign in to comment.