aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/input
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-02 11:54:44 +0000
committerEugene Sandulenko2010-10-12 23:26:48 +0000
commit0cdb2ded85d17150cb108a5d63dd8957c29af2a5 (patch)
tree8d3d48b7ad1c0fd1888b90a8ad2e8b86de0393b5 /engines/sword25/input
parent56878b0e62d65aae1b0eba76a2ca2553fbaf1288 (diff)
downloadscummvm-rg350-0cdb2ded85d17150cb108a5d63dd8957c29af2a5.tar.gz
scummvm-rg350-0cdb2ded85d17150cb108a5d63dd8957c29af2a5.tar.bz2
scummvm-rg350-0cdb2ded85d17150cb108a5d63dd8957c29af2a5.zip
SWORD25: unsigned char -> byte
svn-id: r53308
Diffstat (limited to 'engines/sword25/input')
-rw-r--r--engines/sword25/input/inputengine.h2
-rw-r--r--engines/sword25/input/inputengine_script.cpp2
-rw-r--r--engines/sword25/input/scummvminput.cpp2
-rw-r--r--engines/sword25/input/scummvminput.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/input/inputengine.h b/engines/sword25/input/inputengine.h
index a951f93f40..f604311384 100644
--- a/engines/sword25/input/inputengine.h
+++ b/engines/sword25/input/inputengine.h
@@ -296,7 +296,7 @@ public:
*/
virtual bool UnregisterCommandCallback(CommandCallback Callback) = 0;
- virtual void ReportCharacter(unsigned char Character) = 0;
+ virtual void ReportCharacter(byte Character) = 0;
virtual void ReportCommand(KEY_COMMANDS Command) = 0;
private:
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index d80cc93698..ef443a62d3 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -244,7 +244,7 @@ static int SetMouseY(lua_State *L) {
// -----------------------------------------------------------------------------
static void TheCharacterCallback(int Character) {
- CharacterCallbackPtr->Character = static_cast<unsigned char>(Character);
+ CharacterCallbackPtr->Character = static_cast<byte>(Character);
lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
CharacterCallbackPtr->InvokeCallbackFunctions(L, 1);
}
diff --git a/engines/sword25/input/scummvminput.cpp b/engines/sword25/input/scummvminput.cpp
index 0492b010d4..b1ef1c8869 100644
--- a/engines/sword25/input/scummvminput.cpp
+++ b/engines/sword25/input/scummvminput.cpp
@@ -303,7 +303,7 @@ bool ScummVMInput::UnregisterCommandCallback(CommandCallback Callback) {
// -----------------------------------------------------------------------------
-void ScummVMInput::ReportCharacter(unsigned char Character) {
+void ScummVMInput::ReportCharacter(byte Character) {
Common::List<CharacterCallback>::const_iterator CallbackIter = m_CharacterCallbacks.begin();
while (CallbackIter != m_CharacterCallbacks.end()) {
// Iterator vor dem Aufruf erhöhen und im Folgendem auf einer Kopie arbeiten.
diff --git a/engines/sword25/input/scummvminput.h b/engines/sword25/input/scummvminput.h
index c336dbf515..9bf1c45daa 100644
--- a/engines/sword25/input/scummvminput.h
+++ b/engines/sword25/input/scummvminput.h
@@ -69,7 +69,7 @@ public:
virtual bool UnregisterCharacterCallback(CallbackPtr Callback);
virtual bool RegisterCommandCallback(CallbackPtr Callback);
virtual bool UnregisterCommandCallback(CallbackPtr Callback);
- virtual void ReportCharacter(unsigned char Character);
+ virtual void ReportCharacter(byte Character);
virtual void ReportCommand(KEY_COMMANDS Command);
bool Persist(OutputPersistenceBlock &Writer);