[Scummvm-git-logs] scummvm master -> 30f4e2d3e5f08d557552380cc7af12a837337fab
grisenti
noreply at scummvm.org
Tue Apr 4 21:09:30 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
30f4e2d3e5 HPL1: rename iLowLevelInput to LowLevelInput
Commit: 30f4e2d3e5f08d557552380cc7af12a837337fab
https://github.com/scummvm/scummvm/commit/30f4e2d3e5f08d557552380cc7af12a837337fab
Author: grisenti (emanuele at grisenti.net)
Date: 2023-04-04T23:09:10+02:00
Commit Message:
HPL1: rename iLowLevelInput to LowLevelInput
Changed paths:
engines/hpl1/engine/game/low_level_game_setup.cpp
engines/hpl1/engine/game/low_level_game_setup.h
engines/hpl1/engine/impl/KeyboardSDL.cpp
engines/hpl1/engine/impl/KeyboardSDL.h
engines/hpl1/engine/impl/MouseSDL.cpp
engines/hpl1/engine/impl/MouseSDL.h
engines/hpl1/engine/input/Input.cpp
engines/hpl1/engine/input/Input.h
engines/hpl1/engine/input/LowLevelInput.cpp
engines/hpl1/engine/input/LowLevelInput.h
diff --git a/engines/hpl1/engine/game/low_level_game_setup.cpp b/engines/hpl1/engine/game/low_level_game_setup.cpp
index e90b9cd3829..44ca38504ba 100644
--- a/engines/hpl1/engine/game/low_level_game_setup.cpp
+++ b/engines/hpl1/engine/game/low_level_game_setup.cpp
@@ -48,7 +48,7 @@ static iLowLevelGraphics *createLowLevelGfx() {
LowLevelGameSetup::LowLevelGameSetup() {
_lowLevelSystem = hplNew(LowLevelSystem, ());
_lowLevelGraphics = createLowLevelGfx();
- _lowLevelInput = hplNew(iLowLevelInput, (_lowLevelGraphics));
+ _lowLevelInput = hplNew(LowLevelInput, (_lowLevelGraphics));
_lowLevelResources = hplNew(LowLevelResources, (_lowLevelGraphics));
_lowLevelSound = hplNew(cLowLevelSoundOpenAL, ());
_lowLevelPhysics = hplNew(cLowLevelPhysicsNewton, ());
diff --git a/engines/hpl1/engine/game/low_level_game_setup.h b/engines/hpl1/engine/game/low_level_game_setup.h
index a73a53ab679..4fa90593ad8 100644
--- a/engines/hpl1/engine/game/low_level_game_setup.h
+++ b/engines/hpl1/engine/game/low_level_game_setup.h
@@ -57,7 +57,7 @@ public:
private:
LowLevelSystem *_lowLevelSystem;
iLowLevelGraphics *_lowLevelGraphics;
- iLowLevelInput *_lowLevelInput;
+ LowLevelInput *_lowLevelInput;
LowLevelResources *_lowLevelResources;
iLowLevelSound *_lowLevelSound;
iLowLevelPhysics *_lowLevelPhysics;
diff --git a/engines/hpl1/engine/impl/KeyboardSDL.cpp b/engines/hpl1/engine/impl/KeyboardSDL.cpp
index 99dbc57eade..7ec909ba3a6 100644
--- a/engines/hpl1/engine/impl/KeyboardSDL.cpp
+++ b/engines/hpl1/engine/impl/KeyboardSDL.cpp
@@ -34,7 +34,7 @@ namespace hpl {
//-----------------------------------------------------------------------
-cKeyboardSDL::cKeyboardSDL(iLowLevelInput *apLowLevelInputSDL) : iKeyboard("SDL Portable Keyboard") {
+cKeyboardSDL::cKeyboardSDL(LowLevelInput *apLowLevelInputSDL) : iKeyboard("SDL Portable Keyboard") {
_lowLevelSystem = apLowLevelInputSDL;
_downKeys.set_size(eKey_LastEnum);
diff --git a/engines/hpl1/engine/impl/KeyboardSDL.h b/engines/hpl1/engine/impl/KeyboardSDL.h
index 89d642a3a85..a4d20d7344a 100644
--- a/engines/hpl1/engine/impl/KeyboardSDL.h
+++ b/engines/hpl1/engine/impl/KeyboardSDL.h
@@ -43,11 +43,11 @@ namespace hpl {
#define MAX_KEY_PRESSES (20)
-class iLowLevelInput;
+class LowLevelInput;
class cKeyboardSDL : public iKeyboard {
public:
- cKeyboardSDL(iLowLevelInput *apLowLevelInputSDL);
+ cKeyboardSDL(LowLevelInput *apLowLevelInputSDL);
void Update();
@@ -66,7 +66,7 @@ private:
eKeyModifier _modifiers;
Common::BitArray _downKeys;
Common::Queue<cKeyPress> _pressedKeys;
- iLowLevelInput *_lowLevelSystem;
+ LowLevelInput *_lowLevelSystem;
};
} // namespace hpl
diff --git a/engines/hpl1/engine/impl/MouseSDL.cpp b/engines/hpl1/engine/impl/MouseSDL.cpp
index e238afe950a..c48e394a3f7 100644
--- a/engines/hpl1/engine/impl/MouseSDL.cpp
+++ b/engines/hpl1/engine/impl/MouseSDL.cpp
@@ -40,7 +40,7 @@ namespace hpl {
//-----------------------------------------------------------------------
-cMouseSDL::cMouseSDL(iLowLevelInput *apLowLevelInputSDL, iLowLevelGraphics *apLowLevelGraphics) : iMouse("SDL Portable Mouse") {
+cMouseSDL::cMouseSDL(LowLevelInput *apLowLevelInputSDL, iLowLevelGraphics *apLowLevelGraphics) : iMouse("SDL Portable Mouse") {
mfMaxPercent = 0.7f;
mfMinPercent = 0.1f;
mlBufferSize = 6;
diff --git a/engines/hpl1/engine/impl/MouseSDL.h b/engines/hpl1/engine/impl/MouseSDL.h
index 15eb1c6651f..ddf9cc226a6 100644
--- a/engines/hpl1/engine/impl/MouseSDL.h
+++ b/engines/hpl1/engine/impl/MouseSDL.h
@@ -38,11 +38,11 @@ struct Event;
namespace hpl {
class iLowLevelGraphics;
-class iLowLevelInput;
+class LowLevelInput;
class cMouseSDL : public iMouse {
public:
- cMouseSDL(iLowLevelInput *apLowLevelInputSDL, iLowLevelGraphics *apLowLevelGraphics);
+ cMouseSDL(LowLevelInput *apLowLevelInputSDL, iLowLevelGraphics *apLowLevelGraphics);
bool ButtonIsDown(eMButton);
@@ -80,7 +80,7 @@ private:
float mfMaxPercent;
float mfMinPercent;
int mlBufferSize;
- iLowLevelInput *_lowLevelInputSDL;
+ LowLevelInput *_lowLevelInputSDL;
iLowLevelGraphics *_lowLevelGraphics;
};
diff --git a/engines/hpl1/engine/input/Input.cpp b/engines/hpl1/engine/input/Input.cpp
index d5b5a8065b1..219d29e9b23 100644
--- a/engines/hpl1/engine/input/Input.cpp
+++ b/engines/hpl1/engine/input/Input.cpp
@@ -41,7 +41,7 @@ namespace hpl {
//-----------------------------------------------------------------------
-cInput::cInput(iLowLevelInput *apLowLevelInput) : iUpdateable("HPL_Input") {
+cInput::cInput(LowLevelInput *apLowLevelInput) : iUpdateable("HPL_Input") {
mpLowLevelInput = apLowLevelInput;
mpKeyboard = mpLowLevelInput->CreateKeyboard();
diff --git a/engines/hpl1/engine/input/Input.h b/engines/hpl1/engine/input/Input.h
index 5711c164062..4313cb477c7 100644
--- a/engines/hpl1/engine/input/Input.h
+++ b/engines/hpl1/engine/input/Input.h
@@ -39,7 +39,7 @@ namespace hpl {
class iKeyboard;
class iMouse;
-class iLowLevelInput;
+class LowLevelInput;
class iInputDevice;
class iAction;
@@ -54,7 +54,7 @@ typedef tInputDeviceList::iterator tInputDeviceListIt;
class cInput : public iUpdateable {
public:
- cInput(iLowLevelInput *apLowLevelInput);
+ cInput(LowLevelInput *apLowLevelInput);
~cInput();
/**
@@ -133,13 +133,13 @@ public:
*/
iAction *InputToAction(const tString &asName);
- iLowLevelInput *GetLowLevel() { return mpLowLevelInput; }
+ LowLevelInput *GetLowLevel() { return mpLowLevelInput; }
private:
tActionMap m_mapActions;
tInputDeviceList mlstInputDevices;
- iLowLevelInput *mpLowLevelInput;
+ LowLevelInput *mpLowLevelInput;
iMouse *mpMouse;
iKeyboard *mpKeyboard;
diff --git a/engines/hpl1/engine/input/LowLevelInput.cpp b/engines/hpl1/engine/input/LowLevelInput.cpp
index 32de3d5eb4f..959a8678120 100644
--- a/engines/hpl1/engine/input/LowLevelInput.cpp
+++ b/engines/hpl1/engine/input/LowLevelInput.cpp
@@ -36,20 +36,20 @@ namespace hpl {
//-----------------------------------------------------------------------
-iLowLevelInput::iLowLevelInput(iLowLevelGraphics *apLowLevelGraphics) {
+LowLevelInput::LowLevelInput(iLowLevelGraphics *apLowLevelGraphics) {
_lowLevelGraphics = apLowLevelGraphics;
LockInput(true);
}
//-----------------------------------------------------------------------
-void iLowLevelInput::LockInput(bool abX) {
+void LowLevelInput::LockInput(bool abX) {
g_system->lockMouse(abX);
}
//-----------------------------------------------------------------------
-void iLowLevelInput::BeginInputUpdate() {
+void LowLevelInput::BeginInputUpdate() {
Common::Event event;
while (g_system->getEventManager()->pollEvent(event)) {
_events.push_back(event);
@@ -58,19 +58,19 @@ void iLowLevelInput::BeginInputUpdate() {
//-----------------------------------------------------------------------
-void iLowLevelInput::EndInputUpdate() {
+void LowLevelInput::EndInputUpdate() {
_events.clear();
}
//-----------------------------------------------------------------------
-iMouse *iLowLevelInput::CreateMouse() {
+iMouse *LowLevelInput::CreateMouse() {
return hplNew(cMouseSDL, (this, _lowLevelGraphics));
}
//-----------------------------------------------------------------------
-iKeyboard *iLowLevelInput::CreateKeyboard() {
+iKeyboard *LowLevelInput::CreateKeyboard() {
return hplNew(cKeyboardSDL, (this));
}
diff --git a/engines/hpl1/engine/input/LowLevelInput.h b/engines/hpl1/engine/input/LowLevelInput.h
index 632e09c244a..12c4ef3f115 100644
--- a/engines/hpl1/engine/input/LowLevelInput.h
+++ b/engines/hpl1/engine/input/LowLevelInput.h
@@ -37,12 +37,12 @@ class iMouse;
class iKeyboard;
class iLowLevelGraphics;
-class iLowLevelInput {
+class LowLevelInput {
friend class cKeyboardSDL;
friend class cMouseSDL;
public:
- iLowLevelInput(iLowLevelGraphics *graphics);
+ LowLevelInput(iLowLevelGraphics *graphics);
/**
* Lock all input to current window.
* \param abX
More information about the Scummvm-git-logs
mailing list