From 85f1b7d97f1612c70edd774bfd9cf8b75c0b6c39 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:40 +0100 Subject: Split monster1.cc declarations to separate header --- src/cmd3.cc | 1 + src/externs.h | 5 ----- src/monster1.cc | 5 +---- src/monster1.hpp | 5 +++++ src/object1.cc | 1 + src/xtra1.cc | 1 + src/xtra2.cc | 1 + 7 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 src/monster1.hpp diff --git a/src/cmd3.cc b/src/cmd3.cc index c6ffdfda..f4bca801 100644 --- a/src/cmd3.cc +++ b/src/cmd3.cc @@ -11,6 +11,7 @@ #include "cave.hpp" #include "gods.hpp" #include "hooks.h" +#include "monster1.hpp" #include "quark.h" #include "squeltch.hpp" #include "store.hpp" diff --git a/src/externs.h b/src/externs.h index fc336de6..4b7e09f0 100644 --- a/src/externs.h +++ b/src/externs.h @@ -581,11 +581,6 @@ extern void process_monsters(void); extern void curse_equipment(int chance, int heavy_chance); extern void curse_equipment_dg(int chance, int heavy_chance); -/* monster1.c */ -extern void screen_roff(int r_idx, int ego, int remember); -extern void display_roff(int r_idx, int ego); -extern void monster_description_out(int r_idx, int ego); - /* monster2.c */ extern s32b monster_exp(s16b level); extern void monster_set_level(int m_idx, int level); diff --git a/src/monster1.cc b/src/monster1.cc index a0a75a67..644b2424 100644 --- a/src/monster1.cc +++ b/src/monster1.cc @@ -1,7 +1,3 @@ -/* File: monster1.c */ - -/* Purpose: describe monsters (using monster memory) */ - /* * Copyright (c) 1989 James E. Wilson, Christopher J. Stuart * @@ -10,6 +6,7 @@ * included in all such copies. */ +#include "monster1.hpp" #include "angband.h" #include "util.hpp" diff --git a/src/monster1.hpp b/src/monster1.hpp new file mode 100644 index 00000000..1d71fef1 --- /dev/null +++ b/src/monster1.hpp @@ -0,0 +1,5 @@ +#pragma once + +extern void screen_roff(int r_idx, int ego, int remember); +extern void display_roff(int r_idx, int ego); +extern void monster_description_out(int r_idx, int ego); diff --git a/src/object1.cc b/src/object1.cc index 2f4ddf79..8bbdac82 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -13,6 +13,7 @@ #include "hooks.h" #include "lua_bind.hpp" #include "mimic.hpp" +#include "monster1.hpp" #include "quark.h" #include "skills.hpp" #include "spell_type.hpp" diff --git a/src/xtra1.cc b/src/xtra1.cc index 8f0b5a36..450b78b2 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -16,6 +16,7 @@ #include "hooks.h" #include "messages.h" #include "mimic.hpp" +#include "monster1.hpp" #include "skills.hpp" #include "spells3.hpp" #include "spells6.hpp" diff --git a/src/xtra2.cc b/src/xtra2.cc index cc95b6ca..8d2e5581 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -14,6 +14,7 @@ #include "gods.hpp" #include "hooks.h" #include "mimic.hpp" +#include "monster1.hpp" #include "notes.hpp" #include "quark.h" #include "randart.hpp" -- cgit v1.2.3