aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2018-03-20 12:37:02 +0100
committerEugene Sandulenko2018-03-28 17:36:57 +0200
commit1552128291f047fc10082642650ea202b17923a2 (patch)
tree6cfcab24be791533631d37c6fdfa2a33040e9496
parente92e7d5bf6c18453406445788d2b6810d5296ad7 (diff)
downloadscummvm-rg350-1552128291f047fc10082642650ea202b17923a2.tar.gz
scummvm-rg350-1552128291f047fc10082642650ea202b17923a2.tar.bz2
scummvm-rg350-1552128291f047fc10082642650ea202b17923a2.zip
LILLIPUT: Changes KValueType to kValueType
-rw-r--r--engines/lilliput/script.cpp6
-rw-r--r--engines/lilliput/script.h16
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 33ca6b1248..61dabc1d75 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -715,7 +715,7 @@ static const OpCode opCodes2[] = {
/* 0x65 */ { "OC_initGameAreaDisplay", 0, kNone, kNone, kNone, kNone, kNone }
};
-Common::String LilliputScript::getArgumentString(KValueType type, ScriptStream& script) {
+Common::String LilliputScript::getArgumentString(kValueType type, ScriptStream& script) {
Common::String str;
if (type == kImmediateValue) {
@@ -826,7 +826,7 @@ void LilliputScript::disasmScript(ScriptStream script) {
// op code type 1
assert(val < sizeof(opCodes1)/sizeof(OpCode));
const OpCode *opCode = &opCodes1[val];
- const KValueType *opArgType = &opCode->_arg1;
+ const kValueType *opArgType = &opCode->_arg1;
Common::String str;
@@ -867,7 +867,7 @@ void LilliputScript::disasmScript(ScriptStream script) {
// op code type 2
assert(val < sizeof(opCodes2) / sizeof(OpCode));
const OpCode *opCode = &opCodes2[val];
- const KValueType *opArgType = &opCode->_arg1;
+ const kValueType *opArgType = &opCode->_arg1;
Common::String str;
str = " ";
diff --git a/engines/lilliput/script.h b/engines/lilliput/script.h
index 0bb3efc509..ae0c8d8c22 100644
--- a/engines/lilliput/script.h
+++ b/engines/lilliput/script.h
@@ -41,7 +41,7 @@ enum kActionType {
kCodeEntered = 6
};
-enum KValueType {
+enum kValueType {
kNone,
kImmediateValue,
kCompareOperation,
@@ -54,11 +54,11 @@ enum KValueType {
struct OpCode {
const char* _opName;
int _numArgs;
- KValueType _arg1;
- KValueType _arg2;
- KValueType _arg3;
- KValueType _arg4;
- KValueType _arg5;
+ kValueType _arg1;
+ kValueType _arg2;
+ kValueType _arg3;
+ kValueType _arg4;
+ kValueType _arg5;
};
class LilliputScript {
@@ -95,7 +95,7 @@ public:
void disasmScript(ScriptStream script);
void listAllTexts();
- static Common::String getArgumentString(KValueType type, ScriptStream& script);
+ static Common::String getArgumentString(kValueType type, ScriptStream& script);
void runScript(ScriptStream script);
void runMenuScript(ScriptStream script);
private:
@@ -123,7 +123,7 @@ private:
int handleOpcode(ScriptStream *script);
byte handleOpcodeType1(int curWord);
void handleOpcodeType2(int curWord);
-
+
void enableCharacterScript(byte index, byte var1, byte *curBufPtr);
void sub17B6C(int var1);
void sub16C86(int index, byte *buf);