summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:41 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:41 +0100
commit94e6b524afbf2ca7b9250a98ae82a6099524245d (patch)
tree5d496c1ecd5dcfd0ffe613c9f7350dde9d801b4d /src
parentec21839c93c67b5450a0df8891372c762e3d8194 (diff)
Move script.cc declarations to separate header file
Diffstat (limited to 'src')
-rw-r--r--src/externs.h3
-rw-r--r--src/init2.cc1
-rw-r--r--src/main.c1
-rw-r--r--src/script.cc6
-rw-r--r--src/script.h12
5 files changed, 16 insertions, 7 deletions
diff --git a/src/externs.h b/src/externs.h
index 2c289430..d17890ca 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -488,8 +488,5 @@ extern bool_ private_check_user_directory(cptr dirpath);
extern void user_name(char *buf, int id);
#endif
-/* script.c */
-extern void init_lua_init(void);
-
/* modules.cc */
extern cptr force_module;
diff --git a/src/init2.cc b/src/init2.cc
index 40c223ac..6b6fc343 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -14,6 +14,7 @@
#include "modules.hpp"
#include "quark.h"
#include "randart.hpp"
+#include "script.h"
#include "spells3.hpp"
#include "squeltch.hpp"
#include "tome/make_array.hpp"
diff --git a/src/main.c b/src/main.c
index e6a0514f..17354fb2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,6 +12,7 @@
#include "dungeon.h"
#include "files.h"
#include "init2.h"
+#include "script.h"
#include "util.h"
diff --git a/src/script.cc b/src/script.cc
index 4c964c0c..3f7e63c7 100644
--- a/src/script.cc
+++ b/src/script.cc
@@ -1,7 +1,3 @@
-/* File: script.c */
-
-/* Purpose: scripting in lua */
-
/*
* Copyright (c) 2001 Dark God
*
@@ -10,6 +6,8 @@
* included in all such copies.
*/
+#include "script.h"
+
#include "angband.h"
#include "init2.hpp"
#include "q_library.h"
diff --git a/src/script.h b/src/script.h
new file mode 100644
index 00000000..3d1a0840
--- /dev/null
+++ b/src/script.h
@@ -0,0 +1,12 @@
+#pragma once
+
+// C linkage required for these functions since main-* code uses them.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void init_lua_init(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif