diff options
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/config.h.cmake | 16 | ||||
-rw-r--r-- | src/common/event.cpp | 136 | ||||
-rw-r--r-- | src/common/logger.cpp | 2 | ||||
-rw-r--r-- | src/common/logger.h | 2 |
4 files changed, 78 insertions, 78 deletions
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index b066387..d8bff91 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -1,8 +1,8 @@ -#pragma once
-
-// Macros set by CMake
-#cmakedefine DEBUG
-#cmakedefine PLATFORM_WINDOWS @PLATFORM_WINDOWS@
-#cmakedefine PLATFORM_LINUX @PLATFORM_LINUX@
-#cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@
-
+#pragma once + +// Macros set by CMake +#cmakedefine DEBUG +#cmakedefine PLATFORM_WINDOWS @PLATFORM_WINDOWS@ +#cmakedefine PLATFORM_LINUX @PLATFORM_LINUX@ +#cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@ + diff --git a/src/common/event.cpp b/src/common/event.cpp index e8595d0..6a5f4d3 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1,68 +1,68 @@ -// * This file is part of the COLOBOT source code
-// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
-// *
-// * This program is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see http://www.gnu.org/licenses/.
-
-// event.cpp
-
-#include "common/event.h"
-#include "common/iman.h"
-
-
-
-CEventQueue::CEventQueue(CInstanceManager* iMan)
-{
- m_iMan = iMan;
- m_iMan->AddInstance(CLASS_EVENT, this);
-
- Flush();
-}
-
-CEventQueue::~CEventQueue()
-{
-}
-
-void CEventQueue::Flush()
-{
- m_head = 0;
- m_tail = 0;
- m_total = 0;
-}
-
-/** If the maximum size of queue has been reached, returns \c false.
- Else, adds the event to the queue and returns \c true. */
-bool CEventQueue::AddEvent(const Event &event)
-{
- if ( m_total >= MAX_EVENT_QUEUE ) return false;
-
- m_fifo[m_head++] = event;
- if ( m_head >= MAX_EVENT_QUEUE ) m_head = 0;
- m_total ++;
-
- return true;
-}
-
-/** If the queue is empty, returns \c false.
- Else, gets the event from the front, puts it into \a event and returns \c true. */
-bool CEventQueue::GetEvent(Event &event)
-{
- if ( m_head == m_tail ) return false;
-
- event = m_fifo[m_tail++];
- if ( m_tail >= MAX_EVENT_QUEUE ) m_tail = 0;
- m_total --;
-
- return true;
-}
-
+// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// event.cpp + +#include "common/event.h" +#include "common/iman.h" + + + +CEventQueue::CEventQueue(CInstanceManager* iMan) +{ + m_iMan = iMan; + m_iMan->AddInstance(CLASS_EVENT, this); + + Flush(); +} + +CEventQueue::~CEventQueue() +{ +} + +void CEventQueue::Flush() +{ + m_head = 0; + m_tail = 0; + m_total = 0; +} + +/** If the maximum size of queue has been reached, returns \c false. + Else, adds the event to the queue and returns \c true. */ +bool CEventQueue::AddEvent(const Event &event) +{ + if ( m_total >= MAX_EVENT_QUEUE ) return false; + + m_fifo[m_head++] = event; + if ( m_head >= MAX_EVENT_QUEUE ) m_head = 0; + m_total ++; + + return true; +} + +/** If the queue is empty, returns \c false. + Else, gets the event from the front, puts it into \a event and returns \c true. */ +bool CEventQueue::GetEvent(Event &event) +{ + if ( m_head == m_tail ) return false; + + event = m_fifo[m_tail++]; + if ( m_tail >= MAX_EVENT_QUEUE ) m_tail = 0; + m_total --; + + return true; +} + diff --git a/src/common/logger.cpp b/src/common/logger.cpp index 41d60eb..f24726e 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -55,7 +55,7 @@ void CLogger::Log(LogType type, const char *str, va_list args) { if (type < mLogLevel) return; - + switch (type) { case LOG_WARN: fprintf(IsOpened() ? mFile : stderr, "[WARN]: "); break; case LOG_INFO: fprintf(IsOpened() ? mFile : stderr, "[INFO]: "); break; diff --git a/src/common/logger.h b/src/common/logger.h index 1b3829c..a67aefe 100644 --- a/src/common/logger.h +++ b/src/common/logger.h @@ -49,7 +49,7 @@ enum LogType * * @brief Class for loggin information to file or console * -*/ +*/ class CLogger : public CSingleton<CLogger> { public: |