libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: _currentLights is v0 only

Browse Source
This commit is contained in:
Tobias Gunkel 2012-02-04 15:40:36 +01:00
parent e14e4ab3b0
commit daff6f36ae
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/scumm/gfx.cpp
View File

@ -26,6 +26,7 @@
#include "scumm/he/intern_he.h"
#endif
#include "scumm/resource.h"
#include "scumm/scumm_v0.h"
#include "scumm/scumm_v5.h"
#include "scumm/scumm_v6.h"
#include "scumm/usage_bits.h"
@ -1487,15 +1488,17 @@ void ScummEngine_v5::drawFlashlight() {
_flashlight.isDrawn = true;
}
// V0 Maniac doesn't have a ScummVar for VAR_CURRENT_LIGHTS, and just uses
// an internal variable. Emulate this to prevent overwriting script vars...
// And V6 games do not use the "lights" at all. There, the whole screen is
// always visible, and actors are always colored, so we fake the correct
// light value for it.
int ScummEngine_v0::getCurrentLights() const {
// V0 Maniac doesn't have a ScummVar for VAR_CURRENT_LIGHTS, and just uses
// an internal variable. Emulate this to prevent overwriting script vars...
// And V6 games do not use the "lights" at all. There, the whole screen is
// always visible, and actors are always colored, so we fake the correct
// light value for it.
return _currentLights;
}
int ScummEngine::getCurrentLights() const {
if (_game.id == GID_MANIAC && _game.version == 0)
return _currentLights;
else if (_game.version >= 6)
if (_game.version >= 6)
return LIGHTMODE_room_lights_on | LIGHTMODE_actor_use_colors;
else
return VAR(VAR_CURRENT_LIGHTS);

2
engines/scumm/scumm.cpp
View File

@ -263,7 +263,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_bytesPerPixel = 1;
_doEffect = false;
_snapScroll = false;
_currentLights = 0;
_shakeEnabled = false;
_shakeFrame = 0;
_screenStartStrip = 0;
@ -713,6 +712,7 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
: ScummEngine_v2(syst, dr) {
_currentMode = 0;
_currentLights = 0;
_activeVerb = kVerbNone;
_activeObject = 0;

3
engines/scumm/scumm.h
View File

@ -942,8 +942,7 @@ protected:
public:
bool isLightOn() const;
byte _currentLights;
int getCurrentLights() const;
virtual int getCurrentLights() const;
protected:
void initScreens(int b, int h);

3
engines/scumm/scumm_v0.h
View File

@ -47,6 +47,7 @@ protected:
protected:
byte _currentMode;
byte _currentLights;
int _activeVerb; // selected verb
int _activeObject; // 1st selected object (see OBJECT_V0())
@ -115,6 +116,8 @@ protected:
bool ifEqualActiveObject2Common(bool checkType);
virtual int getCurrentLights() const;
/* Version C64 script opcodes */
void o_stopCurrentScript();
void o_walkActorToObject();