MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "announcements" global into d_init where it belongs

develop
Quietust 2017-12-03 20:05:08 -06:00
parent ec06ed09c9
commit c72ae8d8a7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/modules/Gui.cpp
Unescape Escape View File

@ -48,12 +48,12 @@ using namespace DFHack;
#include "DataDefs.h"
#include "df/announcement_flags.h"
#include "df/announcements.h"
#include "df/assign_trade_status.h"
#include "df/building_civzonest.h"
#include "df/building_furnacest.h"
#include "df/building_trapst.h"
#include "df/building_workshopst.h"
#include "df/d_init.h"
#include "df/game_mode.h"
#include "df/general_ref.h"
#include "df/global_objects.h"
@ -1428,13 +1428,13 @@ void Gui::showAutoAnnouncement(
df::announcement_type type, df::coord pos, std::string message, int color, bool bright,
df::unit *unit1, df::unit *unit2
) {
using df::global::announcements;
using df::global::d_init;
df::announcement_flags flags;
flags.bits.D_DISPLAY = flags.bits.A_DISPLAY = true;
if (is_valid_enum_item(type) && announcements)
flags = announcements->flags[type];
if (is_valid_enum_item(type) && d_init)
flags = d_init->announcements.flags[type];
int id = makeAnnouncement(type, flags, pos, message, color, bright);

2
library/xml

@ -1 +1 @@
Subproject commit 3abfb36a129add730599cf27684b2c65ff7ba6bb
Subproject commit 9ffd5971bd4709abec914715cee1a23963b7ee91