DRAGONS: Replaced max scale with define

This commit is contained in:
Eric Fry 2020-01-09 10:53:10 +11:00 committed by Eugene Sandulenko
parent 5e2a7a6882
commit 8c9a0cf1bb
15 changed files with 102 additions and 50 deletions

View file

@ -34,6 +34,7 @@
#include "dragons/actor.h"
#include "dragons/sound.h"
#include "dragons/talk.h"
#include "dragons/screen.h"
#include "scriptopcodes.h"
@ -933,7 +934,7 @@ void ScriptOpcodes::opCode_UnkA_setsProperty(ScriptOpCall &scriptOpCall) {
if (field2 == 0x1a && ini->field_1a_flags_maybe & 1 && ini->sceneId == _vm->getCurrentSceneId()) {
if (s1 & 2) {
ini->actor->flags |= Dragons::ACTOR_FLAG_80;
ini->actor->scale = 0x100;
ini->actor->scale = DRAGONS_ENGINE_SPRITE_100_PERCENT_SCALE;
} else {
ini->actor->flags &= ~Dragons::ACTOR_FLAG_80;
}
@ -1232,7 +1233,7 @@ void ScriptOpcodes::opCode_Unk7(ScriptOpCall &scriptOpCall) {
Actor *actor = _vm->_inventory->getInventoryItemActor(_vm->_cursor->iniItemInHand);
actor->flags = 0;
actor->priorityLayer = 0;
actor->scale = 0x100;
actor->scale = DRAGONS_ENGINE_SPRITE_100_PERCENT_SCALE;
actor->updateSequence((_vm->getINI(_vm->_cursor->iniItemInHand - 1)->field_8 * 2 + 10) & 0xfffe);
actor->setFlag(ACTOR_FLAG_40);
actor->setFlag(ACTOR_FLAG_80);