Skip to content

Commit

Permalink
ENGINES: Hook up the new CursorManager
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrMcCoy
DrMcCoy committed Mar 20, 2014
1 parent bf08877 commit 4567ece
Show file tree
Hide file tree
Showing 8 changed files with 355 additions and 0 deletions.
76 changes: 76 additions & 0 deletions src/engines/dragonage/dragonage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

#include "aurora/resman.h"

#include "graphics/cursorman.h"

#include "sound/sound.h"

#include "events/events.h"
Expand Down Expand Up @@ -106,6 +108,8 @@ void DragonAgeEngine::run(const Common::UString &target) {
return;
*/

CursorMan.set();

while (!EventMan.quitRequested()) {
EventMan.delay(10);
}
Expand Down Expand Up @@ -196,6 +200,78 @@ void DragonAgeEngine::init() {
}

void DragonAgeEngine::initCursors() {
CursorMan.add("area_transition" , "area_transition" , "up" );
CursorMan.add("area_transition_pressed" , "area_transition" , "down" );
CursorMan.add("attack" , "attack" , "up" );
CursorMan.add("attack_pressed" , "attack" , "down" );
CursorMan.add("chest" , "chest" , "up" );
CursorMan.add("chest_pressed" , "chest" , "down" );
CursorMan.add("close" , "close" , "up" );
CursorMan.add("close_pressed" , "close" , "down" );
CursorMan.add("converse" , "converse" , "up" );
CursorMan.add("converse_pressed" , "converse" , "down" );
CursorMan.add("destroy" , "destroy" , "up" );
CursorMan.add("destroy_pressed" , "destroy" , "down" );
CursorMan.add("dialog" , "dialog" , "up" );
CursorMan.add("dialog_pressed" , "dialog" , "down" );
CursorMan.add("disabled_unlock" , "disabled_unlock" , "up" );
CursorMan.add("disabled_unlock_pressed" , "disabled_unlock" , "down" );
CursorMan.add("disarm" , "disarm" , "up" );
CursorMan.add("disarm_pressed" , "disarm" , "down" );
CursorMan.add("door" , "door" , "up" );
CursorMan.add("door_pressed" , "door" , "down" );
CursorMan.add("dragging" , "dragging" , "" );
CursorMan.add("examine" , "examine" , "up" );
CursorMan.add("examine_pressed" , "examine" , "down" );
CursorMan.add("flip_cover" , "flip_cover" , "up" );
CursorMan.add("flip_cover_pressed" , "flip_cover" , "down" );
CursorMan.add("hand" , "hand" , "up" );
CursorMan.add("hand2" , "hand" , "down" );
CursorMan.add("hidden_cursor" , "hidden_cursor" , "" );
CursorMan.add("ibeam" , "ibeam" , "up" );
CursorMan.add("ibeam_pressed" , "ibeam" , "down" );
CursorMan.add("invalid" , "invalid" , "up" );
CursorMan.add("invalid_pressed" , "invalid" , "down" );
CursorMan.add("invalid_move" , "invalid_move" , "" );
CursorMan.add("open" , "open" , "up" );
CursorMan.add("open_pressed" , "open" , "down" );
CursorMan.add("open_inventory" , "open_inventory" , "up" );
CursorMan.add("open_inventory_pressed" , "open_inventory" , "down" );
CursorMan.add("panning" , "panning" , "down" );
CursorMan.add("panning1" , "panning" , "up" );
CursorMan.add("panning1_h" , "panning_h" , "up" );
CursorMan.add("panning1_v" , "panning_v" , "up" );
CursorMan.add("panning_h" , "panning_h" , "down" );
CursorMan.add("panning_v" , "panning_v" , "down" );
CursorMan.add("party_member" , "party_member" , "" );
CursorMan.add("standard" , "standard" , "up" );
CursorMan.add("standard_pressed" , "standard" , "down" );
CursorMan.add("standard_targeting" , "standard_targeting" , "up" );
CursorMan.add("standard_targeting_pressed" , "standard_targeting" , "down" );
CursorMan.add("target" , "target" , "up" );
CursorMan.add("target_pressed" , "target" , "down" );
CursorMan.add("target_inactive" , "target" , "inactive");
CursorMan.add("target_circle" , "target_circle" , "up" );
CursorMan.add("target_circle_pressed" , "target_circle" , "down" );
CursorMan.add("target_circle_invalid" , "target_circle" , "invalid" );
CursorMan.add("target_cone" , "target_cone" , "up" );
CursorMan.add("target_cone_pressed" , "target_cone" , "down" );
CursorMan.add("target_cone_invalid" , "target_cone" , "invalid" );
CursorMan.add("target_creature" , "target_creature" , "up" );
CursorMan.add("target_creature_pressed" , "target_creature" , "down" );
CursorMan.add("target_creature_invalid" , "target_creature" , "invalid" );
CursorMan.add("target_creaturelock" , "target_creaturelock", "up" );
CursorMan.add("target_creaturelock_pressed", "target_creaturelock", "down" );
CursorMan.add("topple" , "topple" , "up" );
CursorMan.add("topple_pressed" , "topple" , "down" );
CursorMan.add("trigger_trap" , "trigger_trap" , "up" );
CursorMan.add("trigger_trap_pressed" , "trigger_trap" , "down" );
CursorMan.add("unlock" , "unlock" , "up" );
CursorMan.add("unlock_pressed" , "unlock" , "down" );
CursorMan.add("use" , "use" , "up" );
CursorMan.add("use_pressed" , "use" , "down" );

CursorMan.setDefault("standard", "up");
}

} // End of namespace DragonAge
Expand Down
78 changes: 78 additions & 0 deletions src/engines/dragonage2/dragonage2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

#include "aurora/resman.h"

#include "graphics/cursorman.h"

#include "sound/sound.h"

#include "events/events.h"
Expand Down Expand Up @@ -105,6 +107,8 @@ void DragonAge2Engine::run(const Common::UString &target) {
return;
*/

CursorMan.set();

while (!EventMan.quitRequested()) {
EventMan.delay(10);
}
Expand Down Expand Up @@ -171,6 +175,80 @@ void DragonAge2Engine::init() {
}

void DragonAge2Engine::initCursors() {
CursorMan.add("area_transition" , "area_transition" , "up" );
CursorMan.add("area_transition_pressed" , "area_transition" , "down" );
CursorMan.add("attack" , "attack" , "up" );
CursorMan.add("attack_pressed" , "attack" , "down" );
CursorMan.add("chest" , "chest" , "up" );
CursorMan.add("chest_pressed" , "chest" , "down" );
CursorMan.add("close" , "close" , "up" );
CursorMan.add("close_pressed" , "close" , "down" );
CursorMan.add("converse" , "converse" , "up" );
CursorMan.add("converse_pressed" , "converse" , "down" );
CursorMan.add("destroy" , "destroy" , "up" );
CursorMan.add("destroy_pressed" , "destroy" , "down" );
CursorMan.add("dialog" , "dialog" , "up" );
CursorMan.add("dialog_pressed" , "dialog" , "down" );
CursorMan.add("disabled_disarm" , "disabled_disarm" , "up" );
CursorMan.add("disabled_disarm_pressed" , "disabled_disarm" , "down" );
CursorMan.add("disabled_unlock" , "disabled_unlock" , "up" );
CursorMan.add("disabled_unlock_pressed" , "disabled_unlock" , "down" );
CursorMan.add("disarm" , "disarm" , "up" );
CursorMan.add("disarm_pressed" , "disarm" , "down" );
CursorMan.add("door" , "door" , "up" );
CursorMan.add("door_pressed" , "door" , "down" );
CursorMan.add("dragging" , "dragging" , "" );
CursorMan.add("examine" , "examine" , "up" );
CursorMan.add("examine_pressed" , "examine" , "down" );
CursorMan.add("flip_cover" , "flip_cover" , "up" );
CursorMan.add("flip_cover_pressed" , "flip_cover" , "down" );
CursorMan.add("hand" , "hand" , "up" );
CursorMan.add("hand2" , "hand" , "down" );
CursorMan.add("hidden_cursor" , "hidden_cursor" , "" );
CursorMan.add("ibeam" , "ibeam" , "up" );
CursorMan.add("ibeam_pressed" , "ibeam" , "down" );
CursorMan.add("invalid" , "invalid" , "up" );
CursorMan.add("invalid_pressed" , "invalid" , "down" );
CursorMan.add("invalid_move" , "invalid_move" , "" );
CursorMan.add("open" , "open" , "up" );
CursorMan.add("open_pressed" , "open" , "down" );
CursorMan.add("open_inventory" , "open_inventory" , "up" );
CursorMan.add("open_inventory_pressed" , "open_inventory" , "down" );
CursorMan.add("panning" , "panning" , "down" );
CursorMan.add("panning1" , "panning" , "up" );
CursorMan.add("panning1_h" , "panning_h" , "up" );
CursorMan.add("panning1_v" , "panning_v" , "up" );
CursorMan.add("panning_h" , "panning_h" , "down" );
CursorMan.add("panning_v" , "panning_v" , "down" );
CursorMan.add("party_member" , "party_member" , "" );
CursorMan.add("standard" , "standard" , "up" );
CursorMan.add("standard_pressed" , "standard" , "down" );
CursorMan.add("standard_targeting" , "standard_targeting" , "up" );
CursorMan.add("standard_targeting_pressed" , "standard_targeting" , "down" );
CursorMan.add("target" , "target" , "up" );
CursorMan.add("target_pressed" , "target" , "down" );
CursorMan.add("target_inactive" , "target" , "inactive");
CursorMan.add("target_circle" , "target_circle" , "up" );
CursorMan.add("target_circle_pressed" , "target_circle" , "down" );
CursorMan.add("target_circle_invalid" , "target_circle" , "invalid" );
CursorMan.add("target_cone" , "target_cone" , "up" );
CursorMan.add("target_cone_pressed" , "target_cone" , "down" );
CursorMan.add("target_cone_invalid" , "target_cone" , "invalid" );
CursorMan.add("target_creature" , "target_creature" , "up" );
CursorMan.add("target_creature_pressed" , "target_creature" , "down" );
CursorMan.add("target_creature_invalid" , "target_creature" , "invalid" );
CursorMan.add("target_creaturelock" , "target_creaturelock", "up" );
CursorMan.add("target_creaturelock_pressed", "target_creaturelock", "down" );
CursorMan.add("topple" , "topple" , "up" );
CursorMan.add("topple_pressed" , "topple" , "down" );
CursorMan.add("trigger_trap" , "trigger_trap" , "up" );
CursorMan.add("trigger_trap_pressed" , "trigger_trap" , "down" );
CursorMan.add("unlock" , "unlock" , "up" );
CursorMan.add("unlock_pressed" , "unlock" , "down" );
CursorMan.add("use" , "use" , "up" );
CursorMan.add("use_pressed" , "use" , "down" );

CursorMan.setDefault("standard", "up");
}

} // End of namespace DragonAge2
Expand Down
7 changes: 7 additions & 0 deletions src/engines/jade/jade.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#include "aurora/resman.h"
#include "aurora/talkman.h"

#include "graphics/cursorman.h"

#include "sound/sound.h"

#include "events/events.h"
Expand Down Expand Up @@ -110,6 +112,8 @@ void JadeEngine::run(const Common::UString &target) {
return;
*/

CursorMan.set();

playSound("musicbank00046", Sound::kSoundTypeMusic, true);

while (!EventMan.quitRequested()) {
Expand Down Expand Up @@ -163,6 +167,9 @@ void JadeEngine::init() {
}

void JadeEngine::initCursors() {
CursorMan.add("ui_cursor32", "default", "default");

CursorMan.setDefault("default", "default");
}

} // End of namespace Jade
Expand Down
38 changes: 38 additions & 0 deletions src/engines/kotor/kotor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#include "aurora/resman.h"
#include "aurora/talkman.h"

#include "graphics/cursorman.h"

#include "sound/sound.h"

#include "events/events.h"
Expand Down Expand Up @@ -132,6 +134,8 @@ void KotOREngine::run(const Common::UString &target) {
if (EventMan.quitRequested())
return;

CursorMan.set();

playMenuMusic();

while (!EventMan.quitRequested()) {
Expand Down Expand Up @@ -359,6 +363,40 @@ void KotOREngine::initCursorsRemap() {
void KotOREngine::initCursors() {
if (_platform == Aurora::kPlatformXbox)
return;

CursorMan.add("gui_mp_defaultd" , "default" , "down");
CursorMan.add("gui_mp_defaultu" , "default" , "up" );

CursorMan.add("gui_mp_bashd" , "bash" , "down");
CursorMan.add("gui_mp_bashu" , "bash" , "up" );
CursorMan.add("gui_mp_bashdp" , "bash+" , "down");
CursorMan.add("gui_mp_bashup" , "bash+" , "up" );
CursorMan.add("gui_mp_dismined" , "dismine" , "down");
CursorMan.add("gui_mp_dismineu" , "dismine" , "up" );
CursorMan.add("gui_mp_disminedp", "dismine+" , "down");
CursorMan.add("gui_mp_dismineup", "dismine+" , "up" );
CursorMan.add("gui_mp_doord" , "door" , "down");
CursorMan.add("gui_mp_dooru" , "door" , "up" );
CursorMan.add("gui_mp_doordp" , "door+" , "down");
CursorMan.add("gui_mp_doorup" , "door+" , "up" );
CursorMan.add("gui_mp_invalidd" , "invalid" , "down");
CursorMan.add("gui_mp_invalidu" , "invalid" , "up" );
CursorMan.add("gui_mp_killd" , "kill" , "down");
CursorMan.add("gui_mp_killu" , "kill" , "up" );
CursorMan.add("gui_mp_recmined" , "recmine" , "down");
CursorMan.add("gui_mp_recmineu" , "recmine" , "up" );
CursorMan.add("gui_mp_recminedp", "recmine+" , "down");
CursorMan.add("gui_mp_recmineup", "recmine+" , "up" );
CursorMan.add("gui_mp_selectd" , "select" , "down");
CursorMan.add("gui_mp_selectu" , "select" , "up" );
CursorMan.add("gui_mp_talkd" , "talk" , "down");
CursorMan.add("gui_mp_talku" , "talk" , "up" );
CursorMan.add("gui_mp_used" , "use" , "down");
CursorMan.add("gui_mp_useu" , "use" , "up" );
CursorMan.add("gui_mp_usedp" , "use+" , "down");
CursorMan.add("gui_mp_useup" , "use+" , "up" );

CursorMan.setDefault("default", "up");
}

void KotOREngine::initConfig() {
Expand Down
38 changes: 38 additions & 0 deletions src/engines/kotor2/kotor2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#include "aurora/resman.h"
#include "aurora/talkman.h"

#include "graphics/cursorman.h"

#include "sound/sound.h"

#include "events/events.h"
Expand Down Expand Up @@ -117,6 +119,8 @@ void KotOR2Engine::run(const Common::UString &target) {
if (EventMan.quitRequested())
return;

CursorMan.set();

playMenuMusic();

while (!EventMan.quitRequested()) {
Expand Down Expand Up @@ -307,6 +311,40 @@ void KotOR2Engine::initCursorsRemap() {
void KotOR2Engine::initCursors() {
if (_platform == Aurora::kPlatformXbox)
return;

CursorMan.add("gui_mp_defaultd" , "default" , "down");
CursorMan.add("gui_mp_defaultu" , "default" , "up" );

CursorMan.add("gui_mp_bashd" , "bash" , "down");
CursorMan.add("gui_mp_bashu" , "bash" , "up" );
CursorMan.add("gui_mp_bashdp" , "bash+" , "down");
CursorMan.add("gui_mp_bashup" , "bash+" , "up" );
CursorMan.add("gui_mp_dismined" , "dismine" , "down");
CursorMan.add("gui_mp_dismineu" , "dismine" , "up" );
CursorMan.add("gui_mp_disminedp", "dismine+" , "down");
CursorMan.add("gui_mp_dismineup", "dismine+" , "up" );
CursorMan.add("gui_mp_doord" , "door" , "down");
CursorMan.add("gui_mp_dooru" , "door" , "up" );
CursorMan.add("gui_mp_doordp" , "door+" , "down");
CursorMan.add("gui_mp_doorup" , "door+" , "up" );
CursorMan.add("gui_mp_invalidd" , "invalid" , "down");
CursorMan.add("gui_mp_invalidu" , "invalid" , "up" );
CursorMan.add("gui_mp_killd" , "kill" , "down");
CursorMan.add("gui_mp_killu" , "kill" , "up" );
CursorMan.add("gui_mp_recmined" , "recmine" , "down");
CursorMan.add("gui_mp_recmineu" , "recmine" , "up" );
CursorMan.add("gui_mp_recminedp", "recmine+" , "down");
CursorMan.add("gui_mp_recmineup", "recmine+" , "up" );
CursorMan.add("gui_mp_selectd" , "select" , "down");
CursorMan.add("gui_mp_selectu" , "select" , "up" );
CursorMan.add("gui_mp_talkd" , "talk" , "down");
CursorMan.add("gui_mp_talku" , "talk" , "up" );
CursorMan.add("gui_mp_used" , "use" , "down");
CursorMan.add("gui_mp_useu" , "use" , "up" );
CursorMan.add("gui_mp_usedp" , "use+" , "down");
CursorMan.add("gui_mp_useup" , "use+" , "up" );

CursorMan.setDefault("default", "up");
}

void KotOR2Engine::initConfig() {
Expand Down

0 comments on commit 4567ece

Please sign in to comment.