[Scummvm-git-logs] scummvm master -> 91d1a7ac41857520297e26b83b7bd582d9a2aa1a
sev-
sev at scummvm.org
Tue Jan 14 19:36:37 UTC 2020
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:
91d1a7ac41 DIRECTOR: JANITORIAL: Whitespace formatting
Commit: 91d1a7ac41857520297e26b83b7bd582d9a2aa1a
https://github.com/scummvm/scummvm/commit/91d1a7ac41857520297e26b83b7bd582d9a2aa1a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T20:05:34+01:00
Commit Message:
DIRECTOR: JANITORIAL: Whitespace formatting
Changed paths:
engines/director/lingo/lingo-bytecode.cpp
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index b5b46d0..9bf66a7 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -32,151 +32,151 @@
namespace Director {
static LingoV4Bytecode lingoV4[] = {
- { 0x01, LC::c_procret, "" },
- { 0x03, LC::c_voidpush, "" },
- { 0x04, LC::c_mul, "" },
- { 0x05, LC::c_add, "" },
- { 0x06, LC::c_sub, "" },
- { 0x07, LC::c_div, "" },
- { 0x08, LC::c_mod, "" },
- { 0x09, LC::c_negate, "" },
- { 0x0a, LC::c_ampersand, "" },
- { 0x0b, LC::c_concat, "" },
- { 0x0c, LC::c_lt, "" },
- { 0x0d, LC::c_le, "" },
- { 0x0e, LC::c_neq, "" },
- { 0x0f, LC::c_eq, "" },
- { 0x10, LC::c_gt, "" },
- { 0x11, LC::c_ge, "" },
- { 0x12, LC::c_and, "" },
- { 0x13, LC::c_or, "" },
- { 0x14, LC::c_not, "" },
- { 0x15, LC::c_contains, "" },
- { 0x16, LC::c_starts, "" },
- { 0x17, LC::c_of, "" },
- { 0x18, LC::c_hilite, "" },
- { 0x19, LC::c_intersects, "" },
- { 0x1a, LC::c_within, "" },
- { 0x1b, LC::cb_field, "" },
- { 0x1c, LC::c_tell, "" },
- { 0x1d, LC::c_telldone, "" },
- { 0x41, LC::c_intpush, "b" },
- { 0x42, LC::c_argcpush, "b" },
- { 0x43, LC::c_argcnoretpush, "b" },
+ { 0x01, LC::c_procret, "" },
+ { 0x03, LC::c_voidpush, "" },
+ { 0x04, LC::c_mul, "" },
+ { 0x05, LC::c_add, "" },
+ { 0x06, LC::c_sub, "" },
+ { 0x07, LC::c_div, "" },
+ { 0x08, LC::c_mod, "" },
+ { 0x09, LC::c_negate, "" },
+ { 0x0a, LC::c_ampersand, "" },
+ { 0x0b, LC::c_concat, "" },
+ { 0x0c, LC::c_lt, "" },
+ { 0x0d, LC::c_le, "" },
+ { 0x0e, LC::c_neq, "" },
+ { 0x0f, LC::c_eq, "" },
+ { 0x10, LC::c_gt, "" },
+ { 0x11, LC::c_ge, "" },
+ { 0x12, LC::c_and, "" },
+ { 0x13, LC::c_or, "" },
+ { 0x14, LC::c_not, "" },
+ { 0x15, LC::c_contains, "" },
+ { 0x16, LC::c_starts, "" },
+ { 0x17, LC::c_of, "" },
+ { 0x18, LC::c_hilite, "" },
+ { 0x19, LC::c_intersects, "" },
+ { 0x1a, LC::c_within, "" },
+ { 0x1b, LC::cb_field, "" },
+ { 0x1c, LC::c_tell, "" },
+ { 0x1d, LC::c_telldone, "" },
+ { 0x41, LC::c_intpush, "b" },
+ { 0x42, LC::c_argcpush, "b" },
+ { 0x43, LC::c_argcnoretpush,"b" },
// 0x44, push a constant
- { 0x45, LC::c_namepush, "b" },
- { 0x53, LC::c_jump, "jb" },
- { 0x54, LC::c_jump, "jbn" },
- { 0x55, LC::c_jumpifz, "jb" },
- { 0x56, LC::cb_localcall, "b" },
- { 0x57, LC::cb_call, "b" },
- { 0x59, LC::cb_v4putvalue, "b" },
+ { 0x45, LC::c_namepush, "b" },
+ { 0x53, LC::c_jump, "jb" },
+ { 0x54, LC::c_jump, "jbn" },
+ { 0x55, LC::c_jumpifz, "jb" },
+ { 0x56, LC::cb_localcall, "b" },
+ { 0x57, LC::cb_call, "b" },
+ { 0x59, LC::cb_v4putvalue, "b" },
{ 0x5c, LC::cb_v4theentitypush, "b" },
{ 0x5d, LC::cb_v4theentityassign, "b" },
{ 0x66, LC::cb_v4theentitynamepush, "b" },
- { 0x81, LC::c_intpush, "w" },
- { 0x82, LC::c_argcpush, "w" },
- { 0x83, LC::c_argcnoretpush, "w" },
+ { 0x81, LC::c_intpush, "w" },
+ { 0x82, LC::c_argcpush, "w" },
+ { 0x83, LC::c_argcnoretpush,"w" },
// 0x84, push a constant
- { 0x93, LC::c_jump, "jw" },
- { 0x94, LC::c_jump, "jwn" },
- { 0x95, LC::c_jumpifz, "jw" },
+ { 0x93, LC::c_jump, "jw" },
+ { 0x94, LC::c_jump, "jwn" },
+ { 0x95, LC::c_jumpifz, "jw" },
{ 0, 0, 0 }
};
static LingoV4TheEntity lingoV4TheEntity[] = {
- { 0x00, 0x00, kTheFloatPrecision, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x01, kTheMouseDownScript, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x02, kTheMouseUpScript, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x03, kTheKeyDownScript, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x04, kTheKeyUpScript, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x05, kTheTimeoutScript, kTheNOField, true, kTEANOArgs },
- { 0x00, 0x06, kTheTime, kTheShort, false, kTEANOArgs },
- { 0x00, 0x07, kTheTime, kTheAbbr, false, kTEANOArgs },
- { 0x00, 0x08, kTheTime, kTheLong, false, kTEANOArgs },
- { 0x00, 0x09, kTheDate, kTheShort, false, kTEANOArgs },
- { 0x00, 0x0a, kTheDate, kTheAbbr, false, kTEANOArgs },
- { 0x00, 0x0b, kTheDate, kTheLong, false, kTEANOArgs },
- { 0x00, 0x0c, kTheChars, kTheLast, false, kTEAString },
- { 0x00, 0x0d, kTheWords, kTheLast, false, kTEAString },
- { 0x00, 0x0e, kTheItems, kTheLast, false, kTEAString },
- { 0x00, 0x0f, kTheLines, kTheLast, false, kTEAString },
- { 0x01, 0x01, kTheChars, kTheNumber, false, kTEAString },
- { 0x01, 0x02, kTheWords, kTheNumber, false, kTEAString },
- { 0x01, 0x03, kTheItems, kTheNumber, false, kTEAString },
- { 0x01, 0x04, kTheLines, kTheNumber, false, kTEAString },
- { 0x02, 0x01, kTheMenu, kTheName, false, kTEAItemId },
- { 0x02, 0x02, kTheMenuItems, kTheNumber, false, kTEAItemId },
- { 0x03, 0x01, kTheMenuItem, kTheName, true, kTEAMenuIdItemId },
- { 0x03, 0x02, kTheMenuItem, kTheCheckMark, true, kTEAMenuIdItemId },
- { 0x03, 0x03, kTheMenuItem, kTheEnabled, true, kTEAMenuIdItemId },
- { 0x03, 0x04, kTheMenuItem, kTheScript, true, kTEAMenuIdItemId },
- { 0x04, 0x01, kTheSound, kTheVolume, true, kTEAItemId },
- { 0x06, 0x01, kTheSprite, kTheCursor, true, kTEAItemId },
- { 0x06, 0x02, kTheSprite, kTheBackColor, true, kTEAItemId },
- { 0x06, 0x03, kTheSprite, kTheBottom, true, kTEAItemId },
- { 0x06, 0x04, kTheSprite, kTheCastNum, true, kTEAItemId },
- { 0x06, 0x05, kTheSprite, kTheConstraint, true, kTEAItemId },
- { 0x06, 0x06, kTheSprite, kTheCursor, true, kTEAItemId },
- { 0x06, 0x07, kTheSprite, kTheForeColor, true, kTEAItemId },
- { 0x06, 0x08, kTheSprite, kTheHeight, true, kTEAItemId },
- { 0x06, 0x0a, kTheSprite, kTheInk, true, kTEAItemId },
- { 0x06, 0x0b, kTheSprite, kTheLeft, true, kTEAItemId },
- { 0x06, 0x0c, kTheSprite, kTheLineSize, true, kTEAItemId },
- { 0x06, 0x0d, kTheSprite, kTheLocH, true, kTEAItemId },
- { 0x06, 0x0e, kTheSprite, kTheLocV, true, kTEAItemId },
- { 0x06, 0x0f, kTheSprite, kTheMovieRate, true, kTEAItemId },
- { 0x06, 0x10, kTheSprite, kTheMovieTime, true, kTEAItemId },
- { 0x06, 0x12, kTheSprite, kThePuppet, true, kTEAItemId },
- { 0x06, 0x13, kTheSprite, kTheRight, true, kTEAItemId },
- { 0x06, 0x14, kTheSprite, kTheStartTime, true, kTEAItemId },
- { 0x06, 0x15, kTheSprite, kTheStopTime, true, kTEAItemId },
- { 0x06, 0x16, kTheSprite, kTheStretch, true, kTEAItemId },
- { 0x06, 0x17, kTheSprite, kTheTop, true, kTEAItemId },
- { 0x06, 0x18, kTheSprite, kTheTrails, true, kTEAItemId },
- { 0x06, 0x19, kTheSprite, kTheVisible, true, kTEAItemId },
- { 0x06, 0x1a, kTheSprite, kTheVolume, true, kTEAItemId },
- { 0x06, 0x1b, kTheSprite, kTheWidth, true, kTEAItemId },
- { 0x06, 0x1d, kTheSprite, kTheScriptNum, true, kTEAItemId },
- { 0x06, 0x1e, kTheSprite, kTheMoveableSprite, true, kTEAItemId },
- { 0x06, 0x20, kTheSprite, kTheScoreColor, true, kTEAItemId },
- { 0x07, 0x01, kTheBeepOn, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x02, kTheButtonStyle, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x03, kTheCenterStage, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x04, kTheCheckBoxAccess, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x05, kTheCheckBoxType, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x06, kTheColorDepth, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x08, kTheExitLock, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x09, kTheFixStageSize, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x13, kTheTimeoutLapsed, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x17, kTheSelEnd, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x18, kTheSelStart, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x19, kTheSoundEnabled, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x1a, kTheSoundLevel, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x1b, kTheStageColor, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x1d, kTheStillDown, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x1e, kTheTimeoutKeyDown, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x1f, kTheTimeoutLength, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x20, kTheTimeoutMouse, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x21, kTheTimeoutPlay, kTheNOField, true, kTEANOArgs },
- { 0x07, 0x22, kTheTimer, kTheNOField, true, kTEANOArgs },
- { 0x08, 0x01, kThePerFrameHook, kTheNOField, false, kTEANOArgs },
- { 0x08, 0x02, kTheCastMembers, kTheNumber, false, kTEANOArgs },
- { 0x08, 0x03, kTheMenus, kTheNumber, false, kTEANOArgs },
- { 0x09, 0x01, kTheCast, kTheName, true, kTEAItemId },
- { 0x09, 0x02, kTheCast, kTheText, true, kTEAItemId },
- { 0x09, 0x08, kTheCast, kThePicture, true, kTEAItemId },
- { 0x09, 0x0a, kTheCast, kTheNumber, true, kTEAItemId },
- { 0x09, 0x0b, kTheCast, kTheSize, true, kTEAItemId },
- { 0x09, 0x11, kTheCast, kTheForeColor, true, kTEAItemId },
- { 0x09, 0x12, kTheCast, kTheBackColor, true, kTEAItemId },
- { 0x0c, 0x03, kTheField, kTheTextStyle, true, kTEAItemId },
- { 0x0c, 0x04, kTheField, kTheTextFont, true, kTEAItemId },
- { 0x0c, 0x05, kTheField, kTheTextHeight, true, kTEAItemId },
- { 0x0c, 0x06, kTheField, kTheTextAlign, true, kTEAItemId },
- { 0x0c, 0x07, kTheField, kTheTextSize, true, kTEAItemId },
- { 0x0d, 0x0f, kTheCast, kTheDirectToStage, true, kTEAItemId },
- { 0x0d, 0x10, kTheCast, kTheSound, true, kTEAItemId },
+ { 0x00, 0x00, kTheFloatPrecision, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x01, kTheMouseDownScript, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x02, kTheMouseUpScript, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x03, kTheKeyDownScript, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x04, kTheKeyUpScript, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x05, kTheTimeoutScript, kTheNOField, true, kTEANOArgs },
+ { 0x00, 0x06, kTheTime, kTheShort, false, kTEANOArgs },
+ { 0x00, 0x07, kTheTime, kTheAbbr, false, kTEANOArgs },
+ { 0x00, 0x08, kTheTime, kTheLong, false, kTEANOArgs },
+ { 0x00, 0x09, kTheDate, kTheShort, false, kTEANOArgs },
+ { 0x00, 0x0a, kTheDate, kTheAbbr, false, kTEANOArgs },
+ { 0x00, 0x0b, kTheDate, kTheLong, false, kTEANOArgs },
+ { 0x00, 0x0c, kTheChars, kTheLast, false, kTEAString },
+ { 0x00, 0x0d, kTheWords, kTheLast, false, kTEAString },
+ { 0x00, 0x0e, kTheItems, kTheLast, false, kTEAString },
+ { 0x00, 0x0f, kTheLines, kTheLast, false, kTEAString },
+ { 0x01, 0x01, kTheChars, kTheNumber, false, kTEAString },
+ { 0x01, 0x02, kTheWords, kTheNumber, false, kTEAString },
+ { 0x01, 0x03, kTheItems, kTheNumber, false, kTEAString },
+ { 0x01, 0x04, kTheLines, kTheNumber, false, kTEAString },
+ { 0x02, 0x01, kTheMenu, kTheName, false, kTEAItemId },
+ { 0x02, 0x02, kTheMenuItems, kTheNumber, false, kTEAItemId },
+ { 0x03, 0x01, kTheMenuItem, kTheName, true, kTEAMenuIdItemId },
+ { 0x03, 0x02, kTheMenuItem, kTheCheckMark, true, kTEAMenuIdItemId },
+ { 0x03, 0x03, kTheMenuItem, kTheEnabled, true, kTEAMenuIdItemId },
+ { 0x03, 0x04, kTheMenuItem, kTheScript, true, kTEAMenuIdItemId },
+ { 0x04, 0x01, kTheSound, kTheVolume, true, kTEAItemId },
+ { 0x06, 0x01, kTheSprite, kTheCursor, true, kTEAItemId },
+ { 0x06, 0x02, kTheSprite, kTheBackColor, true, kTEAItemId },
+ { 0x06, 0x03, kTheSprite, kTheBottom, true, kTEAItemId },
+ { 0x06, 0x04, kTheSprite, kTheCastNum, true, kTEAItemId },
+ { 0x06, 0x05, kTheSprite, kTheConstraint, true, kTEAItemId },
+ { 0x06, 0x06, kTheSprite, kTheCursor, true, kTEAItemId },
+ { 0x06, 0x07, kTheSprite, kTheForeColor, true, kTEAItemId },
+ { 0x06, 0x08, kTheSprite, kTheHeight, true, kTEAItemId },
+ { 0x06, 0x0a, kTheSprite, kTheInk, true, kTEAItemId },
+ { 0x06, 0x0b, kTheSprite, kTheLeft, true, kTEAItemId },
+ { 0x06, 0x0c, kTheSprite, kTheLineSize, true, kTEAItemId },
+ { 0x06, 0x0d, kTheSprite, kTheLocH, true, kTEAItemId },
+ { 0x06, 0x0e, kTheSprite, kTheLocV, true, kTEAItemId },
+ { 0x06, 0x0f, kTheSprite, kTheMovieRate, true, kTEAItemId },
+ { 0x06, 0x10, kTheSprite, kTheMovieTime, true, kTEAItemId },
+ { 0x06, 0x12, kTheSprite, kThePuppet, true, kTEAItemId },
+ { 0x06, 0x13, kTheSprite, kTheRight, true, kTEAItemId },
+ { 0x06, 0x14, kTheSprite, kTheStartTime, true, kTEAItemId },
+ { 0x06, 0x15, kTheSprite, kTheStopTime, true, kTEAItemId },
+ { 0x06, 0x16, kTheSprite, kTheStretch, true, kTEAItemId },
+ { 0x06, 0x17, kTheSprite, kTheTop, true, kTEAItemId },
+ { 0x06, 0x18, kTheSprite, kTheTrails, true, kTEAItemId },
+ { 0x06, 0x19, kTheSprite, kTheVisible, true, kTEAItemId },
+ { 0x06, 0x1a, kTheSprite, kTheVolume, true, kTEAItemId },
+ { 0x06, 0x1b, kTheSprite, kTheWidth, true, kTEAItemId },
+ { 0x06, 0x1d, kTheSprite, kTheScriptNum, true, kTEAItemId },
+ { 0x06, 0x1e, kTheSprite, kTheMoveableSprite, true, kTEAItemId },
+ { 0x06, 0x20, kTheSprite, kTheScoreColor, true, kTEAItemId },
+ { 0x07, 0x01, kTheBeepOn, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x02, kTheButtonStyle, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x03, kTheCenterStage, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x04, kTheCheckBoxAccess, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x05, kTheCheckBoxType, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x06, kTheColorDepth, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x08, kTheExitLock, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x09, kTheFixStageSize, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x13, kTheTimeoutLapsed, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x17, kTheSelEnd, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x18, kTheSelStart, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x19, kTheSoundEnabled, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x1a, kTheSoundLevel, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x1b, kTheStageColor, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x1d, kTheStillDown, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x1e, kTheTimeoutKeyDown, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x1f, kTheTimeoutLength, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x20, kTheTimeoutMouse, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x21, kTheTimeoutPlay, kTheNOField, true, kTEANOArgs },
+ { 0x07, 0x22, kTheTimer, kTheNOField, true, kTEANOArgs },
+ { 0x08, 0x01, kThePerFrameHook, kTheNOField, false, kTEANOArgs },
+ { 0x08, 0x02, kTheCastMembers, kTheNumber, false, kTEANOArgs },
+ { 0x08, 0x03, kTheMenus, kTheNumber, false, kTEANOArgs },
+ { 0x09, 0x01, kTheCast, kTheName, true, kTEAItemId },
+ { 0x09, 0x02, kTheCast, kTheText, true, kTEAItemId },
+ { 0x09, 0x08, kTheCast, kThePicture, true, kTEAItemId },
+ { 0x09, 0x0a, kTheCast, kTheNumber, true, kTEAItemId },
+ { 0x09, 0x0b, kTheCast, kTheSize, true, kTEAItemId },
+ { 0x09, 0x11, kTheCast, kTheForeColor, true, kTEAItemId },
+ { 0x09, 0x12, kTheCast, kTheBackColor, true, kTEAItemId },
+ { 0x0c, 0x03, kTheField, kTheTextStyle, true, kTEAItemId },
+ { 0x0c, 0x04, kTheField, kTheTextFont, true, kTEAItemId },
+ { 0x0c, 0x05, kTheField, kTheTextHeight, true, kTEAItemId },
+ { 0x0c, 0x06, kTheField, kTheTextAlign, true, kTEAItemId },
+ { 0x0c, 0x07, kTheField, kTheTextSize, true, kTEAItemId },
+ { 0x0d, 0x0f, kTheCast, kTheDirectToStage, true, kTEAItemId },
+ { 0x0d, 0x10, kTheCast, kTheSound, true, kTEAItemId },
{ 0xff, 0, 0, 0, false, kTEANOArgs }
};
More information about the Scummvm-git-logs
mailing list