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

sev- sev at scummvm.org
Sat Sep 10 20:37:33 CEST 2016


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:
fd411dbc84 DM: Fix compilation
d973b2314d JANITORIAL: Whitespace fixes


Commit: fd411dbc8449c3d3d4977220c91fdb2b35f75611
    https://github.com/scummvm/scummvm/commit/fd411dbc8449c3d3d4977220c91fdb2b35f75611
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T20:37:03+02:00

Commit Message:
DM: Fix compilation

Changed paths:
    engines/dm/timeline.h



diff --git a/engines/dm/timeline.h b/engines/dm/timeline.h
index 727ed14..b128744 100644
--- a/engines/dm/timeline.h
+++ b/engines/dm/timeline.h
@@ -116,7 +116,6 @@ public:
 		int16 _lightPower;
 		uint16 _slot; // Thing
 		int16 _slotOrdinal;
-		B_unionTimelineEvent() {}
 	} _B;
 
 	int16 getMapXY() { return (_B._location._mapX << 8) + _B._location._mapY; }
@@ -143,7 +142,6 @@ public:
 		uint16 _slot;
 		int16 _soundIndex;
 		byte _ticks;
-		C_uionTimelineEvent() {}
 	} _C;
 }; // @ EVENT
 


Commit: d973b2314dc3ac51ed727a18f3363e04ad6db8c7
    https://github.com/scummvm/scummvm/commit/d973b2314dc3ac51ed727a18f3363e04ad6db8c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T20:37:14+02:00

Commit Message:
JANITORIAL: Whitespace fixes

Changed paths:
    engines/dm/timeline.h



diff --git a/engines/dm/timeline.h b/engines/dm/timeline.h
index b128744..030d18d 100644
--- a/engines/dm/timeline.h
+++ b/engines/dm/timeline.h
@@ -37,62 +37,62 @@ namespace DM {
 /* Event types */
 enum TimelineEventType {
 /* Used when a creature in a group was damaged or killed by a Poison Cloud or by a closing door or if Lord Chaos is surrounded by = 3, Fluxcages */
-kM3_TMEventTypeCreateReactionEvent29DangerOnSquare = -3, // @ CM3_EVENT_CREATE_REACTION_EVENT_29_DANGER_ON_SQUARE 
+kM3_TMEventTypeCreateReactionEvent29DangerOnSquare = -3, // @ CM3_EVENT_CREATE_REACTION_EVENT_29_DANGER_ON_SQUARE
 /* Used when a projectile impacts with a creature in a group */
 kM2_TMEventTypeCreateReactionEvent30HitByProjectile = -2, // @ CM2_EVENT_CREATE_REACTION_EVENT_30_HIT_BY_PROJECTILE
 /* Used when the party bumps into a group or performs a melee attack */
 kM1_TMEventTypeCreateReactionEvent31ParyIsAdjacent = -1,  // @ CM1_EVENT_CREATE_REACTION_EVENT_31_PARTY_IS_ADJACENT
-k0_TMEventTypeNone = 0, // @ C00_EVENT_NONE                                       
-k1_TMEventTypeDoorAnimation = 1, // @ C01_EVENT_DOOR_ANIMATION                             
-k2_TMEventTypeDoorDestruction = 2, // @ C02_EVENT_DOOR_DESTRUCTION                           
-k5_TMEventTypeCorridor = 5, // @ C05_EVENT_CORRIDOR                                   
-k6_TMEventTypeWall = 6, // @ C06_EVENT_WALL                                       
-k7_TMEventTypeFakeWall = 7, // @ C07_EVENT_FAKEWALL                                   
-k8_TMEventTypeTeleporter = 8, // @ C08_EVENT_TELEPORTER                                 
-k9_TMEventTypePit = 9, // @ C09_EVENT_PIT                                        
-k10_TMEventTypeDoor = 10, // @ C10_EVENT_DOOR                                      
-k11_TMEventTypeEnableChampionAction = 11, // @ C11_EVENT_ENABLE_CHAMPION_ACTION                    
-k12_TMEventTypeHideDamageReceived = 12, // @ C12_EVENT_HIDE_DAMAGE_RECEIVED                      
-k13_TMEventTypeViAltarRebirth = 13, // @ C13_EVENT_VI_ALTAR_REBIRTH                          
-k20_TMEventTypePlaySound = 20, // @ C20_EVENT_PLAY_SOUND                                
-k22_TMEventTypeCPSE = 22, // @ C22_EVENT_CPSE                                      
-k24_TMEventTypeRemoveFluxcage = 24, // @ C24_EVENT_REMOVE_FLUXCAGE                           
-k25_TMEventTypeExplosion = 25, // @ C25_EVENT_EXPLOSION                                 
-k29_TMEventTypeGroupReactionDangerOnSquare = 29, // @ C29_EVENT_GROUP_REACTION_DANGER_ON_SQUARE           
-k30_TMEventTypeGroupReacionHitByProjectile = 30, // @ C30_EVENT_GROUP_REACTION_HIT_BY_PROJECTILE          
-k31_TMEventTypeGroupReactionPartyIsAdjecent = 31, // @ C31_EVENT_GROUP_REACTION_PARTY_IS_ADJACENT          
-k32_TMEventTypeUpdateAspectGroup = 32, // @ C32_EVENT_UPDATE_ASPECT_GROUP                       
+k0_TMEventTypeNone = 0, // @ C00_EVENT_NONE
+k1_TMEventTypeDoorAnimation = 1, // @ C01_EVENT_DOOR_ANIMATION
+k2_TMEventTypeDoorDestruction = 2, // @ C02_EVENT_DOOR_DESTRUCTION
+k5_TMEventTypeCorridor = 5, // @ C05_EVENT_CORRIDOR
+k6_TMEventTypeWall = 6, // @ C06_EVENT_WALL
+k7_TMEventTypeFakeWall = 7, // @ C07_EVENT_FAKEWALL
+k8_TMEventTypeTeleporter = 8, // @ C08_EVENT_TELEPORTER
+k9_TMEventTypePit = 9, // @ C09_EVENT_PIT
+k10_TMEventTypeDoor = 10, // @ C10_EVENT_DOOR
+k11_TMEventTypeEnableChampionAction = 11, // @ C11_EVENT_ENABLE_CHAMPION_ACTION
+k12_TMEventTypeHideDamageReceived = 12, // @ C12_EVENT_HIDE_DAMAGE_RECEIVED
+k13_TMEventTypeViAltarRebirth = 13, // @ C13_EVENT_VI_ALTAR_REBIRTH
+k20_TMEventTypePlaySound = 20, // @ C20_EVENT_PLAY_SOUND
+k22_TMEventTypeCPSE = 22, // @ C22_EVENT_CPSE
+k24_TMEventTypeRemoveFluxcage = 24, // @ C24_EVENT_REMOVE_FLUXCAGE
+k25_TMEventTypeExplosion = 25, // @ C25_EVENT_EXPLOSION
+k29_TMEventTypeGroupReactionDangerOnSquare = 29, // @ C29_EVENT_GROUP_REACTION_DANGER_ON_SQUARE
+k30_TMEventTypeGroupReacionHitByProjectile = 30, // @ C30_EVENT_GROUP_REACTION_HIT_BY_PROJECTILE
+k31_TMEventTypeGroupReactionPartyIsAdjecent = 31, // @ C31_EVENT_GROUP_REACTION_PARTY_IS_ADJACENT
+k32_TMEventTypeUpdateAspectGroup = 32, // @ C32_EVENT_UPDATE_ASPECT_GROUP
 /* Events = 33,-36 and = 38,-41 are used for individual creatures only while the group is attacking the party */
-k33_TMEventTypeUpdateAspectCreature_0 = 33,  // @ C33_EVENT_UPDATE_ASPECT_CREATURE_0                  
-k34_TMEventTypeUpdateAspectCreature_1 = 34, // @ C34_EVENT_UPDATE_ASPECT_CREATURE_1                  
-k35_TMEventTypeUpdateAspectCreature_2 = 35, // @ C35_EVENT_UPDATE_ASPECT_CREATURE_2                  
-k36_TMEventTypeUpdateAspectCreature_3 = 36, // @ C36_EVENT_UPDATE_ASPECT_CREATURE_3                  
-k37_TMEventTypeUpdateBehaviourGroup = 37, // @ C37_EVENT_UPDATE_BEHAVIOR_GROUP                     
-k38_TMEventTypeUpdateBehaviour_0 = 38, // @ C38_EVENT_UPDATE_BEHAVIOR_CREATURE_0                
-k39_TMEventTypeUpdateBehaviour_1 = 39, // @ C39_EVENT_UPDATE_BEHAVIOR_CREATURE_1                
-k40_TMEventTypeUpdateBehaviour_2 = 40, // @ C40_EVENT_UPDATE_BEHAVIOR_CREATURE_2                
-k41_TMEventTypeUpdateBehaviour_3 = 41, // @ C41_EVENT_UPDATE_BEHAVIOR_CREATURE_3                
+k33_TMEventTypeUpdateAspectCreature_0 = 33,  // @ C33_EVENT_UPDATE_ASPECT_CREATURE_0
+k34_TMEventTypeUpdateAspectCreature_1 = 34, // @ C34_EVENT_UPDATE_ASPECT_CREATURE_1
+k35_TMEventTypeUpdateAspectCreature_2 = 35, // @ C35_EVENT_UPDATE_ASPECT_CREATURE_2
+k36_TMEventTypeUpdateAspectCreature_3 = 36, // @ C36_EVENT_UPDATE_ASPECT_CREATURE_3
+k37_TMEventTypeUpdateBehaviourGroup = 37, // @ C37_EVENT_UPDATE_BEHAVIOR_GROUP
+k38_TMEventTypeUpdateBehaviour_0 = 38, // @ C38_EVENT_UPDATE_BEHAVIOR_CREATURE_0
+k39_TMEventTypeUpdateBehaviour_1 = 39, // @ C39_EVENT_UPDATE_BEHAVIOR_CREATURE_1
+k40_TMEventTypeUpdateBehaviour_2 = 40, // @ C40_EVENT_UPDATE_BEHAVIOR_CREATURE_2
+k41_TMEventTypeUpdateBehaviour_3 = 41, // @ C41_EVENT_UPDATE_BEHAVIOR_CREATURE_3
 /* Projectiles created by a champion (by casting a spell, shooting a weapon or throwing an object) or by a creature (by casting a spell) ignore impacts during their first movement otherwise an impact would always occur immediately as these projectiles are created on the champion or creature square */
-k48_TMEventTypeMoveProjectileIgnoreImpacts = 48, // @ C48_EVENT_MOVE_PROJECTILE_IGNORE_IMPACTS            
+k48_TMEventTypeMoveProjectileIgnoreImpacts = 48, // @ C48_EVENT_MOVE_PROJECTILE_IGNORE_IMPACTS
 /* Projectiles created by projectile launcher sensors never ignore impacts as well as all other projectiles after their first movement */
-k49_TMEventTypeMoveProjectile = 49,  // @ C49_EVENT_MOVE_PROJECTILE                           
-k53_TMEventTypeWatchdoge = 53, // @ C53_EVENT_WATCHDOG                                  
-k60_TMEventTypeMoveGroupSilent = 60, // @ C60_EVENT_MOVE_GROUP_SILENT                         
-k61_TMEventTypeMoveGroupAudible = 61, // @ C61_EVENT_MOVE_GROUP_AUDIBLE                        
-k65_TMEventTypeEnableGroupGenerator = 65, // @ C65_EVENT_ENABLE_GROUP_GENERATOR                    
-k70_TMEventTypeLight = 70, // @ C70_EVENT_LIGHT                                     
-k71_TMEventTypeInvisibility = 71, // @ C71_EVENT_INVISIBILITY                              
-k72_TMEventTypeChampionShield = 72, // @ C72_EVENT_CHAMPION_SHIELD                           
-k73_TMEventTypeThievesEye = 73, // @ C73_EVENT_THIEVES_EYE                               
-k74_TMEventTypePartyShield = 74, // @ C74_EVENT_PARTY_SHIELD                              
-k75_TMEventTypePoisonChampion = 75, // @ C75_EVENT_POISON_CHAMPION                           
-k77_TMEventTypeSpellShield = 77, // @ C77_EVENT_SPELLSHIELD                               
-k78_TMEventTypeFireShield = 78, // @ C78_EVENT_FIRESHIELD                                
-k79_TMEventTypeFootprints = 79, // @ C79_EVENT_FOOTPRINTS                                
-k80_TMEventTypeMagicMap_C80 = 80, // @ C80_EVENT_MAGIC_MAP                                 
-k81_TMEventTypeMagicMap_C81 = 81, // @ C81_EVENT_MAGIC_MAP                                 
-k82_TMEventTypeMagicMap_C82 = 82, // @ C82_EVENT_MAGIC_MAP                                 
-k83_TMEventTypeMagicMap_C83 = 83  // @ C83_EVENT_MAGIC_MAP    
+k49_TMEventTypeMoveProjectile = 49,  // @ C49_EVENT_MOVE_PROJECTILE
+k53_TMEventTypeWatchdoge = 53, // @ C53_EVENT_WATCHDOG
+k60_TMEventTypeMoveGroupSilent = 60, // @ C60_EVENT_MOVE_GROUP_SILENT
+k61_TMEventTypeMoveGroupAudible = 61, // @ C61_EVENT_MOVE_GROUP_AUDIBLE
+k65_TMEventTypeEnableGroupGenerator = 65, // @ C65_EVENT_ENABLE_GROUP_GENERATOR
+k70_TMEventTypeLight = 70, // @ C70_EVENT_LIGHT
+k71_TMEventTypeInvisibility = 71, // @ C71_EVENT_INVISIBILITY
+k72_TMEventTypeChampionShield = 72, // @ C72_EVENT_CHAMPION_SHIELD
+k73_TMEventTypeThievesEye = 73, // @ C73_EVENT_THIEVES_EYE
+k74_TMEventTypePartyShield = 74, // @ C74_EVENT_PARTY_SHIELD
+k75_TMEventTypePoisonChampion = 75, // @ C75_EVENT_POISON_CHAMPION
+k77_TMEventTypeSpellShield = 77, // @ C77_EVENT_SPELLSHIELD
+k78_TMEventTypeFireShield = 78, // @ C78_EVENT_FIRESHIELD
+k79_TMEventTypeFootprints = 79, // @ C79_EVENT_FOOTPRINTS
+k80_TMEventTypeMagicMap_C80 = 80, // @ C80_EVENT_MAGIC_MAP
+k81_TMEventTypeMagicMap_C81 = 81, // @ C81_EVENT_MAGIC_MAP
+k82_TMEventTypeMagicMap_C82 = 82, // @ C82_EVENT_MAGIC_MAP
+k83_TMEventTypeMagicMap_C83 = 83  // @ C83_EVENT_MAGIC_MAP
 };
 
 #define k0x0007_generatedCreatureCount 0x0007	// @ MASK0x0007_GENERATED_CREATURE_COUNT
@@ -150,7 +150,7 @@ class Timeline {
 public:
 	uint16 _eventMaxCount; // @ G0369_ui_EventMaximumCount
 	TimelineEvent *_events; // @ G0370_ps_Events
-	uint16 _eventCount; // @ G0372_ui_EventCount 
+	uint16 _eventCount; // @ G0372_ui_EventCount
 	uint16 *_timeline; // @ G0371_pui_Timeline
 	uint16 _firstUnusedEventIndex; // @ G0373_ui_FirstUnusedEventIndex
 





More information about the Scummvm-git-logs mailing list