[Scummvm-git-logs] scummvm master -> fb7bfffe351866cf42ed9ea1c6b78f5e2b3f36e3

[digitall]

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

Summary:
3f9afa81bd NUVIE: Fix compiler warnings
fb7bfffe35 NUVIE: Fix compiler warnings


Commit: 3f9afa81bd560f59f63d51db479c11fa0064a20d
    https://github.com/scummvm/scummvm/commit/3f9afa81bd560f59f63d51db479c11fa0064a20d
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-04-19T12:19:14+01:00

Commit Message:
NUVIE: Fix compiler warnings

Changed paths:
    engines/ultima/nuvie/core/converse.h


diff --git a/engines/ultima/nuvie/core/converse.h b/engines/ultima/nuvie/core/converse.h
index 4361b9454a..a9b15c3677 100644
--- a/engines/ultima/nuvie/core/converse.h
+++ b/engines/ultima/nuvie/core/converse.h
@@ -239,8 +239,8 @@ public:
 	converse_value read(uint32 advance = 1);
 	converse_value read2();
 	converse_value read4();
-	converse_value peek(uint32 skip = 0) {
-		return ((converse_value) * (buf_pt + skip));
+	converse_value peek(uint32 displacement = 0) {
+		return ((converse_value) * (buf_pt + displacement));
 	}
 
 	/* Writing */


Commit: fb7bfffe351866cf42ed9ea1c6b78f5e2b3f36e3
    https://github.com/scummvm/scummvm/commit/fb7bfffe351866cf42ed9ea1c6b78f5e2b3f36e3
Author: jepael (jepael at users.noreply.github.com)
Date: 2020-04-19T12:19:14+01:00

Commit Message:
NUVIE: Fix compiler warnings

Changed paths:
    engines/ultima/nuvie/core/timed_event.h


diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index fd5fd3dfdc..42942b7a55 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -122,9 +122,9 @@ public:
 class TimedMessage : public TimedEvent {
 	Std::string msg;
 public:
-	TimedMessage(uint32 reltime, const char *m, bool repeat = false)
+	TimedMessage(uint32 reltime, const char *m, bool repeating = false)
 		: TimedEvent(reltime), msg(m) {
-		repeat_count = repeat ? -1 : 0;
+		repeat_count = repeating ? -1 : 0;
 	}
 	void timed(uint32 evtime) override {
 		DEBUG(0, LEVEL_NOTIFICATION, "Activate! evtime=%d msg=\"%s\"\n", evtime, msg.c_str());