Skip to content

Commit

Permalink
LILLIPUT: Changes KValueType to kValueType
Browse files Browse the repository at this point in the history
  • Loading branch information
Joefish authored and sev- committed Mar 28, 2018
1 parent e92e7d5 commit 1552128
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions engines/lilliput/script.cpp
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 = " ";
Expand Down
16 changes: 8 additions & 8 deletions engines/lilliput/script.h
Expand Up @@ -41,7 +41,7 @@ enum kActionType {
kCodeEntered = 6
};

enum KValueType {
enum kValueType {
kNone,
kImmediateValue,
kCompareOperation,
Expand All @@ -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 {
Expand Down Expand Up @@ -95,7 +95,7 @@ class LilliputScript {

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:
Expand Down Expand Up @@ -123,7 +123,7 @@ class LilliputScript {
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);
Expand Down

0 comments on commit 1552128

Please sign in to comment.