Merge branch 'savedgame'

Gaming / Game Engines / OpenMW - Marc Zinnschlag [zpages.de] - 1 February 2014 11:16 UTC

1b5301e Merge branch 'savedgame'

apps/esmtool/esmtool.cpp | 7 +-
apps/opencs/model/doc/savingstages.cpp | 19 +-
apps/opencs/model/doc/savingstages.hpp | 4 +-
apps/opencs/model/world/ref.cpp | 3 +-
apps/opencs/model/world/refcollection.cpp | 3 +-
apps/opencs/model/world/refiddata.hpp | 9 +-
apps/openmw/CMakeLists.txt | 6 +-
apps/openmw/engine.cpp | 98 +++---
apps/openmw/engine.hpp | 5 +-
apps/openmw/main.cpp | 8 +-
apps/openmw/mwbase/environment.cpp | 19 +-
apps/openmw/mwbase/environment.hpp | 11 +-
apps/openmw/mwbase/journal.hpp | 14 +
apps/openmw/mwbase/mechanicsmanager.hpp | 36 +-
apps/openmw/mwbase/scriptmanager.hpp | 2 -
apps/openmw/mwbase/soundmanager.hpp | 2 +
apps/openmw/mwbase/statemanager.hpp | 81 +++++
apps/openmw/mwbase/windowmanager.hpp | 8 +
apps/openmw/mwbase/world.hpp | 53 ++-
apps/openmw/mwclass/container.cpp | 23 ++
apps/openmw/mwclass/container.hpp | 8 +
apps/openmw/mwclass/creature.cpp | 23 ++
apps/openmw/mwclass/creature.hpp | 10 +-
apps/openmw/mwclass/light.cpp | 21 ++
apps/openmw/mwclass/light.hpp | 8 +
apps/openmw/mwclass/npc.cpp | 27 +-
apps/openmw/mwclass/npc.hpp | 10 +-
apps/openmw/mwdialogue/filter.cpp | 2 +-
apps/openmw/mwdialogue/journalentry.cpp | 71 +++-
apps/openmw/mwdialogue/journalentry.hpp | 36 +-
apps/openmw/mwdialogue/journalimp.cpp | 153 ++++++++-
apps/openmw/mwdialogue/journalimp.hpp | 12 +
apps/openmw/mwdialogue/quest.cpp | 19 +-
apps/openmw/mwdialogue/quest.hpp | 15 +-
apps/openmw/mwdialogue/topic.cpp | 25 +-
apps/openmw/mwdialogue/topic.hpp | 18 +-
apps/openmw/mwgui/journalbooks.cpp | 28 --
apps/openmw/mwgui/journalviewmodel.cpp | 63 +---
apps/openmw/mwgui/mainmenu.cpp | 163 +++++----
apps/openmw/mwgui/mainmenu.hpp | 28 +-
apps/openmw/mwgui/mapwindow.cpp | 36 +-
apps/openmw/mwgui/mapwindow.hpp | 12 +
apps/openmw/mwgui/referenceinterface.cpp | 2 +-
apps/openmw/mwgui/savegamedialog.cpp | 184 +++++++++-
apps/openmw/mwgui/savegamedialog.hpp | 12 +
apps/openmw/mwgui/waitdialog.cpp | 44 +--
apps/openmw/mwgui/windowmanagerimp.cpp | 50 +--
apps/openmw/mwgui/windowmanagerimp.hpp | 6 +
apps/openmw/mwinput/inputmanagerimp.cpp | 11 +-
apps/openmw/mwmechanics/actors.cpp | 80 ++---
apps/openmw/mwmechanics/character.cpp | 18 +-
apps/openmw/mwmechanics/character.hpp | 2 +-
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 8 +
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 18 +-
apps/openmw/mwmechanics/objects.cpp | 2 +-
apps/openmw/mwrender/actors.cpp | 2 +-
apps/openmw/mwrender/debugging.cpp | 8 +-
apps/openmw/mwrender/globalmap.cpp | 124 ++++++-
apps/openmw/mwrender/globalmap.hpp | 13 +-
apps/openmw/mwrender/localmap.cpp | 6 +-
apps/openmw/mwrender/objects.cpp | 6 +-
apps/openmw/mwrender/renderingmanager.cpp | 60 +++-
apps/openmw/mwrender/renderingmanager.hpp | 3 +
apps/openmw/mwscript/cellextensions.cpp | 6 +-
apps/openmw/mwscript/globalscripts.cpp | 106 +++++-
apps/openmw/mwscript/globalscripts.hpp | 26 +-
apps/openmw/mwscript/interpretercontext.cpp | 51 ++-
apps/openmw/mwscript/locals.cpp | 66 ++++
apps/openmw/mwscript/locals.hpp | 4 +
apps/openmw/mwscript/miscextensions.cpp | 38 ++-
apps/openmw/mwscript/scriptmanagerimp.cpp | 5 -
apps/openmw/mwscript/scriptmanagerimp.hpp | 2 -
apps/openmw/mwsound/soundmanagerimp.cpp | 23 +-
apps/openmw/mwsound/soundmanagerimp.hpp | 2 +
apps/openmw/mwstate/character.cpp | 153 +++++++++
apps/openmw/mwstate/character.hpp | 63 ++++
apps/openmw/mwstate/charactermanager.cpp | 85 +++++
apps/openmw/mwstate/charactermanager.hpp | 46 +++
apps/openmw/mwstate/statemanagerimp.cpp | 343 +++++++++++++++++++
apps/openmw/mwstate/statemanagerimp.hpp | 70 ++++
apps/openmw/mwworld/cells.cpp | 151 +++++++--
apps/openmw/mwworld/cells.hpp | 17 +-
apps/openmw/mwworld/cellstore.cpp | 405 +++++++++++++++++------
apps/openmw/mwworld/cellstore.hpp | 19 +-
apps/openmw/mwworld/class.cpp | 4 +
apps/openmw/mwworld/class.hpp | 13 +
apps/openmw/mwworld/containerstore.cpp | 113 +++++++
apps/openmw/mwworld/containerstore.hpp | 29 +-
apps/openmw/mwworld/esmstore.cpp | 68 +++-
apps/openmw/mwworld/esmstore.hpp | 30 +-
apps/openmw/mwworld/globals.cpp | 140 +++-----
apps/openmw/mwworld/globals.hpp | 65 ++--
apps/openmw/mwworld/inventorystore.cpp | 22 ++
apps/openmw/mwworld/inventorystore.hpp | 9 +
apps/openmw/mwworld/livecellref.cpp | 29 ++
apps/openmw/mwworld/livecellref.hpp | 70 +++-
apps/openmw/mwworld/localscripts.cpp | 14 +-
apps/openmw/mwworld/manualref.hpp | 7 +-
apps/openmw/mwworld/player.cpp | 108 +++++-
apps/openmw/mwworld/player.hpp | 8 +
apps/openmw/mwworld/ptr.cpp | 8 +
apps/openmw/mwworld/ptr.hpp | 7 +-
apps/openmw/mwworld/refdata.cpp | 36 +-
apps/openmw/mwworld/refdata.hpp | 11 +
apps/openmw/mwworld/scene.cpp | 10 +-
apps/openmw/mwworld/scene.hpp | 4 +-
apps/openmw/mwworld/store.cpp | 11 +-
apps/openmw/mwworld/store.hpp | 48 +++
apps/openmw/mwworld/worldimp.cpp | 356 ++++++++++++--------
apps/openmw/mwworld/worldimp.hpp | 61 +++-
components/CMakeLists.txt | 1 +
components/compiler/locals.cpp | 42 +--
components/compiler/locals.hpp | 20 +-
components/esm/cellid.cpp | 26 ++
components/esm/cellid.hpp | 28 ++
components/esm/cellref.cpp | 117 ++++++-
components/esm/cellref.hpp | 20 +-
components/esm/cellstate.cpp | 17 +
components/esm/cellstate.hpp | 25 ++
components/esm/containerstate.cpp | 16 +
components/esm/containerstate.hpp | 20 ++
components/esm/creaturestate.cpp | 16 +
components/esm/creaturestate.hpp | 20 ++
components/esm/defs.hpp | 9 +
components/esm/esmreader.cpp | 13 +-
components/esm/esmreader.hpp | 1 +
components/esm/esmwriter.cpp | 32 +-
components/esm/esmwriter.hpp | 5 +-
components/esm/globalmap.cpp | 26 ++
components/esm/globalmap.hpp | 34 ++
components/esm/globalscript.cpp | 25 ++
components/esm/globalscript.hpp | 24 ++
components/esm/inventorystate.cpp | 60 ++++
components/esm/inventorystate.hpp | 28 ++
components/esm/journalentry.cpp | 35 ++
components/esm/journalentry.hpp | 35 ++
components/esm/lightstate.cpp | 21 ++
components/esm/lightstate.hpp | 19 ++
components/esm/loadcell.cpp | 188 ++++-------
components/esm/loadcell.hpp | 13 +-
components/esm/loadland.cpp | 2 +-
components/esm/loadscpt.cpp | 10 +-
components/esm/loadtes3.cpp | 22 +-
components/esm/locals.cpp | 28 ++
components/esm/locals.hpp | 27 ++
components/esm/npcstate.cpp | 16 +
components/esm/npcstate.hpp | 20 ++
components/esm/objectstate.cpp | 51 +++
components/esm/objectstate.hpp | 36 ++
components/esm/player.cpp | 48 +++
components/esm/player.hpp | 33 ++
components/esm/queststate.cpp | 19 ++
components/esm/queststate.hpp | 24 ++
components/esm/savedgame.cpp | 46 +++
components/esm/savedgame.hpp | 41 +++
components/esm/variant.hpp | 2 +-
files/mygui/openmw_savegame_dialog.layout | 9 -
files/settings-default.cfg | 7 +-
158 files changed, 4960 insertions(+), 1237 deletions(-)

Upstream: github.com

  • Share