libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle some mouse stuff

Browse Source
This commit is contained in:
Joel Teichroeb 2015-02-04 20:53:33 -08:00
parent 67bbc7d349
commit e3b19c5b48
6 changed files with 98 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/grim/grim.cpp
View File

@ -864,8 +864,24 @@ void GrimEngine::mainLoop() {
handleJoyAxis(event.joystick.axis, event.joystick.position);
if (type == Common::EVENT_JOYBUTTON_DOWN || type == Common::EVENT_JOYBUTTON_UP)
handleJoyButton(type, event.joystick.button);
if (type == Common::EVENT_LBUTTONDOWN) {
_cursorX = event.mouse.x;
_cursorY = event.mouse.y;
Common::KeyState k;
k.keycode = (Common::KeyCode)KEYCODE_MOUSE_B1;
handleControls(Common::EVENT_KEYDOWN, k);
}
if (type == Common::EVENT_MOUSEMOVE) {
_cursorX = event.mouse.x;
_cursorY = event.mouse.y;
handleMouseAxis(0, _cursorX);
handleMouseAxis(1, _cursorY);
}
}
if (_mode != PauseMode) {
// Draw the display scene before doing the luaUpdate.
// This give a large performance boost as OpenGL stores commands

5
engines/grim/grim.h
View File

@ -210,6 +210,7 @@ protected:
void handleControls(Common::EventType type, const Common::KeyState &key);
void handleChars(Common::EventType type, const Common::KeyState &key);
void handleJoyAxis(byte axis, int16 position);
void handleMouseAxis(byte axis, int16 position);
void handleJoyButton(Common::EventType type, byte button);
void handleExit();
void handlePause();
@ -294,6 +295,10 @@ protected:
Common::String _saveMeta3;
Commentary *_commentary;
public:
int _cursorX;
int _cursorY;
};
extern GrimEngine *g_grim;

13
engines/grim/grim_controls.cpp
View File

@ -353,6 +353,19 @@ void GrimEngine::handleJoyAxis(byte axis, int16 position) {
}
}
void GrimEngine::handleMouseAxis(byte axis, int16 position) {
int keycode = KEYCODE_AXIS_MOUSE_X;
if (!_controlsEnabled[keycode])
return;
LuaObjects objects;
objects.add(keycode);
objects.add(position);
if (!LuaBase::instance()->callback("axisHandler", objects)) {
error("handleJoyAxis: invalid joystick handler");
}
}
void GrimEngine::handleJoyButton(Common::EventType operation, byte button) {
if (button > NUM_JOY_BUTTONS)
return;

71
engines/grim/remastered/lua_remastered.cpp
View File

@ -27,6 +27,7 @@
#include "engines/grim/remastered/lua_remastered.h"
#include "engines/grim/remastered/overlay.h"
#include "engines/grim/remastered/hotspot.h"
#include "engines/grim/grim.h"
#include "engines/grim/font.h"
@ -168,9 +169,45 @@ void Lua_Remastered::OverlayMove() {
}
void Lua_Remastered::QueryActiveHotspots() {
warning("Stub function: QueryActiveHotspots, returns empty table");
lua_Object resObj = lua_createtable();
lua_pushobject(resObj);
lua_Object param = lua_getparam(1);
assert(lua_isnumber(param));
warning("Stub function: QueryActiveHotspots(%d)", lua_getnumber(param));
lua_Object result = lua_createtable();
int count = 0;
foreach (Hotspot *h, Hotspot::getPool()) {
lua_Object inner = lua_createtable();
lua_pushobject(inner);
lua_pushstring("type");
lua_pushstring("normal");
lua_settable();
lua_pushobject(inner);
lua_pushstring("cursor");
lua_pushnumber(0);
lua_settable();
lua_pushobject(inner);
lua_pushstring("id");
lua_pushstring(h->_name.c_str());
lua_settable();
lua_pushobject(inner);
lua_pushstring("obj");
lua_pushusertag(h->getId(), h->getTag());
lua_settable();
lua_pushobject(result);
lua_pushnumber(count++);
lua_pushobject(inner);
lua_settable();
}
lua_pushobject(result);
}
void Lua_Remastered::GetLanguage() {
@ -185,9 +222,16 @@ void Lua_Remastered::SaveRegistryToDisk() {
}
void Lua_Remastered::GetCursorPosition() {
warning("Stub function: GetCursorPosition, returns 0, 0");
lua_pushnumber(0);
lua_pushnumber(0);
lua_pushnumber(g_grim->_cursorX);
lua_pushnumber(g_grim->_cursorX);
}
void Lua_Remastered::SetCursor() {
lua_Object param1 = lua_getparam(1);
assert(lua_isnumber(param1));
warning("Stub function: SetCursor(%d)", lua_getnumber(param1));
}
void Lua_Remastered::GetPlatform() {
@ -366,7 +410,16 @@ void Lua_Remastered::AddHotspot() {
}
warning("Stub function: AddHotspot(%s, %f, %f, %f, %f, %f, %f, %f, %s, %s, %f)", lua_getstring(param1), lua_getnumber(param2), lua_getnumber(param3), lua_getnumber(param4), lua_getnumber(param5), lua_getnumber(param6), lua_getnumber(param7), lua_getnumber(param8), p9str, p10str, lua_getnumber(param11));
lua_pushnil();
Hotspot *hotspot = new Hotspot(lua_getstring(param1), lua_getnumber(param2), lua_getnumber(param3), lua_getnumber(param4), lua_getnumber(param5));
lua_pushusertag(hotspot->getId(), hotspot->getTag());
}
void Lua_Remastered::RemoveHotspot() {
lua_Object hotspotObj = lua_getparam(1);
Hotspot *hotspot = Hotspot::getPool().getObject(lua_getuserdata(hotspotObj));
delete hotspot;
}
void Lua_Remastered::GlobalSaveResolved() {
@ -543,10 +596,8 @@ STUB_FUNC(Lua_Remastered::DestroyAllUIButtonsImmediately)
STUB_FUNC(Lua_Remastered::UpdateUIButtons)
STUB_FUNC(Lua_Remastered::OverlayClearCache)
STUB_FUNC(Lua_Remastered::LinkHotspot)
STUB_FUNC(Lua_Remastered::RemoveHotspot)
STUB_FUNC(Lua_Remastered::UpdateHotspot)
STUB_FUNC(Lua_Remastered::HideMouseCursor)
STUB_FUNC(Lua_Remastered::SetCursor)
STUB_FUNC(Lua_Remastered::UpdateMouseCursor)
STUB_FUNC(Lua_Remastered::SetActorHKHackMode)
STUB_FUNC(Lua_Remastered::CacheCurrentWalkVector)
@ -558,6 +609,7 @@ STUB_FUNC(Lua_Remastered::RemoveBorders)
STUB_FUNC(Lua_Remastered::GetSaveStatus)
STUB_FUNC(Lua_Remastered::StartCheckOfCrossSaveStatus)
STUB_FUNC(Lua_Remastered::GetCrossSaveStatus)
STUB_FUNC(Lua_Remastered::GetFloorWalkPos)
struct luaL_reg remasteredMainOpcodes[] = {
@ -624,6 +676,7 @@ struct luaL_reg remasteredMainOpcodes[] = {
{ "GetSaveStatus", LUA_OPCODE(Lua_Remastered, GetSaveStatus) },
{ "StartCheckOfCrossSaveStatus", LUA_OPCODE(Lua_Remastered, StartCheckOfCrossSaveStatus) },
{ "GetCrossSaveStatus", LUA_OPCODE(Lua_Remastered, GetCrossSaveStatus) },
{ "GetFloorWalkPos", LUA_OPCODE(Lua_Remastered, GetFloorWalkPos) },
};
void Lua_Remastered::registerOpcodes() {

1
engines/grim/remastered/lua_remastered.h
View File

@ -105,6 +105,7 @@ protected:
DECLARE_LUA_OPCODE(GetSaveStatus);
DECLARE_LUA_OPCODE(StartCheckOfCrossSaveStatus);
DECLARE_LUA_OPCODE(GetCrossSaveStatus);
DECLARE_LUA_OPCODE(GetFloorWalkPos);
};
} // end of namespace Grim

2
engines/grim/resource.cpp
View File

@ -121,7 +121,6 @@ ResourceLoader::ResourceLoader() {
warning("residualvm-grim-patch.lab not found");
//SearchMan.listMatchingMembers(files, "residualvm-grim-patch.lab");
SearchMan.listMatchingMembers(files, "images.lab");
SearchMan.listMatchingMembers(files, "data005.lab");
SearchMan.listMatchingMembers(files, "data004.lab");
SearchMan.listMatchingMembers(files, "data003.lab");
@ -136,6 +135,7 @@ ResourceLoader::ResourceLoader() {
if (g_grim->getGameFlags() & ADGF_REMASTERED) {
SearchMan.listMatchingMembers(files, "commentary.lab");
SearchMan.listMatchingMembers(files, "images.lab");
}
//Sort the archives in order to ensure that they are loaded with the correct order
Common::sort(files.begin(), files.end(), LabListComperator());