From 1232678cde7c0231d9143e25b2e54e4a29a4e930 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 31 May 2014 18:08:53 +0900 Subject: [PATCH] Fix dungeon data and serialization. --- Deeangband/Dungeon.h | 1 + Deeangband/GameEngine.cpp | 1 + lib-Vanilla/Camp.xml | 2 +- lib-Vanilla/Dungeon.xml | 4 ++++ lib-Vanilla/Effect.xml | 2 +- lib-Vanilla/FixedArtifact.xml | 2 +- lib-Vanilla/ItemBase.xml | 2 +- lib-Vanilla/ItemEgo.xml | 2 +- lib-Vanilla/Karma.xml | 2 +- lib-Vanilla/Specie.xml | 4 ++-- 10 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Deeangband/Dungeon.h b/Deeangband/Dungeon.h index 1593b37..d0d8134 100644 --- a/Deeangband/Dungeon.h +++ b/Deeangband/Dungeon.h @@ -89,6 +89,7 @@ namespace Deeangband archive & boost::serialization::make_nvp("FloorFeature", floorFeature); archive & boost::serialization::make_nvp("ControllCamp", controlCamp); archive & boost::serialization::make_nvp("GuardianSpecies", guardianSpecies); + archive & boost::serialization::make_nvp("BaseSize", baseSize); } } diff --git a/Deeangband/GameEngine.cpp b/Deeangband/GameEngine.cpp index 064697b..1bbd82a 100644 --- a/Deeangband/GameEngine.cpp +++ b/Deeangband/GameEngine.cpp @@ -18,6 +18,7 @@ namespace Deeangband { gameWorld = new GameWorld(); gameSurface = new GameSurfaceSDL(gameWorld); + gameSurface->SetFloor(gameWorld->GetFloor(0)); gameSurface->SetSideStatusCreature(gameWorld->GetCreature(0)); diff --git a/lib-Vanilla/Camp.xml b/lib-Vanilla/Camp.xml index cfbd339..de6dc4f 100644 --- a/lib-Vanilla/Camp.xml +++ b/lib-Vanilla/Camp.xml @@ -7,7 +7,7 @@ XXX_UNKNOWN - + –¢’è‹` diff --git a/lib-Vanilla/Dungeon.xml b/lib-Vanilla/Dungeon.xml index dd6387d..6a22c42 100644 --- a/lib-Vanilla/Dungeon.xml +++ b/lib-Vanilla/Dungeon.xml @@ -16,6 +16,10 @@ VANILLA_PERMANENT_FLOOR + + 50 + 50 + diff --git a/lib-Vanilla/Effect.xml b/lib-Vanilla/Effect.xml index 432bbe9..de21a12 100644 --- a/lib-Vanilla/Effect.xml +++ b/lib-Vanilla/Effect.xml @@ -7,7 +7,7 @@ XXX_UNKNOWN - + diff --git a/lib-Vanilla/FixedArtifact.xml b/lib-Vanilla/FixedArtifact.xml index e20a9b4..f71c911 100644 --- a/lib-Vanilla/FixedArtifact.xml +++ b/lib-Vanilla/FixedArtifact.xml @@ -14,7 +14,7 @@ 0 0 - + 0 0 0 diff --git a/lib-Vanilla/ItemBase.xml b/lib-Vanilla/ItemBase.xml index 09bc02f..0223959 100644 --- a/lib-Vanilla/ItemBase.xml +++ b/lib-Vanilla/ItemBase.xml @@ -14,7 +14,7 @@ 0 0 - + 0 0 0 diff --git a/lib-Vanilla/ItemEgo.xml b/lib-Vanilla/ItemEgo.xml index 92b6ab0..4b02d6b 100644 --- a/lib-Vanilla/ItemEgo.xml +++ b/lib-Vanilla/ItemEgo.xml @@ -14,7 +14,7 @@ 0 0 - + 0 0 0 diff --git a/lib-Vanilla/Karma.xml b/lib-Vanilla/Karma.xml index 4496d79..2ffe799 100644 --- a/lib-Vanilla/Karma.xml +++ b/lib-Vanilla/Karma.xml @@ -7,7 +7,7 @@ XXX_UNKNOWN - + 5 diff --git a/lib-Vanilla/Specie.xml b/lib-Vanilla/Specie.xml index 79f6a41..3a6cf16 100644 --- a/lib-Vanilla/Specie.xml +++ b/lib-Vanilla/Specie.xml @@ -7,7 +7,7 @@ XXX_UNKNOWN - + 500 150 @@ -15,7 +15,7 @@ 20000 -1 0 - + 0 0 0 -- 2.11.0