diff --git a/engines/saga2/objproto.cpp b/engines/saga2/objproto.cpp index 23913ed7555..4d32af709c6 100644 --- a/engines/saga2/objproto.cpp +++ b/engines/saga2/objproto.cpp @@ -1295,7 +1295,7 @@ bool PhysicalContainerProto::canToggleLock( // Unlock or lock the physical container bool PhysicalContainerProto::acceptLockToggleAction( ObjectID dObj, - ObjectID enactor) { + ObjectID enactor, uint8) { GameObject *dObjPtr = GameObject::objectAddress(dObj); // Toggle locked bit diff --git a/engines/saga2/objproto.h b/engines/saga2/objproto.h index 2f54f2849c8..d8b99a7b6fc 100644 --- a/engines/saga2/objproto.h +++ b/engines/saga2/objproto.h @@ -490,10 +490,7 @@ public: ObjectID dObj, ObjectID enactor, uint8 keyCode); - virtual bool acceptLockToggleAction( - ObjectID dObj, - ObjectID enactor, - uint8 keyCode); + virtual bool acceptLockToggleAction(ObjectID dObj, ObjectID enactor, uint8 keyCode); // Mix this object with another. bool acceptMix(ObjectID dObj, ObjectID enactor, ObjectID mixObj); @@ -717,7 +714,7 @@ public: ObjectID dObj, ObjectID enactor, uint8 keyCode); - virtual bool acceptLockToggleAction(ObjectID dObj, ObjectID enactor); + virtual bool acceptLockToggleAction(ObjectID dObj, ObjectID enactor, uint8 keyCode); // Insert another object into this object bool acceptInsertionAction( diff --git a/engines/saga2/weapons.cpp b/engines/saga2/weapons.cpp index 2fc934b14c8..e1cf42dcf49 100644 --- a/engines/saga2/weapons.cpp +++ b/engines/saga2/weapons.cpp @@ -208,18 +208,18 @@ void WeaponStuff::addEffect(WeaponEffect *we) { void WeaponStuff::addEffect(Common::SeekableReadStream *stream) { WeaponEffect *we; - int16 item = stream->readSint16LE(); // spell ID + /*int16 item = */stream->readSint16LE(); // spell ID int16 effectGroup = stream->readSint16LE(); // effect group if (effectGroup == effectStrike) { effectDamageTypes effectType = (effectDamageTypes)stream->readSint16LE(); // effect ID - int16 targeting = stream->readSint16LE(); // targeting + /*int16 targeting = */stream->readSint16LE(); // targeting int16 baseDice = stream->readSint16LE(); // base dice int16 skillDice = stream->readSint16LE(); // skill dice int16 baseDamage = stream->readSint16LE(); // attrib change int16 skillDamage = stream->readSint16LE(); // attrib change - int16 reserved0 = stream->readSint16LE(); // min enchant - int16 reserved1 = stream->readSint16LE(); // min enchant + /*int16 reserved0 = */stream->readSint16LE(); // min enchant + /* int16 reserved1 = */stream->readSint16LE(); // min enchant int16 diceSides = stream->readSint16LE(); if (diceSides == 0)