ALL: Fix misuse of comma operator

17 files changed, 222 insertions, 197 deletions

diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 7d5c16c3d2..84a8d4e734 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -433,7 +433,8 @@ void chemin0(int depart, int arrivee) {
 	for (int i = 0; i < 20 + 1; i++)
 		fl[i] = -1;
 
-	X = 0, Y = 30;
+	X = 0;
+	Y = 30;
 
 	explore(depart, arrivee);
 }
diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp
index b477dcdf9c..57dcfcea8f 100644
--- a/engines/cruise/sound.cpp
+++ b/engines/cruise/sound.cpp
@@ -41,7 +41,11 @@ class PCSoundDriver {
 public:
 	typedef void (*UpdateCallback)(void *);
 
-	PCSoundDriver() { _upCb = NULL, _upRef = NULL, _musicVolume = 0, _sfxVolume = 0; }
+	PCSoundDriver() :
+		_upCb(nullptr),
+		_upRef(nullptr),
+		_musicVolume(0),
+		_sfxVolume(0) {}
 	virtual ~PCSoundDriver() {}
 
 	virtual void setupChannel(int channel, const byte *data, int instrument, int volume) = 0;
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index a3f9b7c2f5..16d838fcca 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -100,7 +100,7 @@ class DirectorMetaEngine : public AdvancedMetaEngine {
 public:
 	DirectorMetaEngine() : AdvancedMetaEngine(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) {
 		_singleId = "director";
-		_maxScanDepth = 2,
+		_maxScanDepth = 2;
 		_directoryGlobs = directoryGlobs;
 	}
 
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index 646e7cec8d..5c08acdc84 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -2015,7 +2015,8 @@ void ChampionMan::addCandidateChampionToParty(uint16 championPortraitIndex) {
 	int16 curMapX = dungeon._partyMapX;
 	int16 curMapY = dungeon._partyMapY;
 	uint16 championObjectsCell = _vm->returnOppositeDir(dungeon._partyDir);
-	curMapX += _vm->_dirIntoStepCountEast[dungeon._partyDir], curMapY += _vm->_dirIntoStepCountNorth[dungeon._partyDir];
+	curMapX += _vm->_dirIntoStepCountEast[dungeon._partyDir];
+	curMapY += _vm->_dirIntoStepCountNorth[dungeon._partyDir];
 	curThing = dungeon.getSquareFirstThing(curMapX, curMapY);
 	int16 slotIdx = kDMSlotBackpackLine1_1;
 	while (curThing != _vm->_thingEndOfList) {
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index 4c19ab01df..29ba665a47 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -922,7 +922,8 @@ void DMEngine::fuseSequence() {
 	fuseSequenceUpdate();
 	int16 lordChaosMapX = _dungeonMan->_partyMapX;
 	int16 lordChaosMapY = _dungeonMan->_partyMapY;
-	lordChaosMapX += _dirIntoStepCountEast[_dungeonMan->_partyDir], lordChaosMapY += _dirIntoStepCountNorth[_dungeonMan->_partyDir];
+	lordChaosMapX += _dirIntoStepCountEast[_dungeonMan->_partyDir];
+	lordChaosMapY += _dirIntoStepCountNorth[_dungeonMan->_partyDir];
 	Thing lordChaosThing = _groupMan->groupGetThing(lordChaosMapX, lordChaosMapY);
 	Group *lordGroup = (Group*)_dungeonMan->getThingData(lordChaosThing);
 	lordGroup->_health[0] = 10000;
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index 3859fc90b2..f424672b67 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -1369,7 +1369,8 @@ void EventManager::processType80_clickInDungeonView_grabLeaderHandObject(uint16
 	int16 mapX = _vm->_dungeonMan->_partyMapX;
 	int16 mapY = _vm->_dungeonMan->_partyMapY;
 	if (viewCell >= kDMViewCellBackRight) {
-		mapX += _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir], mapY += _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir];
+		mapX += _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir];
+		mapY += _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir];
 		Thing groupThing = _vm->_groupMan->groupGetThing(mapX, mapY);
 		if ((groupThing != _vm->_thingEndOfList) &&
 			!_vm->_moveSens->isLevitating(groupThing) &&
@@ -1397,8 +1398,10 @@ void EventManager::clickInDungeonViewDropLeaderHandObject(uint16 viewCell) {
 	if (droppingIntoAnAlcove)
 		viewCell = kDMViewCellBackRight;
 
-	if (viewCell > kDMViewCellFrontRight)
-		mapX += _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir], mapY += _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir];
+	if (viewCell > kDMViewCellFrontRight) {
+		mapX += _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir];
+		mapY += _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir];
+	}
 
 	uint16 currCell = _vm->normalizeModulo4(_vm->_dungeonMan->_partyDir + viewCell);
 	Thing removedThing = _vm->_championMan->getObjectRemovedFromLeaderHand();
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index 9bfeb1da1d..dfdcdc017f 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -819,7 +819,8 @@ T0209058_MoveInRandomDirection:
 							do {
 								AL0450_i_DestinationMapX = eventMapX;
 								AL0451_i_DestinationMapY = eventMapY;
-								AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction], AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction];
+								AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction];
+								AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction];
 								if (((activeGroup->_priorMapX != AL0450_i_DestinationMapX) ||
 									(activeGroup->_priorMapY != AL0451_i_DestinationMapY) ||
 									 (moveToPriorLocation = !_vm->getRandomNumber(4))) /* 1/4 chance of moving back to the square that the creature comes from */
@@ -910,7 +911,8 @@ T0209085_SingleSquareMove:
 						(!_vm->getRandomNumber(4) && isMovementPossible(&creatureInfo, eventMapX, eventMapY, AL0446_i_Direction = _vm->returnOppositeDir((Direction)primaryDirectionToOrFromParty), false))) {
 						AL0450_i_DestinationMapX = eventMapX;
 						AL0451_i_DestinationMapY = eventMapY;
-						AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction], AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction];
+						AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction];
+						AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction];
 						goto T0209061_MoveGroup;
 					}
 					if (isArchEnemy) {
@@ -922,7 +924,8 @@ T0209089_DoubleSquareMove:
 							((_fluxCageCount >= 2) && isArchenemyDoubleMovementPossible(&creatureInfo, eventMapX, eventMapY, AL0446_i_Direction = _vm->returnOppositeDir((Direction)primaryDirectionToOrFromParty)))) {
 							AL0450_i_DestinationMapX = eventMapX;
 							AL0451_i_DestinationMapY = eventMapY;
-							AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction] * 2, AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction] * 2;
+							AL0450_i_DestinationMapX += _vm->_dirIntoStepCountEast[AL0446_i_Direction] * 2;
+							AL0451_i_DestinationMapY += _vm->_dirIntoStepCountNorth[AL0446_i_Direction] * 2;
 							_vm->_sound->requestPlay(kDMSoundIndexBuzz, AL0450_i_DestinationMapX, AL0451_i_DestinationMapY, kDMSoundModePlayIfPrioritized);
 							goto T0209061_MoveGroup;
 						}
@@ -1451,7 +1454,8 @@ bool GroupMan::isArchenemyDoubleMovementPossible(CreatureInfo *info, int16 mapX,
 	if (_fluxCages[dir])
 		return false;
 
-	mapX += _vm->_dirIntoStepCountEast[dir], mapY += _vm->_dirIntoStepCountNorth[dir];
+	mapX += _vm->_dirIntoStepCountEast[dir];
+	mapY += _vm->_dirIntoStepCountNorth[dir];
 	return isMovementPossible(info, mapX, mapY, dir, false);
 }
 
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index 9c8e219851..1600f589e9 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1263,7 +1263,8 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
 		setChampionDirectionToPartyDirection(curChampion);
 		nextMapX = dungeon._partyMapX;
 		nextMapY = dungeon._partyMapY;
-		nextMapX += _vm->_dirIntoStepCountEast[dungeon._partyDir], nextMapY += _vm->_dirIntoStepCountNorth[dungeon._partyDir];
+		nextMapX += _vm->_dirIntoStepCountEast[dungeon._partyDir];
+		nextMapY += _vm->_dirIntoStepCountNorth[dungeon._partyDir];
 		_vm->_groupMan->fuseAction(nextMapX, nextMapY);
 		break;
 	case kDMActionHeal: {
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index 410ede740a..1dc36f7979 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -352,7 +352,8 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
 						dungeon.setCurrentMap(mapIndexDestination);
 					}
 					direction = dungeon.getStairsExitDirection(destMapX, destMapY);
-					destMapX += _vm->_dirIntoStepCountEast[direction], destMapY += _vm->_dirIntoStepCountNorth[direction];
+					destMapX += _vm->_dirIntoStepCountEast[direction];
+					destMapY += _vm->_dirIntoStepCountNorth[direction];
 					direction = _vm->returnOppositeDir((Direction)direction);
 					thingCell = thing.getCell();
 					thingCell = _vm->normalizeModulo4((((thingCell - direction + 1) & 0x0002) >> 1) + direction);
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index 85767cd633..e8b0f4a143 100644
--- a/engines/dm/projexpl.cpp
+++ b/engines/dm/projexpl.cpp
@@ -429,7 +429,8 @@ void ProjExpl::processEvents48To49(TimelineEvent *event) {
 	if (projectileMovesToOtherSquare) {
 		sourceMapX = destinationMapX;
 		sourceMapY = destinationMapY;
-		destinationMapX += _vm->_dirIntoStepCountEast[projectileDirection], destinationMapY += _vm->_dirIntoStepCountNorth[projectileDirection];
+		destinationMapX += _vm->_dirIntoStepCountEast[projectileDirection];
+		destinationMapY += _vm->_dirIntoStepCountNorth[projectileDirection];
 		Square destSquare = _vm->_dungeonMan->getSquare(destinationMapX, destinationMapY);
 		ElementType destSquareType = destSquare.getType();
 		if ((destSquareType == kDMElementTypeWall) ||
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 19e6e35e0b..6bb4274421 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -37,7 +37,7 @@
 namespace Gob {
 
 Util::Util(GobEngine *vm) : _vm(vm) {
-	_mouseButtons   = kMouseButtonsNone,
+	_mouseButtons   = kMouseButtonsNone;
 	_keyBufferHead  = 0;
 	_keyBufferTail  = 0;
 	_fastMode       = 0;
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp
index e50378b9c0..cff415868e 100644
--- a/engines/saga/isomap.cpp
+++ b/engines/saga/isomap.cpp
@@ -1350,7 +1350,7 @@ void IsoMap::findDragonTilePath(ActorData* actor,const Location &start, const Lo
 	bool first;
 
 	bestDistance = SAGA_DRAGON_SEARCH_DIAMETER;
-	bestU = SAGA_DRAGON_SEARCH_CENTER,
+	bestU = SAGA_DRAGON_SEARCH_CENTER;
 	bestV = SAGA_DRAGON_SEARCH_CENTER;
 
 	uBase = (start.u() >> 4) - SAGA_DRAGON_SEARCH_CENTER;
@@ -1505,7 +1505,7 @@ void IsoMap::findTilePath(ActorData* actor, const Location &start, const Locatio
 
 
 	bestDistance = SAGA_SEARCH_DIAMETER;
-	bestU = SAGA_SEARCH_CENTER,
+	bestU = SAGA_SEARCH_CENTER;
 	bestV = SAGA_SEARCH_CENTER;
 
 	uBase = (start.u() >> 4) - SAGA_SEARCH_CENTER;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 767e85d3ae..77d82c88a6 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -952,7 +952,7 @@ ScummEngine_v100he::~ScummEngine_v100he() {
 ScummEngine_vCUPhe::ScummEngine_vCUPhe(OSystem *syst, const DetectorResult &dr) : Engine(syst){
 	_syst = syst;
 	_game = dr.game;
-	_filenamePattern = dr.fp,
+	_filenamePattern = dr.fp;
 
 	_cupPlayer = new CUP_Player(syst, this, _mixer);
 }
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index 306a51c300..3a768cb5f4 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -152,7 +152,8 @@ void resetRandW() {
 		}
 	}
 
-	p1 = 0, p2 = 10;
+	p1 = 0;
+	p2 = 10;
 }
 
 #if 0
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index 5e8ff09a86..7a8925b766 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -48,177 +48,177 @@ ScriptFunc::ScriptFunc(ToonEngine *vm) {
 	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
 	Opcode(sys_Cmd_Change_Actor_X_And_Y);                   //     dd offset sub_2A710
 	Opcode(sys_Cmd_Init_Talking_Character);             //     dd offset sub_2A4E0
-	Opcode(sys_Cmd_Draw_Actor_Standing),                    //     dd offset sub_2A650
-	Opcode(sys_Cmd_Get_Actor_X),                            //     dd offset sub_2ADC0
-	Opcode(sys_Cmd_Get_Actor_Y),                            //     dd offset sub_2ADD0
-	Opcode(sys_Cmd_Get_Actor_Facing),                       //     dd offset sub_2A790
-	Opcode(sys_Cmd_Get_Last_Scene),                     //     dd offset sub_29F80
-	Opcode(sys_Cmd_Debug_Print),                            //     dd offset sub_2A510
-	Opcode(sys_Cmd_Flip_Screens),                           //     dd offset sub_2A180
-	Opcode(sys_Cmd_Play_Flic),                              //     dd offset sub_2A080
-	Opcode(sys_Cmd_Force_Facing),                           //     dd offset sub_29F90
-	Opcode(sys_Cmd_Restart_Thread),                     //     dd offset sub_29F30
-	Opcode(sys_Cmd_Walk_Actor_To_Point),                    //     dd offset sub_2A440
-	Opcode(sys_Cmd_Set_Sack_Visible),                       //     dd offset sub_29920
-	Opcode(sys_Cmd_Set_Actor_Facing),                       //     dd offset sub_2AD60
-	Opcode(sys_Cmd_Confiscate_Inventory),                   //     dd offset sub_29EB0
-	Opcode(sys_Cmd_Character_Talks),                        //     dd offset sub_29F00
-	Opcode(sys_Cmd_Visited_Scene),                          //     dd offset sub_29E80
-	Opcode(sys_Cmd_Query_Rif_Flag),                     //     dd offset sub_29D20
-	Opcode(sys_Cmd_Query_Scroll),                           //     dd offset sub_29D60
-	Opcode(sys_Cmd_Set_Initial_Location),                   //     dd offset sub_2AD80
-	Opcode(sys_Cmd_Make_Line_Non_Walkable),             //     dd offset sub_29FC0
-	Opcode(sys_Cmd_Make_Line_Walkable),                 //     dd offset sub_2A050
-	Opcode(sys_Cmd_Walk_Actor_On_Condition),                //     dd offset sub_29D70
-	Opcode(sys_Cmd_Set_Actor_Facing_Point),             //     dd offset sub_29E60
-	Opcode(sys_Cmd_Set_Inventory_Slot),                 //     dd offset sub_2B0D0
-	Opcode(sys_Cmd_Get_Inventory_Slot),                 //     dd offset sub_2B0F0
-	Opcode(sys_Cmd_Add_Item_To_Inventory),                  //     dd offset sub_2AE50
-	Opcode(sys_Cmd_Set_Actor_RGB_Modifiers),                //     dd offset sub_29CA0
-	Opcode(sys_Cmd_Init_Conversation_AP),                   //     dd offset sub_2B130
-	Opcode(sys_Cmd_Actor_Talks),                            //     dd offset sub_2ADA0
-	Opcode(sys_Cmd_Say_Lines),                              //     dd offset sub_29B20
-	Opcode(sys_Cmd_Set_Rif_Flag),                           //     dd offset sub_2A320
-	Opcode(sys_Cmd_Empty_Inventory),                        //     dd offset sub_2AE10
-	Opcode(sys_Cmd_Set_Anim_Scale_Size),                    //     dd offset sub_29BD0
-	Opcode(sys_Cmd_Delete_Item_From_Inventory),         //     dd offset sub_2AE70
-	Opcode(sys_Cmd_Specific_Item_In_Inventory),         //     dd offset sub_2A740
-	Opcode(sys_Cmd_Run_Script),                         //     dd offset sub_29AF0
-	Opcode(sys_Cmd_Query_Game_Flag),                        //     dd offset sub_2A3E0
-	Opcode(sys_Cmd_Reset_Game_Flag),                        //     dd offset sub_2A420
-	Opcode(sys_Cmd_Set_Game_Flag),                          //     dd offset sub_2A400
-	Opcode(sys_Cmd_Create_Mouse_Item),                      //     dd offset sub_2A4B0
-	Opcode(sys_Cmd_Destroy_Mouse_Item),                 //     dd offset sub_2A4D0
-	Opcode(sys_Cmd_Get_Mouse_State),                        //     dd offset sub_2A860
-	Opcode(sys_Cmd_Hide_Mouse),                         //     dd offset sub_2A5D0
-	Opcode(sys_Cmd_Exit_Conversation),                      //     dd offset sub_29AE0
-	Opcode(sys_Cmd_Set_Mouse_Pos),                          //     dd offset sub_2A810
-	Opcode(sys_Cmd_Show_Mouse),                         //     dd offset sub_2A5F0
-	Opcode(sys_Cmd_In_Close_Up),                            //     dd offset sub_29FB0
-	Opcode(sys_Cmd_Set_Scroll_Lock),                        //     dd offset sub_298B0
-	Opcode(sys_Cmd_Fill_Area_Non_Walkable),             //     dd offset sub_29FF0
-	Opcode(sys_Cmd_Set_Scroll_Coords),                      //     dd offset sub_298D0
-	Opcode(sys_Cmd_Hide_Cutaway),                           //     dd offset sub_2A0F0
-	Opcode(sys_Cmd_Show_Cutaway),                           //     dd offset sub_2A100
-	Opcode(sys_Cmd_Pause_Ticks),                            //     dd offset sub_2A360
-	Opcode(sys_Cmd_In_Conversation),                        //     dd offset sub_29C60
-	Opcode(sys_Cmd_Character_Talking),                      //     dd offset sub_29C70
-	Opcode(sys_Cmd_Set_Flux_Facing_Point),                  //     dd offset sub_29980
-	Opcode(sys_Cmd_Set_Flux_Facing),                        //     dd offset sub_299A0
-	Opcode(sys_Cmd_Set_Flux_Coords),                        //     dd offset sub_299C0
-	Opcode(sys_Cmd_Set_Flux_Visible),                       //     dd offset sub_299F0
-	Opcode(sys_Cmd_Get_Flux_X),                         //     dd offset sub_29A40
-	Opcode(sys_Cmd_Get_Flux_Y),                         //     dd offset sub_29A50
-	Opcode(sys_Cmd_Get_Flux_Facing),                        //     dd offset sub_29A60
-	Opcode(sys_Cmd_Get_Flux_Flags),                     //     dd offset sub_29A70
-	Opcode(sys_Cmd_Query_Flux_Coords),                      //     dd offset sub_29A90
-	Opcode(sys_Cmd_Have_A_Conversation),                    //     dd offset sub_2B110
-	Opcode(sys_Cmd_Walk_Flux_To_Point),                 //     dd offset sub_29AC0
-	Opcode(sys_Cmd_Get_Actor_Final_X),                      //     dd offset sub_29940
-	Opcode(sys_Cmd_Get_Actor_Final_Y),                      //     dd offset sub_29960
-	Opcode(sys_Cmd_Query_Scene_Anim_Loaded),                //     dd offset sub_29870
-	Opcode(sys_Cmd_Play_Flux_Anim),                     //     dd offset sub_29820
-	Opcode(sys_Cmd_Set_Anim_Priority),                      //     dd offset sub_29790
-	Opcode(sys_Cmd_Place_Scene_Anim),                       //     dd offset sub_2A7A0
-	Opcode(sys_Cmd_Update_Scene_Animations),                //     dd offset sub_2AE30
-	Opcode(sys_Cmd_Get_Drew_Scale),                     //     dd offset sub_297E0
-	Opcode(sys_Cmd_Query_Drew_Flags),                       //     dd offset sub_29800
-	Opcode(sys_Cmd_Set_Music),                              //     dd offset sub_29720
-	Opcode(sys_Cmd_Query_Speech),                           //     dd offset sub_296D0
-	Opcode(sys_Cmd_Enter_New_Scene),                        //     dd offset sub_2A550
-	Opcode(sys_Cmd_Enter_Same_Scene),                       //     dd offset sub_2ADE0
-	Opcode(sys_Cmd_Is_Pixel_Walkable),                      //     dd offset sub_2A4F0
-	Opcode(sys_Cmd_Show_Screen),                            //     dd offset sub_2A0C0
-	Opcode(sys_Cmd_Hide_Screen),                            //     dd offset sub_2A0F0
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_295D0
-	Opcode(sys_Cmd_Set_Special_Enter_X_And_Y),              //     dd offset sub_2A590
-	Opcode(sys_Cmd_Get_Mouse_X),                            //     dd offset sub_296B0
-	Opcode(sys_Cmd_Get_Mouse_Y),                            //     dd offset sub_296C0
-	Opcode(sys_Cmd_Fade_Palette),                           //     dd offset sub_29650
-	Opcode(sys_Cmd_Music_Enabled),                          //     dd offset sub_29620
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_295F0
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_29610
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Random),                             //     dd offset sub_2A600
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Wait_Key),                               //     dd offset sub_2AE20
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Draw_Scene_Anim_WSA_Frame_To_Back),      //     dd offset sub_2A940
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Set_Scene_Anim_Wait),                    //     dd offset sub_2A870
-	Opcode(sys_Cmd_Init_Scene_Anim),                        //     dd offset sub_2AC60
-	Opcode(sys_Cmd_Set_Scene_Animation_Active_Flag),        //     dd offset sub_2AB10
-	Opcode(sys_Cmd_Draw_Scene_Anim_WSA_Frame),              //     dd offset sub_2A8D0
-	Opcode(sys_Cmd_Move_Scene_Anim),                        //     dd offset sub_2AA90
-	Opcode(sys_Cmd_Run_Actor_Default_Script),               //     dd offset sub_2A4E0
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Set_Location_Data),                      //     dd offset sub_2AE90
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Set_CountDown_Timer),                    //     dd offset sub_2AFC0
-	Opcode(sys_Cmd_Query_CountDown_Timer),                  //     dd offset sub_2AFE0
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Proceed_To_Next_Chapter),                //     dd offset sub_2AFF0
-	Opcode(sys_Cmd_Play_Sfx_Plus),                          //     dd offset sub_2A1D0
-	Opcode(sys_Cmd_Play_Sfx),                               //     dd offset sub_2A1A0
-	Opcode(sys_Cmd_Set_Ambient_Sfx),                        //     dd offset sub_2A260
-	Opcode(sys_Cmd_Kill_Ambient_Sfx),                       //     dd offset sub_2A300
-	Opcode(sys_Cmd_Set_Ambient_Sfx_Plus),                   //     dd offset sub_2A290
-	Opcode(sys_Cmd_Set_Ambient_Volume),                 //     dd offset sub_2A240
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Freeze_Scene_Animation),             //     dd offset sub_2AB90
-	Opcode(sys_Cmd_Unfreeze_Scene_Animation),               //     dd offset sub_2ABB0
-	Opcode(sys_Cmd_Scene_Animation_Frozen),             //     dd offset sub_2ABD0
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Set_Script_Game_Data_Global),            //     dd offset sub_2ABF0
-	Opcode(sys_Cmd_Get_Script_Game_Data_Global),            //     dd offset sub_2AC30
-	Opcode(sys_Cmd_Say_Line),                               //     dd offset loc_2A190
-	Opcode(sys_Cmd_Knight_Puzzle_Get_Coord),                //     dd offset sub_2A110
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Add_Scene_Anim),                     //     dd offset sub_2AC60
-	Opcode(sys_Cmd_Remove_Scene_Anim),                      //     dd offset sub_2ACE0
-	Opcode(sys_Cmd_Disable_Timer),                          //     dd offset sub_2AD00
-	Opcode(sys_Cmd_Enable_Timer),                           //     dd offset sub_2AD20
-	Opcode(sys_Cmd_Set_Timer),                              //     dd offset sub_2AD40
-	Opcode(sys_Cmd_Set_Palette_Color),                      //     dd offset sub_2B020
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Number_Of_NPCs),                     //     dd offset loc_2A190
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Dummy),                                  //     dd offset sub_2B160
-	Opcode(sys_Cmd_Get_Config_Language),                    //     dd offset sub_2B0C0
+	Opcode(sys_Cmd_Draw_Actor_Standing);                    //     dd offset sub_2A650
+	Opcode(sys_Cmd_Get_Actor_X);                            //     dd offset sub_2ADC0
+	Opcode(sys_Cmd_Get_Actor_Y);                            //     dd offset sub_2ADD0
+	Opcode(sys_Cmd_Get_Actor_Facing);                       //     dd offset sub_2A790
+	Opcode(sys_Cmd_Get_Last_Scene);                     //     dd offset sub_29F80
+	Opcode(sys_Cmd_Debug_Print);                            //     dd offset sub_2A510
+	Opcode(sys_Cmd_Flip_Screens);                           //     dd offset sub_2A180
+	Opcode(sys_Cmd_Play_Flic);                              //     dd offset sub_2A080
+	Opcode(sys_Cmd_Force_Facing);                           //     dd offset sub_29F90
+	Opcode(sys_Cmd_Restart_Thread);                     //     dd offset sub_29F30
+	Opcode(sys_Cmd_Walk_Actor_To_Point);                    //     dd offset sub_2A440
+	Opcode(sys_Cmd_Set_Sack_Visible);                       //     dd offset sub_29920
+	Opcode(sys_Cmd_Set_Actor_Facing);                       //     dd offset sub_2AD60
+	Opcode(sys_Cmd_Confiscate_Inventory);                   //     dd offset sub_29EB0
+	Opcode(sys_Cmd_Character_Talks);                        //     dd offset sub_29F00
+	Opcode(sys_Cmd_Visited_Scene);                          //     dd offset sub_29E80
+	Opcode(sys_Cmd_Query_Rif_Flag);                     //     dd offset sub_29D20
+	Opcode(sys_Cmd_Query_Scroll);                           //     dd offset sub_29D60
+	Opcode(sys_Cmd_Set_Initial_Location);                   //     dd offset sub_2AD80
+	Opcode(sys_Cmd_Make_Line_Non_Walkable);             //     dd offset sub_29FC0
+	Opcode(sys_Cmd_Make_Line_Walkable);                 //     dd offset sub_2A050
+	Opcode(sys_Cmd_Walk_Actor_On_Condition);                //     dd offset sub_29D70
+	Opcode(sys_Cmd_Set_Actor_Facing_Point);             //     dd offset sub_29E60
+	Opcode(sys_Cmd_Set_Inventory_Slot);                 //     dd offset sub_2B0D0
+	Opcode(sys_Cmd_Get_Inventory_Slot);                 //     dd offset sub_2B0F0
+	Opcode(sys_Cmd_Add_Item_To_Inventory);                  //     dd offset sub_2AE50
+	Opcode(sys_Cmd_Set_Actor_RGB_Modifiers);                //     dd offset sub_29CA0
+	Opcode(sys_Cmd_Init_Conversation_AP);                   //     dd offset sub_2B130
+	Opcode(sys_Cmd_Actor_Talks);                            //     dd offset sub_2ADA0
+	Opcode(sys_Cmd_Say_Lines);                              //     dd offset sub_29B20
+	Opcode(sys_Cmd_Set_Rif_Flag);                           //     dd offset sub_2A320
+	Opcode(sys_Cmd_Empty_Inventory);                        //     dd offset sub_2AE10
+	Opcode(sys_Cmd_Set_Anim_Scale_Size);                    //     dd offset sub_29BD0
+	Opcode(sys_Cmd_Delete_Item_From_Inventory);         //     dd offset sub_2AE70
+	Opcode(sys_Cmd_Specific_Item_In_Inventory);         //     dd offset sub_2A740
+	Opcode(sys_Cmd_Run_Script);                         //     dd offset sub_29AF0
+	Opcode(sys_Cmd_Query_Game_Flag);                        //     dd offset sub_2A3E0
+	Opcode(sys_Cmd_Reset_Game_Flag);                        //     dd offset sub_2A420
+	Opcode(sys_Cmd_Set_Game_Flag);                          //     dd offset sub_2A400
+	Opcode(sys_Cmd_Create_Mouse_Item);                      //     dd offset sub_2A4B0
+	Opcode(sys_Cmd_Destroy_Mouse_Item);                 //     dd offset sub_2A4D0
+	Opcode(sys_Cmd_Get_Mouse_State);                        //     dd offset sub_2A860
+	Opcode(sys_Cmd_Hide_Mouse);                         //     dd offset sub_2A5D0
+	Opcode(sys_Cmd_Exit_Conversation);                      //     dd offset sub_29AE0
+	Opcode(sys_Cmd_Set_Mouse_Pos);                          //     dd offset sub_2A810
+	Opcode(sys_Cmd_Show_Mouse);                         //     dd offset sub_2A5F0
+	Opcode(sys_Cmd_In_Close_Up);                            //     dd offset sub_29FB0
+	Opcode(sys_Cmd_Set_Scroll_Lock);                        //     dd offset sub_298B0
+	Opcode(sys_Cmd_Fill_Area_Non_Walkable);             //     dd offset sub_29FF0
+	Opcode(sys_Cmd_Set_Scroll_Coords);                      //     dd offset sub_298D0
+	Opcode(sys_Cmd_Hide_Cutaway);                           //     dd offset sub_2A0F0
+	Opcode(sys_Cmd_Show_Cutaway);                           //     dd offset sub_2A100
+	Opcode(sys_Cmd_Pause_Ticks);                            //     dd offset sub_2A360
+	Opcode(sys_Cmd_In_Conversation);                        //     dd offset sub_29C60
+	Opcode(sys_Cmd_Character_Talking);                      //     dd offset sub_29C70
+	Opcode(sys_Cmd_Set_Flux_Facing_Point);                  //     dd offset sub_29980
+	Opcode(sys_Cmd_Set_Flux_Facing);                        //     dd offset sub_299A0
+	Opcode(sys_Cmd_Set_Flux_Coords);                        //     dd offset sub_299C0
+	Opcode(sys_Cmd_Set_Flux_Visible);                       //     dd offset sub_299F0
+	Opcode(sys_Cmd_Get_Flux_X);                         //     dd offset sub_29A40
+	Opcode(sys_Cmd_Get_Flux_Y);                         //     dd offset sub_29A50
+	Opcode(sys_Cmd_Get_Flux_Facing);                        //     dd offset sub_29A60
+	Opcode(sys_Cmd_Get_Flux_Flags);                     //     dd offset sub_29A70
+	Opcode(sys_Cmd_Query_Flux_Coords);                      //     dd offset sub_29A90
+	Opcode(sys_Cmd_Have_A_Conversation);                    //     dd offset sub_2B110
+	Opcode(sys_Cmd_Walk_Flux_To_Point);                 //     dd offset sub_29AC0
+	Opcode(sys_Cmd_Get_Actor_Final_X);                      //     dd offset sub_29940
+	Opcode(sys_Cmd_Get_Actor_Final_Y);                      //     dd offset sub_29960
+	Opcode(sys_Cmd_Query_Scene_Anim_Loaded);                //     dd offset sub_29870
+	Opcode(sys_Cmd_Play_Flux_Anim);                     //     dd offset sub_29820
+	Opcode(sys_Cmd_Set_Anim_Priority);                      //     dd offset sub_29790
+	Opcode(sys_Cmd_Place_Scene_Anim);                       //     dd offset sub_2A7A0
+	Opcode(sys_Cmd_Update_Scene_Animations);                //     dd offset sub_2AE30
+	Opcode(sys_Cmd_Get_Drew_Scale);                     //     dd offset sub_297E0
+	Opcode(sys_Cmd_Query_Drew_Flags);                       //     dd offset sub_29800
+	Opcode(sys_Cmd_Set_Music);                              //     dd offset sub_29720
+	Opcode(sys_Cmd_Query_Speech);                           //     dd offset sub_296D0
+	Opcode(sys_Cmd_Enter_New_Scene);                        //     dd offset sub_2A550
+	Opcode(sys_Cmd_Enter_Same_Scene);                       //     dd offset sub_2ADE0
+	Opcode(sys_Cmd_Is_Pixel_Walkable);                      //     dd offset sub_2A4F0
+	Opcode(sys_Cmd_Show_Screen);                            //     dd offset sub_2A0C0
+	Opcode(sys_Cmd_Hide_Screen);                            //     dd offset sub_2A0F0
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_295D0
+	Opcode(sys_Cmd_Set_Special_Enter_X_And_Y);              //     dd offset sub_2A590
+	Opcode(sys_Cmd_Get_Mouse_X);                            //     dd offset sub_296B0
+	Opcode(sys_Cmd_Get_Mouse_Y);                            //     dd offset sub_296C0
+	Opcode(sys_Cmd_Fade_Palette);                           //     dd offset sub_29650
+	Opcode(sys_Cmd_Music_Enabled);                          //     dd offset sub_29620
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_295F0
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_29610
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Random);                             //     dd offset sub_2A600
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Wait_Key);                               //     dd offset sub_2AE20
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Draw_Scene_Anim_WSA_Frame_To_Back);      //     dd offset sub_2A940
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Set_Scene_Anim_Wait);                    //     dd offset sub_2A870
+	Opcode(sys_Cmd_Init_Scene_Anim);                        //     dd offset sub_2AC60
+	Opcode(sys_Cmd_Set_Scene_Animation_Active_Flag);        //     dd offset sub_2AB10
+	Opcode(sys_Cmd_Draw_Scene_Anim_WSA_Frame);              //     dd offset sub_2A8D0
+	Opcode(sys_Cmd_Move_Scene_Anim);                        //     dd offset sub_2AA90
+	Opcode(sys_Cmd_Run_Actor_Default_Script);               //     dd offset sub_2A4E0
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Set_Location_Data);                      //     dd offset sub_2AE90
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Set_CountDown_Timer);                    //     dd offset sub_2AFC0
+	Opcode(sys_Cmd_Query_CountDown_Timer);                  //     dd offset sub_2AFE0
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Proceed_To_Next_Chapter);                //     dd offset sub_2AFF0
+	Opcode(sys_Cmd_Play_Sfx_Plus);                          //     dd offset sub_2A1D0
+	Opcode(sys_Cmd_Play_Sfx);                               //     dd offset sub_2A1A0
+	Opcode(sys_Cmd_Set_Ambient_Sfx);                        //     dd offset sub_2A260
+	Opcode(sys_Cmd_Kill_Ambient_Sfx);                       //     dd offset sub_2A300
+	Opcode(sys_Cmd_Set_Ambient_Sfx_Plus);                   //     dd offset sub_2A290
+	Opcode(sys_Cmd_Set_Ambient_Volume);                 //     dd offset sub_2A240
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Freeze_Scene_Animation);             //     dd offset sub_2AB90
+	Opcode(sys_Cmd_Unfreeze_Scene_Animation);               //     dd offset sub_2ABB0
+	Opcode(sys_Cmd_Scene_Animation_Frozen);             //     dd offset sub_2ABD0
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Set_Script_Game_Data_Global);            //     dd offset sub_2ABF0
+	Opcode(sys_Cmd_Get_Script_Game_Data_Global);            //     dd offset sub_2AC30
+	Opcode(sys_Cmd_Say_Line);                               //     dd offset loc_2A190
+	Opcode(sys_Cmd_Knight_Puzzle_Get_Coord);                //     dd offset sub_2A110
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Add_Scene_Anim);                     //     dd offset sub_2AC60
+	Opcode(sys_Cmd_Remove_Scene_Anim);                      //     dd offset sub_2ACE0
+	Opcode(sys_Cmd_Disable_Timer);                          //     dd offset sub_2AD00
+	Opcode(sys_Cmd_Enable_Timer);                           //     dd offset sub_2AD20
+	Opcode(sys_Cmd_Set_Timer);                              //     dd offset sub_2AD40
+	Opcode(sys_Cmd_Set_Palette_Color);                      //     dd offset sub_2B020
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Number_Of_NPCs);                     //     dd offset loc_2A190
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
+	Opcode(sys_Cmd_Get_Config_Language);                    //     dd offset sub_2B0C0
 	Opcode(sys_Cmd_Dummy);                                  //     dd offset sub_2B160
 }
 
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h
index 6b22a14142..af964b0ee1 100644
--- a/graphics/pixelformat.h
+++ b/graphics/pixelformat.h
@@ -149,8 +149,14 @@ struct PixelFormat {
 						byte RBits, byte GBits, byte BBits, byte ABits,
 						byte RShift, byte GShift, byte BShift, byte AShift) {
 		bytesPerPixel = BytesPerPixel;
-		rLoss = 8 - RBits, gLoss = 8 - GBits, bLoss = 8 - BBits, aLoss = 8 - ABits;
-		rShift = RShift, gShift = GShift, bShift = BShift, aShift = AShift;
+		rLoss = 8 - RBits;
+		gLoss = 8 - GBits;
+		bLoss = 8 - BBits;
+		aLoss = 8 - ABits;
+		rShift = RShift;
+		gShift = GShift;
+		bShift = BShift;
+		aShift = AShift;
 	}
 
 	static inline PixelFormat createFormatCLUT8() {
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index bd0d2c4898..64a9aa7849 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -622,11 +622,12 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
 	if (stepNode->values.contains("padding")) {
 		val = stepNode->values["padding"];
 		int pr, pt, pl, pb;
-		if (parseIntegerKey(val, 4, &pl, &pt, &pr, &pb))
-			drawstep->padding.left = pl,
-			drawstep->padding.top = pt,
-			drawstep->padding.right = pr,
+		if (parseIntegerKey(val, 4, &pl, &pt, &pr, &pb)) {
+			drawstep->padding.left = pl;
+			drawstep->padding.top = pt;
+			drawstep->padding.right = pr;
 			drawstep->padding.bottom = pb;
+		}
 	}
 
 #undef PARSER_ASSIGN_INT