[Scummvm-git-logs] scummvm-tools master -> d6ce2824590f1598978a7ed0d64f270649b29ae0

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
427e53b245 TOOLS: Silence gcc warnings
d6ce282459 Merge pull request #18 from bonki/bonki-fix-warnings


Commit: 427e53b245a4fb81cc8a9318de290b9835fb7b02
    https://github.com/scummvm/scummvm-tools/commit/427e53b245a4fb81cc8a9318de290b9835fb7b02
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-02-19T23:01:23+01:00

Commit Message:
TOOLS: Silence gcc warnings

Changed paths:
    engines/gob/degob_script.cpp
    engines/scumm/descumm.cpp
    engines/scumm/descumm6.cpp


diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index afd0a8d..9e7b0ae 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -240,6 +240,7 @@ void Script::seek(uint32 off, int whence) {
 	switch (whence) {
 	case SEEK_END:
 		off = _totSize - off;
+		// fall through
 	case SEEK_SET:
 		_ptr = _totData + off;
 	break;
@@ -307,7 +308,7 @@ void Script::skipExpr(char stopToken) {
 
 			case 15:
 				skip(2);
-
+				// fall through
 			case 16:
 			case 26:
 			case 27:
diff --git a/engines/scumm/descumm.cpp b/engines/scumm/descumm.cpp
index e59a37e..ac6b086 100644
--- a/engines/scumm/descumm.cpp
+++ b/engines/scumm/descumm.cpp
@@ -1570,7 +1570,7 @@ void do_if_active_object(char *buf, byte opcode) {
 }
 
 void do_walk_actor_to_object(char *buf, byte opcode) {
-	
+
 	buf += sprintf(buf, "walkActorToObject(");
 	buf = add_a_tok(buf, (opcode & 0x80) ? A1V : A1B);
 
@@ -1622,7 +1622,7 @@ void do_set_object_name(char *buf, byte opcode) {
 	buf += sprintf(buf, "setObjectName(%d,", obj);
 	buf = add_a_tok(buf, A1B | A1ASCII);
 
-	sprintf(buf, ");", obj);
+	sprintf(buf, ");");
 }
 
 void do_if_state_code(char *buf, byte opcode) {
@@ -3117,6 +3117,7 @@ void next_line_V345(char *buf) {
 			do_tok(buf, "getObjectState", AVARSTORE | ((opcode & 0x80) ? A1V : A1W));
 			break;
 		}
+		// fall through
 	case 0x2F:
 	case 0x4F:
 	case 0x6F:
diff --git a/engines/scumm/descumm6.cpp b/engines/scumm/descumm6.cpp
index cfc8fad..06894a8 100644
--- a/engines/scumm/descumm6.cpp
+++ b/engines/scumm/descumm6.cpp
@@ -2300,6 +2300,7 @@ void next_line_HE_V100(char *output) {
 		break;
 	case 0x9C:
 		ext(output, "rpp|getAnimateVariable");
+		break;
 	case 0x9D:
 		ext(output, "rp|getActorWidth");
 		break;


Commit: d6ce2824590f1598978a7ed0d64f270649b29ae0
    https://github.com/scummvm/scummvm-tools/commit/d6ce2824590f1598978a7ed0d64f270649b29ae0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-15T08:06:49+01:00

Commit Message:
Merge pull request #18 from bonki/bonki-fix-warnings

TOOLS: Silence gcc warnings

Changed paths:
    engines/gob/degob_script.cpp
    engines/scumm/descumm.cpp
    engines/scumm/descumm6.cpp