Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotel bugfix #35487

Merged
merged 1 commit into from
Nov 12, 2019
Merged

hotel bugfix #35487

merged 1 commit into from
Nov 12, 2019

Conversation

curstwist
Copy link
Contributor

@curstwist curstwist commented Nov 12, 2019

Summary

SUMMARY: Bugfixes "Fixes hotel load error."

Purpose of change

Reported in the comments of "add hotel roof, extra floors #35474", hotels were giving an OMT error. I realized I made a mistake by renaming the original OMT.

Describe the solution

I changed the name back, which should resolve the error.

Testing

Additional context

from the comment:

On loading a save I'm getting:

DEBUG    : JSON contains circular dependency.  Discarded 1 objects:
{
   "type": "overmap_terrain",
   "id": "hotel_tower_1_5",
   "copy-from": "hotel_tower_1_5",
   "name": "hotel entrance",
   "sym": "H",
   "color": "i_light_green"
 },

FUNCTION : void DynamicDataLoader::load_deferred(DynamicDataLoader::deferred_json&)
FILE     : src/init.cpp
LINE     : 133

then I got this once:

DEBUG    : Loaded bad ter!  ter hotel_tower_1_5_east

FUNCTION : void overmap::unserialize(std::istream&)
FILE     : src/savegame.cpp
LINE     : 925

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Nov 12, 2019
@ZhilkinSerg ZhilkinSerg merged commit 49a0427 into CleverRaven:master Nov 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants