aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO.md1
-rw-r--r--src/common.hh (renamed from src/main.hh)12
-rw-r--r--src/config.hh2
-rw-r--r--src/connection.hh2
-rw-r--r--src/containers.hh2
-rw-r--r--src/creature.hh2
-rw-r--r--src/enums.hh2
-rw-r--r--src/main.cc2
-rw-r--r--src/map.hh2
-rw-r--r--src/monster.hh2
-rw-r--r--src/player.hh2
-rw-r--r--src/script.hh2
-rw-r--r--src/shm.cc2
-rw-r--r--src/skill.hh2
-rw-r--r--src/thread.hh2
-rw-r--r--src/time.cc2
-rw-r--r--src/util.cc2
17 files changed, 24 insertions, 19 deletions
diff --git a/TODO.md b/TODO.md
index 2e42887..4ddece4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,4 @@
## TODO NEXT
-- Split main.hh -> common.hh, shm.hh, time.hh, util.hh
- TReadStream/TWriteStream
- TReadBuffer/TWriteBuffer
- TReadBinaryFile/TWriteBinaryFile
diff --git a/src/main.hh b/src/common.hh
index 7aa329a..b057465 100644
--- a/src/main.hh
+++ b/src/common.hh
@@ -1,5 +1,5 @@
-#ifndef TIBIA_MAIN_HH_
-#define TIBIA_MAIN_HH_ 1
+#ifndef TIBIA_COMMON_HH_
+#define TIBIA_COMMON_HH_ 1
#include <float.h>
#include <limits.h>
@@ -86,6 +86,7 @@ typedef int pid_t;
//
// shm.cc
+// =============================================================================
void StartGame(void);
void CloseGame(void);
void EndGame(void);
@@ -116,8 +117,10 @@ void InitSHMExtern(bool Verbose);
void ExitSHMExtern(void);
// time.cc
+// =============================================================================
extern uint32 RoundNr;
extern uint32 ServerMilliseconds;
+
void GetRealTime(int *Hour, int *Minute);
void GetTime(int *Hour, int *Minute);
void GetDate(int *Year, int *Cycle, int *Day);
@@ -126,6 +129,7 @@ uint32 GetRoundAtTime(int Hour, int Minute);
uint32 GetRoundForNextMinute(void);
// util.cc
+// =============================================================================
typedef void TErrorFunction(const char *Text);
typedef void TPrintFunction(int Level, const char *Text);
void SetErrorFunction(TErrorFunction *Function);
@@ -133,4 +137,6 @@ void SetPrintFunction(TPrintFunction *Function);
void error(char *Text, ...) ATTR_PRINTF(1, 2);
void print(int Level, char *Text, ...) ATTR_PRINTF(1, 2);
-#endif //TIBIA_MAIN_HH_
+//
+
+#endif //TIBIA_COMMON_HH_
diff --git a/src/config.hh b/src/config.hh
index c2f1e14..dea3ce1 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_CONFIG_HH_
#define TIBIA_CONFIG_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "enums.hh"
struct TDatabaseSettings {
diff --git a/src/connection.hh b/src/connection.hh
index 724ac91..2eafcde 100644
--- a/src/connection.hh
+++ b/src/connection.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_CONNECTION_HH_
#define TIBIA_CONNECTION_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "enums.hh"
struct TConnection;
diff --git a/src/containers.hh b/src/containers.hh
index f249c81..8000d3c 100644
--- a/src/containers.hh
+++ b/src/containers.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_CONTAINERS_HH_
#define TIBIA_CONTAINERS_HH_ 1
-#include "main.hh"
+#include "common.hh"
// NOTE(fusion): What the actual fuck. This is an ever growing dynamic array
// with each access through `operator()` growing it to make sure the requested
diff --git a/src/creature.hh b/src/creature.hh
index 2b19836..a147091 100644
--- a/src/creature.hh
+++ b/src/creature.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_CREATURE_HH_
#define TIBIA_CREATURE_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "connection.hh"
#include "containers.hh"
#include "skill.hh"
diff --git a/src/enums.hh b/src/enums.hh
index bc3dab0..d4ba042 100644
--- a/src/enums.hh
+++ b/src/enums.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_ENUMS_HH_
#define TIBIA_ENUMS_HH_ 1
-#include "main.hh"
+#include "common.hh"
// TODO(fusion): Probably cleanup these names? Prefix values? Its crazy that
// there are no collision problems (possibly yet).
diff --git a/src/main.cc b/src/main.cc
index a930aef..1efdf4a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-#include "main.hh"
+#include "common.hh"
#include "config.hh"
#include <signal.h>
diff --git a/src/map.hh b/src/map.hh
index 7bef02b..298d190 100644
--- a/src/map.hh
+++ b/src/map.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_MAP_HH_
#define TIBIA_MAP_HH_ 1
-#include "main.hh"
+#include "common.hh"
// TODO(fusion): I'm not sure whether to put these.
diff --git a/src/monster.hh b/src/monster.hh
index 7e18f48..b9bd27e 100644
--- a/src/monster.hh
+++ b/src/monster.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_MONSTER_HH_
#define TIBIA_MONSTER_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "creature.hh"
#include "containers.hh"
#include "enums.hh"
diff --git a/src/player.hh b/src/player.hh
index 0a3f583..f0c4a82 100644
--- a/src/player.hh
+++ b/src/player.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_PLAYER_HH_
#define TIBIA_PLAYER_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "creature.hh"
#include "containers.hh"
diff --git a/src/script.hh b/src/script.hh
index 5b63f56..0a83196 100644
--- a/src/script.hh
+++ b/src/script.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_SCRIPT_HH_
#define TIBIA_SCRIPT_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include "enums.hh"
struct TReadScriptFile {
diff --git a/src/shm.cc b/src/shm.cc
index 5cd4a52..c26638f 100644
--- a/src/shm.cc
+++ b/src/shm.cc
@@ -1,4 +1,4 @@
-#include "main.hh"
+#include "common.hh"
// NOTE(fusion): This looks like an interface to external tools. Looking at the
// `bin` directory this program was in, there are other programs that probably
diff --git a/src/skill.hh b/src/skill.hh
index c3beff6..353eb7d 100644
--- a/src/skill.hh
+++ b/src/skill.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_SKILL_HH_
#define TIBIA_SKILL_HH_ 1
-#include "main.hh"
+#include "common.hh"
struct TCreature;
diff --git a/src/thread.hh b/src/thread.hh
index a3b0d04..825b330 100644
--- a/src/thread.hh
+++ b/src/thread.hh
@@ -1,7 +1,7 @@
#ifndef TIBIA_THREAD_HH_
#define TIBIA_THREAD_HH_ 1
-#include "main.hh"
+#include "common.hh"
#include <pthread.h>
typedef pthread_t ThreadHandle;
diff --git a/src/time.cc b/src/time.cc
index 89325ba..4e743ed 100644
--- a/src/time.cc
+++ b/src/time.cc
@@ -1,4 +1,4 @@
-#include "main.hh"
+#include "common.hh"
// IMPORTANT(fusion): `RoundNr` is just the number of seconds since startup which
// is why `GetRoundAtTime` and `GetRoundForNextMinute` straight up uses it as
diff --git a/src/util.cc b/src/util.cc
index 4f74c80..74c1bf5 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1,4 +1,4 @@
-#include "main.hh"
+#include "common.hh"
static void (*ErrorFunction)(const char *Text) = NULL;
static void (*PrintFunction)(int Level, const char *Text) = NULL;
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-15 00:07:19 +0000