Merge branch 'master' of github.com:diasurgical/devilution

This commit is contained in:
Anders Jenbo 2020-04-06 11:46:08 +02:00
commit 3c5982083f
48 changed files with 589 additions and 550 deletions

View file

@ -4,6 +4,7 @@ DEVILUTION_BEGIN_NAMESPACE
/* todo: move text out of struct */
/** Contains the data related to each speech ID. */
const TextDataStruct alltext[] = {
#ifdef SPAWN
{ "Nice try... ", 0, 0, TSFX_TAVERN36 },