summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-13 22:49:35 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-13 22:49:35 +0300
commit004bb0759fa125f53a4595834f65ad30e7921461 (patch)
treeb4dc69af59d03a2eb07348c8ce5ef3de3687b116 /src
parentac3ccda23ac4b5c69e15147b8082d90df2ac23de (diff)
downloadmv-004bb0759fa125f53a4595834f65ad30e7921461.tar.gz
mv-004bb0759fa125f53a4595834f65ad30e7921461.tar.bz2
mv-004bb0759fa125f53a4595834f65ad30e7921461.tar.xz
mv-004bb0759fa125f53a4595834f65ad30e7921461.zip
Move timer constants into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/const/utils/timer.h31
-rw-r--r--src/utils/timer.cpp2
-rw-r--r--src/utils/timer.h5
7 files changed, 39 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86f918062..2f561d8ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -910,6 +910,7 @@ SET(SRCS
gamemodifiers.cpp
gamemodifiers.h
const/spells.h
+ const/utils/timer.h
const/render/graphics.h
render/graphics.cpp
render/graphics.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8304e97b5..3148a0a35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -472,6 +472,7 @@ SRC += events/actionevent.h \
eventsmanager.cpp \
eventsmanager.h \
const/spells.h \
+ const/utils/timer.h \
const/render/graphics.h \
render/graphics.cpp \
render/graphics.h \
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 122f4ecac..b819ef497 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -28,6 +28,8 @@
#include "being/localplayer.h"
+#include "const/utils/timer.h"
+
#include "gui/theme.h"
#include "listeners/debugmessagelistener.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 69af6bd9f..565ae2446 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -39,6 +39,8 @@
#include "being/playerinfo.h"
#include "being/playerrelations.h"
+#include "const/utils/timer.h"
+
#include "enums/being/beingdirection.h"
#include "particle/particleinfo.h"
diff --git a/src/const/utils/timer.h b/src/const/utils/timer.h
new file mode 100644
index 000000000..221531dc4
--- /dev/null
+++ b/src/const/utils/timer.h
@@ -0,0 +1,31 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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 2 of the License, or
+ * 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/>.
+ */
+
+#ifndef CONST_UTILS_TIMER_H
+#define CONST_UTILS_TIMER_H
+
+#include "localconsts.h"
+
+/**
+ * Set the milliseconds value of a tick time.
+ */
+static const int MILLISECONDS_IN_A_TICK = 10;
+
+#endif // CONST_UTILS_TIMER_H
diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index b2a203e44..7b2411687 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -20,6 +20,8 @@
#include "utils/timer.h"
+#include "const/utils/timer.h"
+
#include <SDL_timer.h>
#include <climits>
diff --git a/src/utils/timer.h b/src/utils/timer.h
index ac8136a6e..fa2dd2459 100644
--- a/src/utils/timer.h
+++ b/src/utils/timer.h
@@ -23,11 +23,6 @@
#include "localconsts.h"
-/**
- * Set the milliseconds value of a tick time.
- */
-static const int MILLISECONDS_IN_A_TICK = 10;
-
extern volatile int fps;
extern volatile int lps;
extern volatile int tick_time;