From b40161e82027a29e02388cf801c47bcc39eae60a Mon Sep 17 00:00:00 2001
From: Yoann <yoann.b87@voila.fr>
Date: Fri, 20 Jan 2012 10:53:43 +0100
Subject: [PATCH 1/2] Identification du screenshot par nom de fichier contenant
graine et time().
---
view.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/view.cpp b/view.cpp
index b88b844..37d38a1 100644
--- a/view.cpp
+++ b/view.cpp
@@ -283,9 +283,13 @@ void Camera::keyboard(const SDL_KeyboardEvent &eventKey) {
if (eventKey.type != SDL_KEYDOWN) break;
std::cout << *this << std::endl;
break;
- case 't':
- takeScreenshot("123.bmp");
+ case 't': {
+ char* file = new char[256];
+ memset(file,'\n',256);
+ sprintf(file,"city-builder_%d_%d.bmp",Chose::initialSeed,(int)time(NULL));
+ takeScreenshot(file);
break;
+ }
default:
break;
}
From 5b6f17cf81424cba51986e7823f6de628fc1ed99 Mon Sep 17 00:00:00 2001
From: Yoann <yoann.b87@voila.fr>
Date: Fri, 20 Jan 2012 11:27:21 +0100
Subject: [PATCH 2/2] Voite de vitesse ok.
---
view.cpp | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/view.cpp b/view.cpp
index 37d38a1..e9b14b1 100644
--- a/view.cpp
+++ b/view.cpp
@@ -246,7 +246,7 @@ void Camera::mouseMotion(const SDL_MouseMotionEvent &event) {
void Camera::keyboard(const SDL_KeyboardEvent &eventKey) {
switch(eventKey.keysym.sym) {
case SDLK_UP:
- up = up ^ (eventKey.type == SDL_KEYDOWN);
+ up = (eventKey.type == SDL_KEYDOWN);
break;
case SDLK_DOWN:
down = (eventKey.type == SDL_KEYDOWN);
@@ -266,11 +266,29 @@ void Camera::keyboard(const SDL_KeyboardEvent &eventKey) {
case SDLK_ESCAPE:
exit(0);
break;
+ case SDLK_KP0:
+ moveSensitivity = 0;
+ break;
+ case SDLK_KP1:
+ moveSensitivity = 300;
+ break;
+ case SDLK_KP2:
+ moveSensitivity = 1000;
+ break;
+ case SDLK_KP3:
+ moveSensitivity = 6000;
+ break;
default :
switch(SDL_GetKeyName(eventKey.keysym.sym)[0]) {
case 'q':
exit(0);
break;
+ case 'a' :
+ up = true;
+ break;
+ case 'z' :
+ up = false;
+ break;
case 's':
if (eventKey.type != SDL_KEYDOWN) break;
moveSensitivity = std::min(50000,std::max(moveSensitivity+1, moveSensitivity*10/9));