diff options
author | D G Turner | 2012-07-28 08:27:56 +0100 |
---|---|---|
committer | D G Turner | 2012-07-28 08:27:56 +0100 |
commit | b0b99cead05101451980c6d9837b324f3598a32e (patch) | |
tree | ae17158ca9c93816911190654bcb6e8d75ece55c /engines | |
parent | be4be025b97f0dc58f90dff749002400579e75e9 (diff) | |
download | scummvm-rg350-b0b99cead05101451980c6d9837b324f3598a32e.tar.gz scummvm-rg350-b0b99cead05101451980c6d9837b324f3598a32e.tar.bz2 scummvm-rg350-b0b99cead05101451980c6d9837b324f3598a32e.zip |
TEENAGENT: Align some variable names with coding conventions.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/teenagent/teenagent.cpp | 108 | ||||
-rw-r--r-- | engines/teenagent/teenagent.h | 28 |
2 files changed, 68 insertions, 68 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index 2837d56691..ad50645ffc 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -52,7 +52,7 @@ namespace TeenAgent { TeenAgentEngine::TeenAgentEngine(OSystem *system, const ADGameDescription *gd) - : Engine(system), action(kActionNone), _gameDescription(gd), _rnd("teenagent") { + : Engine(system), _action(kActionNone), _gameDescription(gd), _rnd("teenagent") { DebugMan.addDebugChannel(kDebugActor, "Actor", "Enable Actor Debug"); DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Enable Animation Debug"); DebugMan.addDebugChannel(kDebugCallbacks, "Callbacks", "Enable Callbacks Debug"); @@ -82,7 +82,7 @@ TeenAgentEngine::~TeenAgentEngine() { delete music; music = 0; _mixer->stopAll(); - use_hotspots.clear(); + _useHotspots.clear(); delete res; res = 0; @@ -97,20 +97,20 @@ bool TeenAgentEngine::trySelectedObject() { if (inv == NULL) return false; - debugC(0, kDebugObject, "checking active object %u on %u", inv->id, dst_object->id); + debugC(0, kDebugObject, "checking active object %u on %u", inv->id, _dstObject->id); //mouse time challenge hack: - if ((res->dseg.get_byte(0) == 1 && inv->id == 49 && dst_object->id == 5) || - (res->dseg.get_byte(0) == 2 && inv->id == 29 && dst_object->id == 5)) { + if ((res->dseg.get_byte(0) == 1 && inv->id == 49 && _dstObject->id == 5) || + (res->dseg.get_byte(0) == 2 && inv->id == 29 && _dstObject->id == 5)) { //putting rock into hole or superglue on rock fnPutRockInHole(); return true; } - const Common::Array<UseHotspot> &hotspots = use_hotspots[scene->getId() - 1]; + const Common::Array<UseHotspot> &hotspots = _useHotspots[scene->getId() - 1]; for (uint i = 0; i < hotspots.size(); ++i) { const UseHotspot &spot = hotspots[i]; - if (spot.inventory_id == inv->id && dst_object->id == spot.object_id) { + if (spot.inventory_id == inv->id && _dstObject->id == spot.object_id) { debugC(0, kDebugObject, "use object on hotspot!"); spot.dump(); if (spot.actor_x != 0xffff && spot.actor_y != 0xffff) @@ -129,20 +129,20 @@ bool TeenAgentEngine::trySelectedObject() { } void TeenAgentEngine::processObject() { - if (dst_object == NULL) + if (_dstObject == NULL) return; - switch (action) { + switch (_action) { case kActionExamine: { if (trySelectedObject()) break; byte *dcall = res->dseg.ptr(0xb5ce); dcall = res->dseg.ptr(READ_LE_UINT16(dcall + scene->getId() * 2 - 2)); - dcall += 2 * dst_object->id - 2; + dcall += 2 * _dstObject->id - 2; uint16 callback = READ_LE_UINT16(dcall); if (callback == 0 || !processCallback(callback)) - displayMessage(dst_object->description); + displayMessage(_dstObject->description); } break; case kActionUse: { @@ -151,10 +151,10 @@ void TeenAgentEngine::processObject() { byte *dcall = res->dseg.ptr(0xb89c); dcall = res->dseg.ptr(READ_LE_UINT16(dcall + scene->getId() * 2 - 2)); - dcall += 2 * dst_object->id - 2; + dcall += 2 * _dstObject->id - 2; uint16 callback = READ_LE_UINT16(dcall); if (!processCallback(callback)) - displayMessage(dst_object->description); + displayMessage(_dstObject->description); } break; @@ -167,11 +167,11 @@ void TeenAgentEngine::use(Object *object) { if (object == NULL || scene->eventRunning()) return; - dst_object = object; + _dstObject = object; object->rect.dump(); object->actor_rect.dump(); - action = kActionUse; + _action = kActionUse; if (object->actor_rect.valid()) scene->moveTo(Common::Point(object->actor_rect.right, object->actor_rect.bottom), object->actor_orientation); else if (object->actor_orientation > 0) @@ -185,27 +185,27 @@ void TeenAgentEngine::examine(const Common::Point &point, Object *object) { if (object != NULL) { Common::Point dst = object->actor_rect.center(); debugC(0, kDebugObject, "click %d, %d, object %d, %d", point.x, point.y, dst.x, dst.y); - action = kActionExamine; + _action = kActionExamine; if (object->actor_rect.valid()) scene->moveTo(dst, object->actor_orientation, true); // validate examine message. Original engine does not let you into walkboxes - dst_object = object; - } else if (!scene_busy) { + _dstObject = object; + } else if (!_sceneBusy) { // do not reset anything while scene is busy, but allow interrupts while walking. debugC(0, kDebugObject, "click %d, %d", point.x, point.y); - action = kActionNone; + _action = kActionNone; scene->moveTo(point, 0, true); - dst_object = NULL; + _dstObject = NULL; } } void TeenAgentEngine::init() { - _mark_delay = 80; - _game_delay = 110; + _markDelay = 80; + _gameDelay = 110; - use_hotspots.resize(42); + _useHotspots.resize(42); byte *scene_hotspots = res->dseg.ptr(0xbb87); for (byte i = 0; i < 42; ++i) { - Common::Array<UseHotspot> & hotspots = use_hotspots[i]; + Common::Array<UseHotspot> & hotspots = _useHotspots[i]; byte *hotspots_ptr = res->dseg.ptr(READ_LE_UINT16(scene_hotspots + i * 2)); while (*hotspots_ptr) { UseHotspot h; @@ -559,7 +559,7 @@ Common::Error TeenAgentEngine::run() { if (!showMetropolis()) return Common::kNoError; scene->intro = true; - scene_busy = true; + _sceneBusy = true; fnIntro(); } @@ -579,7 +579,7 @@ Common::Error TeenAgentEngine::run() { if (event.type == Common::EVENT_RTL) return Common::kNoError; - if ((!scene_busy && inventory->processEvent(event)) || scene->processEvent(event)) + if ((!_sceneBusy && inventory->processEvent(event)) || scene->processEvent(event)) continue; debug(5, "event"); @@ -591,8 +591,8 @@ Common::Error TeenAgentEngine::run() { } else if (event.kbd.hasFlags(0) && event.kbd.keycode == Common::KEYCODE_F5) { openMainMenuDialog(); } if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_f) { - _mark_delay = _mark_delay == 80 ? 40 : 80; - debug(5, "mark_delay = %u", _mark_delay); + _markDelay = _markDelay == 80 ? 40 : 80; + debug(5, "markDelay = %u", _markDelay); } break; case Common::EVENT_LBUTTONDOWN: @@ -636,28 +636,28 @@ Common::Error TeenAgentEngine::run() { bool tick_game = game_timer <= delta; if (tick_game) - game_timer = _game_delay - ((delta - game_timer) % _game_delay); + game_timer = _gameDelay - ((delta - game_timer) % _gameDelay); else game_timer -= delta; bool tick_mark = mark_timer <= delta; if (tick_mark) - mark_timer = _mark_delay - ((delta - mark_timer) % _mark_delay); + mark_timer = _markDelay - ((delta - mark_timer) % _markDelay); else mark_timer -= delta; if (tick_game || tick_mark) { bool b = scene->render(tick_game, tick_mark, delta); - if (!inventory->active() && !b && action != kActionNone) { + if (!inventory->active() && !b && _action != kActionNone) { processObject(); - action = kActionNone; - dst_object = NULL; + _action = kActionNone; + _dstObject = NULL; } - scene_busy = b; + _sceneBusy = b; } - _system->showMouse(scene->getMessage().empty() && !scene_busy); + _system->showMouse(scene->getMessage().empty() && !_sceneBusy); - bool busy = inventory->active() || scene_busy; + bool busy = inventory->active() || _sceneBusy; Graphics::Surface *surface = _system->lockScreen(); @@ -749,26 +749,26 @@ void TeenAgentEngine::displayMessage(uint16 addr, byte color, uint16 x, uint16 y displayMessage(parseMessage(addr), color, x, y); } -void TeenAgentEngine::displayAsyncMessage(uint16 addr, uint16 x, uint16 y, uint16 first_frame, uint16 last_frame, byte color) { +void TeenAgentEngine::displayAsyncMessage(uint16 addr, uint16 x, uint16 y, uint16 firstFrame, uint16 lastFrame, byte color) { SceneEvent event(SceneEvent::kMessage); event.message = parseMessage(addr); event.slot = 0; event.color = color; event.dst.x = x; event.dst.y = y; - event.first_frame = first_frame; - event.last_frame = last_frame; + event.first_frame = firstFrame; + event.last_frame = lastFrame; scene->push(event); } -void TeenAgentEngine::displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 first_frame, uint16 last_frame, byte color) { +void TeenAgentEngine::displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 firstFrame, uint16 lastFrame, byte color) { SceneEvent event(SceneEvent::kMessage); event.message = parseMessage(addr); event.slot = slot + 1; event.color = color; - event.first_frame = first_frame; - event.last_frame = last_frame; + event.first_frame = firstFrame; + event.last_frame = lastFrame; scene->push(event); } @@ -895,21 +895,21 @@ void TeenAgentEngine::enableOn(bool enable) { scene->push(event); } -void TeenAgentEngine::setOns(byte id, byte value, byte scene_id) { +void TeenAgentEngine::setOns(byte id, byte value, byte sceneId) { SceneEvent event(SceneEvent::kSetOn); event.ons = id + 1; event.color = value; - event.scene = scene_id; + event.scene = sceneId; scene->push(event); } -void TeenAgentEngine::setLan(byte id, byte value, byte scene_id) { +void TeenAgentEngine::setLan(byte id, byte value, byte sceneId) { if (id == 0) error("setting lan 0 is invalid"); SceneEvent event(SceneEvent::kSetLan); event.lan = id; event.color = value; - event.scene = scene_id; + event.scene = sceneId; scene->push(event); } @@ -936,28 +936,28 @@ void TeenAgentEngine::playMusic(byte id) { scene->push(event); } -void TeenAgentEngine::playSound(byte id, byte skip_frames) { - if (skip_frames > 0) - --skip_frames; +void TeenAgentEngine::playSound(byte id, byte skipFrames) { + if (skipFrames > 0) + --skipFrames; SceneEvent event(SceneEvent::kPlaySound); event.sound = id; - event.color = skip_frames; + event.color = skipFrames; scene->push(event); } -void TeenAgentEngine::enableObject(byte id, byte scene_id) { +void TeenAgentEngine::enableObject(byte id, byte sceneId) { SceneEvent event(SceneEvent::kEnableObject); event.object = id + 1; event.color = 1; - event.scene = scene_id; + event.scene = sceneId; scene->push(event); } -void TeenAgentEngine::disableObject(byte id, byte scene_id) { +void TeenAgentEngine::disableObject(byte id, byte sceneId) { SceneEvent event(SceneEvent::kEnableObject); event.object = id + 1; event.color = 0; - event.scene = scene_id; + event.scene = sceneId; scene->push(event); } diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h index 2816d29e20..9e32af24d9 100644 --- a/engines/teenagent/teenagent.h +++ b/engines/teenagent/teenagent.h @@ -79,7 +79,7 @@ public: virtual Common::Error loadGameState(int slot); virtual Common::Error saveGameState(int slot, const Common::String &desc); virtual bool canLoadGameStateCurrently() { return true; } - virtual bool canSaveGameStateCurrently() { return !scene_busy; } + virtual bool canSaveGameStateCurrently() { return !_sceneBusy; } virtual bool hasFeature(EngineFeature f) const; void init(); @@ -88,7 +88,7 @@ public: void examine(const Common::Point &point, Object *object); void use(Object *object); - inline void cancel() { action = kActionNone; } + inline void cancel() { _action = kActionNone; } bool processCallback(uint16 addr); inline Scene *getScene() { return scene; } @@ -103,8 +103,8 @@ public: //event driven: void displayMessage(uint16 addr, byte color = 0xd1, uint16 x = 0, uint16 y = 0); void displayMessage(const Common::String &str, byte color = 0xd1, uint16 x = 0, uint16 y = 0); - void displayAsyncMessage(uint16 addr, uint16 x, uint16 y, uint16 first_frame, uint16 last_frame, byte color = 0xd1); - void displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 first_frame, uint16 last_frame, byte color = 0xd1); + void displayAsyncMessage(uint16 addr, uint16 x, uint16 y, uint16 firstFrame, uint16 lastFrame, byte color = 0xd1); + void displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 firstFrame, uint16 lastFrame, byte color = 0xd1); void displayCredits(uint16 addr, uint16 timer = 0); void displayCutsceneMessage(uint16 addr, uint16 x, uint16 y); void moveTo(const Common::Point &dst, byte o, bool warp = false); @@ -116,18 +116,18 @@ public: void loadScene(byte id, const Common::Point &pos, byte o = 0); void loadScene(byte id, uint16 x, uint16 y, byte o = 0); void enableOn(bool enable = true); - void setOns(byte id, byte value, byte scene_id = 0); - void setLan(byte id, byte value, byte scene_id = 0); + void setOns(byte id, byte value, byte sceneId = 0); + void setLan(byte id, byte value, byte sceneId = 0); void setFlag(uint16 addr, byte value); byte getFlag(uint16 addr); void reloadLan(); void rejectMessage(); void playMusic(byte id); //schedules play - void playSound(byte id, byte skip_frames); + void playSound(byte id, byte skipFrames); void playSoundNow(byte id); - void enableObject(byte id, byte scene_id = 0); - void disableObject(byte id, byte scene_id = 0); + void enableObject(byte id, byte sceneId = 0); + void disableObject(byte id, byte sceneId = 0); void hideActor(); void showActor(); void waitAnimation(); @@ -154,17 +154,17 @@ private: void processObject(); bool trySelectedObject(); - bool scene_busy; - Action action; - Object *dst_object; + bool _sceneBusy; + Action _action; + Object *_dstObject; Audio::AudioStream *_musicStream; Audio::SoundHandle _musicHandle, _soundHandle; const ADGameDescription *_gameDescription; - uint _mark_delay, _game_delay; + uint _markDelay, _gameDelay; - Common::Array<Common::Array<UseHotspot> > use_hotspots; + Common::Array<Common::Array<UseHotspot> > _useHotspots; void fnIntro(); void fnPoleClimbFail(); |