edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include types.h instead of system.h in input.h

Browse source
This commit is contained in:
Robert Müller 2024-05-27 18:59:33 +02:00
parent 248225c7c4
commit 0d9f673b03
5 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/engine/input.h
View file

@ -4,7 +4,8 @@
#define ENGINE_INPUT_H #define ENGINE_INPUT_H
#include "kernel.h" #include "kernel.h"
#include <base/system.h>
#include <base/types.h>
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>

11
src/game/client/component.cpp
View file

@ -2,6 +2,8 @@
#include "gameclient.h" #include "gameclient.h"
#include <base/system.h>
class IKernel *CComponent::Kernel() const { return m_pClient->Kernel(); } class IKernel *CComponent::Kernel() const { return m_pClient->Kernel(); }
class IEngine *CComponent::Engine() const { return m_pClient->Engine(); } class IEngine *CComponent::Engine() const { return m_pClient->Engine(); }
class IGraphics *CComponent::Graphics() const { return m_pClient->Graphics(); } class IGraphics *CComponent::Graphics() const { return m_pClient->Graphics(); }
@ -27,6 +29,15 @@ class IUpdater *CComponent::Updater() const
} }
#endif #endif
int64_t CComponent::time() const
{
#if defined(CONF_VIDEORECORDER)
return IVideo::Current() ? IVideo::Time() : time_get();
#else
return time_get();
#endif
}
float CComponent::LocalTime() const float CComponent::LocalTime() const
{ {
#if defined(CONF_VIDEORECORDER) #if defined(CONF_VIDEORECORDER)

17
src/game/client/component.h
View file

@ -104,25 +104,12 @@ protected:
class IUpdater *Updater() const; class IUpdater *Updater() const;
#endif #endif
#if defined(CONF_VIDEORECORDER)
/** /**
* Gets the current time. * Gets the current time.
* @see time_get() * @see time_get()
*/ */
int64_t time() const int64_t time() const;
{
return IVideo::Current() ? IVideo::Time() : time_get();
}
#else
/**
* Gets the current time.
* @see time_get()
*/
int64_t time() const
{
return time_get();
}
#endif
/** /**
* Gets the local time. * Gets the local time.
*/ */

7
src/game/client/components/voting.cpp
View file

@ -2,6 +2,8 @@
/* If you are missing that file, acquire a complete release at teeworlds.com. */ /* If you are missing that file, acquire a complete release at teeworlds.com. */
#include "voting.h" #include "voting.h"
#include <base/system.h>
#include <engine/shared/config.h> #include <engine/shared/config.h>
#include <engine/textrender.h> #include <engine/textrender.h>
@ -139,6 +141,11 @@ void CVoting::Vote(int v)
Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL); Client()->SendPackMsgActive(&Msg, MSGFLAG_VITAL);
} }
int CVoting::SecondsLeft() const
{
return (m_Closetime - time()) / time_freq();
}
CVoting::CVoting() CVoting::CVoting()
{ {
ClearOptions(); ClearOptions();

4
src/game/client/components/voting.h
View file

@ -57,8 +57,8 @@ public:
void Vote(int v); // -1 = no, 1 = yes void Vote(int v); // -1 = no, 1 = yes
int SecondsLeft() { return (m_Closetime - time()) / time_freq(); } int SecondsLeft() const;
bool IsVoting() { return m_Closetime != 0; } bool IsVoting() const { return m_Closetime != 0; }
int TakenChoice() const { return m_Voted; } int TakenChoice() const { return m_Voted; }
const char *VoteDescription() const { return m_aDescription; } const char *VoteDescription() const { return m_aDescription; }
const char *VoteReason() const { return m_aReason; } const char *VoteReason() const { return m_aReason; }