diff options
Diffstat (limited to 'engines/zvision/scripting/controls')
17 files changed, 188 insertions, 191 deletions
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp index 185bea09d2..9bb03cba51 100644 --- a/engines/zvision/scripting/controls/fist_control.cpp +++ b/engines/zvision/scripting/controls/fist_control.cpp @@ -80,7 +80,7 @@ FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream } else if (param.matchString("animation_id", true)) { _animationId = atoi(values.c_str()); } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } line = stream.readLine(); @@ -152,13 +152,13 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED) return false; - int n_fist = mouseIn(screenSpacePos, backgroundImageSpacePos); + int fistNumber = mouseIn(screenSpacePos, backgroundImageSpacePos); - if (n_fist >= 0) { + if (fistNumber >= 0) { setVenus(); uint32 oldStatus = _fiststatus; - _fiststatus ^= (1 << n_fist); + _fiststatus ^= (1 << fistNumber); for (int i = 0; i < _numEntries; i++) if (_entries[i]._bitsStrt == oldStatus && _entries[i]._bitsEnd == _fiststatus) { @@ -233,12 +233,12 @@ void FistControl::readDescFile(const Common::String &fileName) { (_fistsDwn[fist])[box] = Common::Rect(x1, y1, x2, y2); } else { int entry, start, end, sound; - char bits_start[33]; - char bits_end[33]; + char bitsStart[33]; + char bitsEnd[33]; entry = atoi(param.c_str()); - if (sscanf(values.c_str(), "%s %s %d %d (%d)", bits_start, bits_end, &start, &end, &sound) == 5) { - _entries[entry]._bitsStrt = readBits(bits_start); - _entries[entry]._bitsEnd = readBits(bits_end); + if (sscanf(values.c_str(), "%s %s %d %d (%d)", bitsStart, bitsEnd, &start, &end, &sound) == 5) { + _entries[entry]._bitsStrt = readBits(bitsStart); + _entries[entry]._bitsEnd = readBits(bitsEnd); _entries[entry]._anmStrt = start; _entries[entry]._anmEnd = end; _entries[entry]._sound = sound; @@ -293,24 +293,24 @@ int FistControl::mouseIn(const Common::Point &screenSpacePos, const Common::Poin return -1; } -void FistControl::getFistParams(const Common::String &input_str, Common::String ¶meter, Common::String &values) { - const char *chrs = input_str.c_str(); +void FistControl::getFistParams(const Common::String &inputStr, Common::String ¶meter, Common::String &values) { + const char *chrs = inputStr.c_str(); uint lbr; - for (lbr = 0; lbr < input_str.size(); lbr++) + for (lbr = 0; lbr < inputStr.size(); lbr++) if (chrs[lbr] == ':') break; - if (lbr >= input_str.size()) + if (lbr >= inputStr.size()) return; uint rbr; - for (rbr = lbr + 1; rbr < input_str.size(); rbr++) + for (rbr = lbr + 1; rbr < inputStr.size(); rbr++) if (chrs[rbr] == '~') break; - if (rbr >= input_str.size()) + if (rbr >= inputStr.size()) return; parameter = Common::String(chrs, chrs + lbr); diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h index 8b229f964a..33c3c7b579 100644 --- a/engines/zvision/scripting/controls/fist_control.h +++ b/engines/zvision/scripting/controls/fist_control.h @@ -79,7 +79,7 @@ private: void clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr); uint32 readBits(const char *str); int mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos); - void getFistParams(const Common::String &input_str, Common::String ¶meter, Common::String &values); + void getFistParams(const Common::String &inputStr, Common::String ¶meter, Common::String &values); }; } // End of namespace ZVision diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp index 6969ee1bfe..fd7afb92d1 100644 --- a/engines/zvision/scripting/controls/hotmov_control.cpp +++ b/engines/zvision/scripting/controls/hotmov_control.cpp @@ -44,12 +44,12 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt : Control(engine, key, CONTROL_HOTMOV) { _animation = NULL; _cycle = 0; - _cur_frame = -1; + _curFrame = -1; _lastRenderedFrame = -1; _frames.clear(); - _frame_time = 0; - _num_cycles = 0; - _num_frames = 0; + _frameTime = 0; + _cyclesCount = 0; + _framesCount = 0; _engine->getScriptManager()->setStateValue(_key, 0); @@ -73,16 +73,16 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt _rectangle = Common::Rect(x, y, width, height); } else if (param.matchString("num_frames", true)) { - _num_frames = atoi(values.c_str()); + _framesCount = atoi(values.c_str()); } else if (param.matchString("num_cycles", true)) { - _num_cycles = atoi(values.c_str()); + _cyclesCount = atoi(values.c_str()); } else if (param.matchString("animation", true)) { char filename[64]; sscanf(values.c_str(), "%s", filename); values = Common::String(filename); _animation = new MetaAnimation(values, _engine); } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } line = stream.readLine(); @@ -117,21 +117,21 @@ bool HotMovControl::process(uint32 deltaTimeInMillis) { if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED) return false; - if (_cycle < _num_cycles) { - _frame_time -= deltaTimeInMillis; + if (_cycle < _cyclesCount) { + _frameTime -= deltaTimeInMillis; - if (_frame_time <= 0) { - _cur_frame++; - if (_cur_frame >= _num_frames) { - _cur_frame = 0; + if (_frameTime <= 0) { + _curFrame++; + if (_curFrame >= _framesCount) { + _curFrame = 0; _cycle++; } - if (_cycle != _num_cycles) - renderFrame(_cur_frame); + if (_cycle != _cyclesCount) + renderFrame(_curFrame); else _engine->getScriptManager()->setStateValue(_key, 2); - _frame_time = _animation->frameTime(); + _frameTime = _animation->frameTime(); } } @@ -142,8 +142,8 @@ bool HotMovControl::onMouseMove(const Common::Point &screenSpacePos, const Commo if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED) return false; - if (_cycle < _num_cycles) { - if (_frames[_cur_frame].contains(backgroundImageSpacePos)) { + if (_cycle < _cyclesCount) { + if (_frames[_curFrame].contains(backgroundImageSpacePos)) { _engine->getCursorManager()->changeCursor(CursorIndex_Active); return true; } @@ -156,8 +156,8 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common: if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED) return false; - if (_cycle < _num_cycles) { - if (_frames[_cur_frame].contains(backgroundImageSpacePos)) { + if (_cycle < _cyclesCount) { + if (_frames[_curFrame].contains(backgroundImageSpacePos)) { setVenus(); _engine->getScriptManager()->setStateValue(_key, 1); return true; @@ -168,7 +168,7 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common: } void HotMovControl::readHsFile(const Common::String &fileName) { - if (_num_frames == 0) + if (_framesCount == 0) return; Common::File file; @@ -179,7 +179,7 @@ void HotMovControl::readHsFile(const Common::String &fileName) { Common::String line; - _frames.resize(_num_frames); + _frames.resize(_framesCount); while (!file.eos()) { line = file.readLine(); @@ -192,7 +192,7 @@ void HotMovControl::readHsFile(const Common::String &fileName) { sscanf(line.c_str(), "%d:%d %d %d %d~", &frame, &x, &y, &width, &height); - if (frame >= 0 && frame < _num_frames) + if (frame >= 0 && frame < _framesCount) _frames[frame] = Common::Rect(x, y, width, height); } file.close(); diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h index ea12bab82b..9e01b40bab 100644 --- a/engines/zvision/scripting/controls/hotmov_control.h +++ b/engines/zvision/scripting/controls/hotmov_control.h @@ -39,12 +39,12 @@ public: ~HotMovControl(); private: - int32 _num_frames; - int32 _frame_time; - int32 _cur_frame; + int32 _framesCount; + int32 _frameTime; + int32 _curFrame; int32 _lastRenderedFrame; int32 _cycle; - int32 _num_cycles; + int32 _cyclesCount; MetaAnimation *_animation; Common::Rect _rectangle; Common::Array<Common::Rect> _frames; diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index 442c6cbc6a..8af436bb40 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/engines/zvision/scripting/controls/input_control.cpp @@ -79,13 +79,13 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre sscanf(values.c_str(), "%u", &fontFormatNumber); - _string_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber)); + _stringInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber)); } else if (param.matchString("chooser_init_string", true)) { uint fontFormatNumber; sscanf(values.c_str(), "%u", &fontFormatNumber); - _string_chooser_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber)); + _stringChooserInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber)); } else if (param.matchString("next_tabstop", true)) { sscanf(values.c_str(), "%u", &_nextTabstop); } else if (param.matchString("cursor_dimensions", true)) { @@ -104,7 +104,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre _focused = true; _engine->getScriptManager()->setFocusControlKey(_key); } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } line = stream.readLine(); @@ -201,9 +201,9 @@ bool InputControl::process(uint32 deltaTimeInMillis) { txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_pixelFormat); if (!_readOnly || !_focused) - _txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_init, txt); + _txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt); else - _txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_chooser_init, txt); + _txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringChooserInit, txt); _engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top); @@ -211,15 +211,15 @@ bool InputControl::process(uint32 deltaTimeInMillis) { } if (_animation && !_readOnly && _focused) { - bool need_draw = true;// = _textChanged; + bool needDraw = true;// = _textChanged; _frameDelay -= deltaTimeInMillis; if (_frameDelay <= 0) { _frame = (_frame + 1) % _animation->frameCount(); _frameDelay = _animation->frameTime(); - need_draw = true; + needDraw = true; } - if (need_draw) { + if (needDraw) { const Graphics::Surface *srf = _animation->getFrameData(_frame); uint32 xx = _textRectangle.left + _txtWidth; if (xx >= _textRectangle.left + (_textRectangle.width() - _animation->width())) diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h index 5e2190f369..9a829d30f6 100644 --- a/engines/zvision/scripting/controls/input_control.h +++ b/engines/zvision/scripting/controls/input_control.h @@ -40,8 +40,8 @@ public: private: Common::Rect _textRectangle; Common::Rect _headerRectangle; - cTxtStyle _string_init; - cTxtStyle _string_chooser_init; + cTxtStyle _stringInit; + cTxtStyle _stringChooserInit; uint32 _nextTabstop; bool _focused; diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index a9836b388e..1f176ef9d0 100644 --- a/engines/zvision/scripting/controls/lever_control.cpp +++ b/engines/zvision/scripting/controls/lever_control.cpp @@ -142,7 +142,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) { _hotspotDelta.x = x; _hotspotDelta.y = y; } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } else { uint frameNumber; uint x, y; @@ -381,24 +381,24 @@ void LeverControl::renderFrame(uint frameNumber) { _engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _animationCoords); } -void LeverControl::getLevParams(const Common::String &input_str, Common::String ¶meter, Common::String &values) { - const char *chrs = input_str.c_str(); +void LeverControl::getLevParams(const Common::String &inputStr, Common::String ¶meter, Common::String &values) { + const char *chrs = inputStr.c_str(); uint lbr; - for (lbr = 0; lbr < input_str.size(); lbr++) + for (lbr = 0; lbr < inputStr.size(); lbr++) if (chrs[lbr] == ':') break; - if (lbr >= input_str.size()) + if (lbr >= inputStr.size()) return; uint rbr; - for (rbr = lbr + 1; rbr < input_str.size(); rbr++) + for (rbr = lbr + 1; rbr < inputStr.size(); rbr++) if (chrs[rbr] == '~') break; - if (rbr >= input_str.size()) + if (rbr >= inputStr.size()) return; parameter = Common::String(chrs, chrs + lbr); diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h index 22789f777b..8de6d1e5c9 100644 --- a/engines/zvision/scripting/controls/lever_control.h +++ b/engines/zvision/scripting/controls/lever_control.h @@ -112,7 +112,7 @@ private: */ static int calculateVectorAngle(const Common::Point &pointOne, const Common::Point &pointTwo); void renderFrame(uint frameNumber); - void getLevParams(const Common::String &input_str, Common::String ¶meter, Common::String &values); + void getLevParams(const Common::String &inputStr, Common::String ¶meter, Common::String &values); }; } // End of namespace ZVision diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp index 54c02a2568..cb3c17e0fd 100644 --- a/engines/zvision/scripting/controls/paint_control.cpp +++ b/engines/zvision/scripting/controls/paint_control.cpp @@ -64,7 +64,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre } else if (param.matchString("brush_file", true)) { _brush = _engine->getRenderManager()->loadImage(values, false); } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } else if (param.matchString("paint_file", true)) { _paint = _engine->getRenderManager()->loadImage(values, false); } else if (param.matchString("eligible_objects", true)) { @@ -88,7 +88,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre int obj = atoi(st); - _eligible_objects.push_back(obj); + _eligibleObjects.push_back(obj); } } @@ -139,9 +139,9 @@ bool PaintControl::onMouseDown(const Common::Point &screenSpacePos, const Common return false; if (_rectangle.contains(backgroundImageSpacePos)) { - int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); + int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); - if (eligeblity(mouse_item)) { + if (eligeblity(mouseItem)) { setVenus(); _mouseDown = true; } @@ -155,9 +155,9 @@ bool PaintControl::onMouseMove(const Common::Point &screenSpacePos, const Common return false; if (_rectangle.contains(backgroundImageSpacePos)) { - int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); + int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); - if (eligeblity(mouse_item)) { + if (eligeblity(mouseItem)) { _engine->getCursorManager()->changeCursor(_cursor); if (_mouseDown) { @@ -178,30 +178,30 @@ bool PaintControl::onMouseMove(const Common::Point &screenSpacePos, const Common return false; } -bool PaintControl::eligeblity(int item_id) { - for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++) - if (*it == item_id) +bool PaintControl::eligeblity(int itemId) { + for (Common::List<int>::iterator it = _eligibleObjects.begin(); it != _eligibleObjects.end(); it++) + if (*it == itemId) return true; return false; } Common::Rect PaintControl::paint(const Common::Point &point) { - Common::Rect paint_rect = Common::Rect(_brush->w, _brush->h); - paint_rect.moveTo(point); - paint_rect.clip(_rectangle); - - if (!paint_rect.isEmpty()) { - Common::Rect brush_rect = paint_rect; - brush_rect.translate(-point.x, -point.y); - - Common::Rect bkg_rect = paint_rect; - bkg_rect.translate(-_rectangle.left, -_rectangle.top); - - for (int yy = 0; yy < brush_rect.height(); yy++) { - uint16 *mask = (uint16 *)_brush->getBasePtr(brush_rect.left, brush_rect.top + yy); - uint16 *from = (uint16 *)_paint->getBasePtr(bkg_rect.left, bkg_rect.top + yy); - uint16 *to = (uint16 *)_bkg->getBasePtr(bkg_rect.left, bkg_rect.top + yy); - for (int xx = 0; xx < brush_rect.width(); xx++) { + Common::Rect paintRect = Common::Rect(_brush->w, _brush->h); + paintRect.moveTo(point); + paintRect.clip(_rectangle); + + if (!paintRect.isEmpty()) { + Common::Rect brushRect = paintRect; + brushRect.translate(-point.x, -point.y); + + Common::Rect bkgRect = paintRect; + bkgRect.translate(-_rectangle.left, -_rectangle.top); + + for (int yy = 0; yy < brushRect.height(); yy++) { + uint16 *mask = (uint16 *)_brush->getBasePtr(brushRect.left, brushRect.top + yy); + uint16 *from = (uint16 *)_paint->getBasePtr(bkgRect.left, bkgRect.top + yy); + uint16 *to = (uint16 *)_bkg->getBasePtr(bkgRect.left, bkgRect.top + yy); + for (int xx = 0; xx < brushRect.width(); xx++) { if (*mask != 0) *(to + xx) = *(from + xx); @@ -210,7 +210,7 @@ Common::Rect PaintControl::paint(const Common::Point &point) { } } - return paint_rect; + return paintRect; } } // End of namespace ZVision diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h index 54b96e8e4e..aac4755fcd 100644 --- a/engines/zvision/scripting/controls/paint_control.h +++ b/engines/zvision/scripting/controls/paint_control.h @@ -75,14 +75,14 @@ private: Graphics::Surface *_bkg; Graphics::Surface *_brush; - Common::List<int> _eligible_objects; + Common::List<int> _eligibleObjects; int _cursor; Common::Rect _rectangle; bool _mouseDown; - bool eligeblity(int item_id); + bool eligeblity(int itemId); Common::Rect paint(const Common::Point &point); }; diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp index 561dd1dd20..ea4e947abe 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.cpp +++ b/engines/zvision/scripting/controls/push_toggle_control.cpp @@ -75,7 +75,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab // Not used } } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } line = stream.readLine(); diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp index 9df61ce341..de1ece5b19 100644 --- a/engines/zvision/scripting/controls/safe_control.cpp +++ b/engines/zvision/scripting/controls/safe_control.cpp @@ -43,18 +43,18 @@ namespace ZVision { SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) : Control(engine, key, CONTROL_SAFE) { - _num_states = 0; - _cur_state = 0; + _statesCount = 0; + _curState = 0; _animation = NULL; - _radius_inner = 0; - _radius_inner_sq = 0; - _radius_outer = 0; - _radius_outer_sq = 0; - _zero_pointer = 0; - _start_pointer = 0; - _cur_frame = -1; - _to_frame = 0; - _frame_time = 0; + _innerRaduis = 0; + _innerRadiusSqr = 0; + _outerRadius = 0; + _outerRadiusSqr = 0; + _zeroPointer = 0; + _startPointer = 0; + _curFrame = -1; + _targetFrame = 0; + _frameTime = 0; _lastRenderedFrame = -1; // Loop until we find the closing brace @@ -77,7 +77,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream _rectangle = Common::Rect(x, y, width, height); } else if (param.matchString("num_states", true)) { - _num_states = atoi(values.c_str()); + _statesCount = atoi(values.c_str()); } else if (param.matchString("center", true)) { int x; int y; @@ -85,29 +85,29 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream sscanf(values.c_str(), "%d %d", &x, &y); _center = Common::Point(x, y); } else if (param.matchString("dial_inner_radius", true)) { - _radius_inner = atoi(values.c_str()); - _radius_inner_sq = _radius_inner * _radius_inner; + _innerRaduis = atoi(values.c_str()); + _innerRadiusSqr = _innerRaduis * _innerRaduis; } else if (param.matchString("radius", true)) { - _radius_outer = atoi(values.c_str()); - _radius_outer_sq = _radius_outer * _radius_outer; + _outerRadius = atoi(values.c_str()); + _outerRadiusSqr = _outerRadius * _outerRadius; } else if (param.matchString("zero_radians_offset", true)) { - _zero_pointer = atoi(values.c_str()); + _zeroPointer = atoi(values.c_str()); } else if (param.matchString("pointer_offset", true)) { - _start_pointer = atoi(values.c_str()); - _cur_state = _start_pointer; + _startPointer = atoi(values.c_str()); + _curState = _startPointer; } else if (param.matchString("cursor", true)) { // Not used } else if (param.matchString("mirrored", true)) { // Not used } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } line = stream.readLine(); trimCommentsAndWhiteSpace(&line); getParams(line, param, values); } - renderFrame(_cur_state); + renderFrame(_curState); } SafeControl::~SafeControl() { @@ -121,7 +121,7 @@ void SafeControl::renderFrame(uint frameNumber) { _lastRenderedFrame = frameNumber; } else if ((int16)frameNumber < _lastRenderedFrame) { _lastRenderedFrame = frameNumber; - frameNumber = (_num_states * 2) - frameNumber; + frameNumber = (_statesCount * 2) - frameNumber; } else { _lastRenderedFrame = frameNumber; } @@ -139,21 +139,20 @@ bool SafeControl::process(uint32 deltaTimeInMillis) { if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED) return false; - if (_cur_frame != _to_frame) { - _frame_time -= deltaTimeInMillis; + if (_curFrame != _targetFrame) { + _frameTime -= deltaTimeInMillis; - if (_frame_time <= 0) { - if (_cur_frame < _to_frame) { - _cur_frame++; - renderFrame(_cur_frame); - } else if (_cur_frame > _to_frame) { - _cur_frame--; - renderFrame(_cur_frame); + if (_frameTime <= 0) { + if (_curFrame < _targetFrame) { + _curFrame++; + renderFrame(_curFrame); + } else if (_curFrame > _targetFrame) { + _curFrame--; + renderFrame(_curFrame); } - _frame_time = _animation->frameTime(); + _frameTime = _animation->frameTime(); } } - return false; } @@ -163,12 +162,11 @@ bool SafeControl::onMouseMove(const Common::Point &screenSpacePos, const Common: if (_rectangle.contains(backgroundImageSpacePos)) { int32 mR = backgroundImageSpacePos.sqrDist(_center); - if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) { + if (mR <= _outerRadiusSqr && mR >= _innerRadiusSqr) { _engine->getCursorManager()->changeCursor(CursorIndex_Active); return true; } } - return false; } @@ -178,30 +176,29 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P if (_rectangle.contains(backgroundImageSpacePos)) { int32 mR = backgroundImageSpacePos.sqrDist(_center); - if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) { + if (mR <= _outerRadiusSqr && mR >= _innerRadiusSqr) { setVenus(); Common::Point tmp = backgroundImageSpacePos - _center; float dd = atan2(tmp.x, tmp.y) * 57.29578; - int16 dp_state = 360 / _num_states; + int16 dp_state = 360 / _statesCount; - int16 m_state = (_num_states - ((((int16)dd + 540) % 360) / dp_state)) % _num_states; + int16 m_state = (_statesCount - ((((int16)dd + 540) % 360) / dp_state)) % _statesCount; - int16 tmp2 = (m_state + _cur_state - _zero_pointer + _num_states - 1) % _num_states; + int16 tmp2 = (m_state + _curState - _zeroPointer + _statesCount - 1) % _statesCount; - _cur_frame = (_cur_state + _num_states - _start_pointer) % _num_states; + _curFrame = (_curState + _statesCount - _startPointer) % _statesCount; - _cur_state = (_num_states * 2 + tmp2) % _num_states; + _curState = (_statesCount * 2 + tmp2) % _statesCount; - _to_frame = (_cur_state + _num_states - _start_pointer) % _num_states; + _targetFrame = (_curState + _statesCount - _startPointer) % _statesCount; - _engine->getScriptManager()->setStateValue(_key, _cur_state); + _engine->getScriptManager()->setStateValue(_key, _curState); return true; } } - return false; } diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h index 2477d8c26d..e682e35050 100644 --- a/engines/zvision/scripting/controls/safe_control.h +++ b/engines/zvision/scripting/controls/safe_control.h @@ -40,20 +40,20 @@ public: ~SafeControl(); private: - int16 _num_states; - int16 _cur_state; + int16 _statesCount; + int16 _curState; MetaAnimation *_animation; Common::Point _center; Common::Rect _rectangle; - int16 _radius_inner; - int32 _radius_inner_sq; - int16 _radius_outer; - int32 _radius_outer_sq; - int16 _zero_pointer; - int16 _start_pointer; - int16 _cur_frame; - int16 _to_frame; - int32 _frame_time; + int16 _innerRaduis; + int32 _innerRadiusSqr; + int16 _outerRadius; + int32 _outerRadiusSqr; + int16 _zeroPointer; + int16 _startPointer; + int16 _curFrame; + int16 _targetFrame; + int32 _frameTime; int16 _lastRenderedFrame; diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp index a0b19db513..7e1a65a9cc 100644 --- a/engines/zvision/scripting/controls/save_control.cpp +++ b/engines/zvision/scripting/controls/save_control.cpp @@ -50,13 +50,13 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream while (!stream.eos() && !line.contains('}')) { if (param.matchString("savebox", true)) { - int save_id; - int input_id; + int saveId; + int inputId; - sscanf(values.c_str(), "%d %d", &save_id, &input_id); - save_elmnt elmnt; - elmnt.input_key = input_id; - elmnt.save_id = save_id; + sscanf(values.c_str(), "%d %d", &saveId, &inputId); + saveElement elmnt; + elmnt.inputKey = inputId; + elmnt.saveId = saveId; elmnt.exist = false; _inputs.push_back(elmnt); } else if (param.matchString("control_type", true)) { @@ -72,11 +72,11 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream } for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) { - Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key); + Control *ctrl = _engine->getScriptManager()->getControl(iter->inputKey); if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) { InputControl *inp = (InputControl *)ctrl; inp->setReadOnly(!_saveControl); - Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->save_id); + Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->saveId); if (save) { SaveGameHeader header; _engine->getSaveManager()->readSaveGameHeader(save, header); @@ -90,7 +90,7 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream bool SaveControl::process(uint32 deltaTimeInMillis) { for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) { - Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key); + Control *ctrl = _engine->getScriptManager()->getControl(iter->inputKey); if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) { InputControl *inp = (InputControl *)ctrl; if (inp->enterPress()) { @@ -102,7 +102,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) { toSave = false; if (toSave) { - _engine->getSaveManager()->saveGameBuffered(iter->save_id, inp->getText()); + _engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText()); _engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000); _engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation()); } @@ -110,7 +110,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) { _engine->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000); } } else { - _engine->getSaveManager()->loadGame(iter->save_id); + _engine->getSaveManager()->loadGame(iter->saveId); return true; } break; diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h index 942b9c9269..fefb0e0ce2 100644 --- a/engines/zvision/scripting/controls/save_control.h +++ b/engines/zvision/scripting/controls/save_control.h @@ -35,12 +35,12 @@ public: SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream); private: - struct save_elmnt { - int save_id; - int input_key; + struct saveElement { + int saveId; + int inputKey; bool exist; }; - typedef Common::List<save_elmnt> saveElmntList; + typedef Common::List<saveElement> saveElmntList; saveElmntList _inputs; bool _saveControl; diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp index 46ee320eb5..074d1905b4 100644 --- a/engines/zvision/scripting/controls/slot_control.cpp +++ b/engines/zvision/scripting/controls/slot_control.cpp @@ -38,7 +38,7 @@ namespace ZVision { SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) : Control(engine, key, CONTROL_SLOT) { - _rendered_item = 0; + _renderedItem = 0; _bkg = NULL; // Loop until we find the closing brace @@ -70,9 +70,9 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream } else if (param.matchString("cursor", true)) { _cursor = _engine->getCursorManager()->getCursorId(values); } else if (param.matchString("distance_id", true)) { - sscanf(values.c_str(), "%c", &_distance_id); + sscanf(values.c_str(), "%c", &_distanceId); } else if (param.matchString("venus_id", true)) { - _venus_id = atoi(values.c_str()); + _venusId = atoi(values.c_str()); } else if (param.matchString("eligible_objects", true)) { char buf[256]; memset(buf, 0, 256); @@ -94,7 +94,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream int obj = atoi(st); - _eligible_objects.push_back(obj); + _eligibleObjects.push_back(obj); } } @@ -124,26 +124,26 @@ bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P setVenus(); int item = _engine->getScriptManager()->getStateValue(_key); - int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); + int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem); if (item != 0) { - if (mouse_item != 0) { - if (eligeblity(mouse_item)) { - _engine->getScriptManager()->invertory_drop(mouse_item); - _engine->getScriptManager()->invertory_add(item); - _engine->getScriptManager()->setStateValue(_key, mouse_item); + if (mouseItem != 0) { + if (eligeblity(mouseItem)) { + _engine->getScriptManager()->inventoryDrop(mouseItem); + _engine->getScriptManager()->inventoryAdd(item); + _engine->getScriptManager()->setStateValue(_key, mouseItem); } } else { - _engine->getScriptManager()->invertory_add(item); + _engine->getScriptManager()->inventoryAdd(item); _engine->getScriptManager()->setStateValue(_key, 0); } - } else if (mouse_item == 0) { + } else if (mouseItem == 0) { if (eligeblity(0)) { - _engine->getScriptManager()->invertory_drop(0); + _engine->getScriptManager()->inventoryDrop(0); _engine->getScriptManager()->setStateValue(_key, 0); } - } else if (eligeblity(mouse_item)) { - _engine->getScriptManager()->setStateValue(_key, mouse_item); - _engine->getScriptManager()->invertory_drop(mouse_item); + } else if (eligeblity(mouseItem)) { + _engine->getScriptManager()->setStateValue(_key, mouseItem); + _engine->getScriptManager()->inventoryDrop(mouseItem); } } return false; @@ -166,13 +166,13 @@ bool SlotControl::process(uint32 deltaTimeInMillis) { return false; if (_engine->canRender()) { - int cur_item = _engine->getScriptManager()->getStateValue(_key); - if (cur_item != _rendered_item) { - if (_rendered_item != 0 && cur_item == 0) { + int curItem = _engine->getScriptManager()->getStateValue(_key); + if (curItem != _renderedItem) { + if (_renderedItem != 0 && curItem == 0) { _engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top); - _rendered_item = cur_item; + _renderedItem = curItem; } else { - if (_rendered_item == 0) { + if (_renderedItem == 0) { if (_bkg) delete _bkg; @@ -183,9 +183,9 @@ bool SlotControl::process(uint32 deltaTimeInMillis) { char buf[16]; if (_engine->getGameId() == GID_NEMESIS) - sprintf(buf, "%d%cobj.tga", cur_item, _distance_id); + sprintf(buf, "%d%cobj.tga", curItem, _distanceId); else - sprintf(buf, "g0z%cu%2.2x1.tga", _distance_id, cur_item); + sprintf(buf, "g0z%cu%2.2x1.tga", _distanceId, curItem); Graphics::Surface *srf = _engine->getRenderManager()->loadImage(buf); @@ -202,16 +202,16 @@ bool SlotControl::process(uint32 deltaTimeInMillis) { delete srf; - _rendered_item = cur_item; + _renderedItem = curItem; } } } return false; } -bool SlotControl::eligeblity(int item_id) { - for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++) - if (*it == item_id) +bool SlotControl::eligeblity(int itemId) { + for (Common::List<int>::iterator it = _eligibleObjects.begin(); it != _eligibleObjects.end(); it++) + if (*it == itemId) return true; return false; } diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h index 7799785aa5..86fd261f25 100644 --- a/engines/zvision/scripting/controls/slot_control.h +++ b/engines/zvision/scripting/controls/slot_control.h @@ -66,13 +66,13 @@ private: Common::Rect _hotspot; int _cursor; - char _distance_id; + char _distanceId; - int _rendered_item; + int _renderedItem; - Common::List<int> _eligible_objects; + Common::List<int> _eligibleObjects; - bool eligeblity(int item_id); + bool eligeblity(int itemId); Graphics::Surface *_bkg; |