[Scummvm-git-logs] scummvm master -> 4b780adf8bf7066fd7ec75e3176640235f9493d0

[dreammaster]

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:
4b780adf8b NUVIE: Compilation fix


Commit: 4b780adf8bf7066fd7ec75e3176640235f9493d0
    https://github.com/scummvm/scummvm/commit/4b780adf8bf7066fd7ec75e3176640235f9493d0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-01T14:35:32-08:00

Commit Message:
NUVIE: Compilation fix

Changed paths:
    engines/ultima/nuvie/core/converse_interpret.cpp
    engines/ultima/nuvie/core/events.cpp
    engines/ultima/nuvie/files/nuvie_io.h


diff --git a/engines/ultima/nuvie/core/converse_interpret.cpp b/engines/ultima/nuvie/core/converse_interpret.cpp
index f6378a7..97c36c5 100644
--- a/engines/ultima/nuvie/core/converse_interpret.cpp
+++ b/engines/ultima/nuvie/core/converse_interpret.cpp
@@ -789,7 +789,7 @@ bool ConverseInterpret::op(stack<converse_typed_value> &i) {
 		break;
 	case U6OP_INPUTSTR: // 0xf9 (string or integer)
 		answer_mode = ANSWER_NO; // reset answer switch
-	//fall through here
+		// fall through
 	case U6OP_INPUT: // 0xfb (integer)
 		v[0] = pop_arg(i); // var
 		v[1] = pop_arg(i); // type (should be 0xb2)
diff --git a/engines/ultima/nuvie/core/events.cpp b/engines/ultima/nuvie/core/events.cpp
index a9a458b..2d43d7e 100644
--- a/engines/ultima/nuvie/core/events.cpp
+++ b/engines/ultima/nuvie/core/events.cpp
@@ -3496,7 +3496,7 @@ bool Events::newAction(EventMode new_mode) {
 		break;
 	case DROP_MODE:
 		drop_start();
-	// drop to EQUIP_MODE (move cursor to inventory)
+		// fall through
 	case EQUIP_MODE: // if this was called from moveCursorToInventory, the
 		// mode has now changed, so it wont be called again
 		moveCursorToInventory();
diff --git a/engines/ultima/nuvie/files/nuvie_io.h b/engines/ultima/nuvie/files/nuvie_io.h
index bfd223f..0e29410 100644
--- a/engines/ultima/nuvie/files/nuvie_io.h
+++ b/engines/ultima/nuvie/files/nuvie_io.h
@@ -54,7 +54,7 @@ public:
 	};
 
 	unsigned char *readAll();
-	unsigned char *readBuf(uint32 read_size, unsigned int *bytes_read);
+	unsigned char *readBuf(uint32 read_size, uint32 *bytes_read);
 	virtual bool readToBuf(unsigned char *buf, uint32 buf_size) {
 		return false;
 	};