placard workaround
svn-id: r18402
This commit is contained in:
parent
7539169c1d
commit
b16a3634bf
3 changed files with 13 additions and 1 deletions
|
@ -111,7 +111,7 @@ int Render::drawScene() {
|
|||
// Get mouse coordinates
|
||||
mouse_pt = _vm->mousePos();
|
||||
|
||||
if (!(_flags & RF_PLACARD)) {
|
||||
if (/*_vm->_interface->getMode() != kPanelPlacard*/!(_flags & RF_PLACARD)) {
|
||||
// Display scene background
|
||||
_vm->_scene->draw();
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "saga/interface.h"
|
||||
#include "saga/scene.h"
|
||||
#include "saga/render.h"
|
||||
#include "saga/events.h"
|
||||
|
||||
#define CURRENT_SAGA_VER 2
|
||||
|
||||
|
@ -225,6 +226,7 @@ void SagaEngine::load(const char *fileName) {
|
|||
|
||||
_scene->clearSceneQueue();
|
||||
_scene->changeScene(sceneNumber, ACTOR_NO_ENTRANCE, kTransitionNoFade);
|
||||
_events->handleEvents(0); //dissolve back grounds
|
||||
|
||||
if (insetSceneNumber != sceneNumber) {
|
||||
_render->drawScene();
|
||||
|
|
|
@ -463,6 +463,16 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
|
|||
_sceneLoaded = true;
|
||||
|
||||
q_event = NULL;
|
||||
|
||||
//fix placard bug
|
||||
//i guess we should remove RF_PLACARD flag - and use _interface->getMode()
|
||||
event.type = ONESHOT_EVENT;
|
||||
event.code = GRAPHICS_EVENT;
|
||||
event.op = EVENT_CLEARFLAG;
|
||||
event.param = RF_PLACARD;
|
||||
|
||||
q_event = _vm->_events->chain(q_event, &event);
|
||||
|
||||
if (loadSceneParams->transitionType == kTransitionFade ||
|
||||
loadSceneParams->transitionType == kTransitionFadeNoInterface) {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue