[Scummvm-cvs-logs] scummvm master -> ef3c1a777e991b6c117fed0a5d922ff23e96af44

Kirben kirben at optusnet.com.au
Sun Jan 29 07:28:05 CET 2012


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:
ef3c1a777e Revert "SCUMM: Fix minor compiler warnings."


Commit: ef3c1a777e991b6c117fed0a5d922ff23e96af44
    https://github.com/scummvm/scummvm/commit/ef3c1a777e991b6c117fed0a5d922ff23e96af44
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2012-01-28T22:24:36-08:00

Commit Message:
Revert "SCUMM: Fix minor compiler warnings."

This reverts commit ca781b5822a19b460afd2887e67302e46b280460.

Changed paths:
    engines/scumm/actor.h
    engines/scumm/scumm_v0.h
    engines/scumm/verbs.h



diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index f081da8..d8e3692 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -343,7 +343,7 @@ enum ActorC64MiscFlags {
 	kActorMiscFlag_10      = 0x10, // ???
 	kActorMiscFlag_20      = 0x20, // ???
 	kActorMiscFlagFreeze   = 0x40, // Stop moving
-	kActorMiscFlagHide     = 0x80  // Hide actor (e.g. dead or wearing radiation suit)
+	kActorMiscFlagHide     = 0x80, // Hide actor (e.g. dead or wearing radiation suit)
 };
 
 class ActorC64 : public Actor_v2 {
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index ff4a43e..c2af6d4 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -36,7 +36,7 @@ protected:
 		kModeCutscene = 0,   // cutscene active
 		kModeKeypad = 1,     // kid selection / dial pad / save-load dialog
 		kModeNoNewKid = 2,   // verb "new kid" disabled (e.g. when entering lab)
-		kModeNormal = 3      // normal playing mode
+		kModeNormal = 3,     // normal playing mode
 	};
 
 	enum ObjectType {
diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h
index 8085b90..fce260e 100644
--- a/engines/scumm/verbs.h
+++ b/engines/scumm/verbs.h
@@ -82,7 +82,7 @@ enum VerbPrepsV0 {
 	kVerbPrepWith   = 2,
 	kVerbPrepOn     = 3,
 	kVerbPrepTo     = 4,
-	kVerbPrepObject = 0xFF  // prep depends on object (USE)
+	kVerbPrepObject = 0xFF, // prep depends on object (USE)
 };
 
 } // End of namespace Scumm






More information about the Scummvm-git-logs mailing list