MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Anders Jenbo 2020-10-25 17:37:40 +01:00
commit 72e2637061
66 changed files with 424 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/objects.cpp
View file

@ -26,7 +26,7 @@ int bxadd[8] = { -1, 0, 1, -1, 1, -1, 0, 1 };
/** Specifies the Y-coordinate delta between barrels. */
int byadd[8] = { -1, -1, -1, 0, 0, 1, 1, 1 };
/** Maps from shrine_id to shrine name. */
char *shrinestrs[NUM_SHRINETYPE] = {
const char *const shrinestrs[NUM_SHRINETYPE] = {
"Mysterious",
"Hidden",
"Gloomy",
@ -188,7 +188,7 @@ BYTE shrineavail[NUM_SHRINETYPE] = {
#endif
};
/** Maps from book_id to book name. */
char *StoryBookName[] = {
const char *const StoryBookName[] = {
"The Great Conflict",
"The Wages of Sin are War",
"The Tale of the Horadrim",