summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-05-27 22:26:44 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2013-05-27 22:29:42 +0200
commitb22d852b4c4aa89e0394397a703ecfa442b0a928 (patch)
treea1e29142aabf11393eb3e0604deb4b89a6124fe7 /src/common
parent12313fecf5a0ccad45f88575a24582b8363bd5a7 (diff)
downloadcolobot-b22d852b4c4aa89e0394397a703ecfa442b0a928.tar.gz
colobot-b22d852b4c4aa89e0394397a703ecfa442b0a928.tar.bz2
colobot-b22d852b4c4aa89e0394397a703ecfa442b0a928.zip
Fixed variable shadowing warnings
* fixed -Wshadow warnings * refactored some constructors
Diffstat (limited to 'src/common')
-rw-r--r--src/common/event.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/common/event.h b/src/common/event.h
index 97b798a..8aef603 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -730,16 +730,15 @@ struct Event
ActiveEventData active;
};
- Event(EventType type = EVENT_NULL)
- {
- this->type = type;
-
- systemEvent = false;
- rTime = 0.0f;
- mouseButtonsState = 0;
- trackedKeysState = 0;
- customParam = 0;
- }
+ explicit Event(EventType _type = EVENT_NULL)
+ : type(_type)
+ , systemEvent(false)
+ , rTime(0.0f)
+ , kmodState(0)
+ , trackedKeysState(0)
+ , mouseButtonsState(0)
+ , customParam(0)
+ {}
};