[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.95,1.96
Jonathan Gray
khalek at users.sourceforge.net
Thu Oct 9 07:04:12 CEST 2003
Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv13400
Modified Files:
sdl-common.cpp
Log Message:
make gcc 2.95 -Wshadow happy (yes fingolfin its a broken compiler :)
Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- sdl-common.cpp 6 Oct 2003 00:09:26 -0000 1.95
+++ sdl-common.cpp 9 Oct 2003 14:03:36 -0000 1.96
@@ -409,26 +409,26 @@
}
void OSystem_SDL_Common::kbd_mouse() {
- uint32 time = get_msecs();
- if (time >= km.last_time + km.delay_time) {
- km.last_time = time;
+ uint32 curTime = get_msecs();
+ if (curTime >= km.last_time + km.delay_time) {
+ km.last_time = curTime;
if (km.x_down_count == 1) {
- km.x_down_time = time;
+ km.x_down_time = curTime;
km.x_down_count = 2;
}
if (km.y_down_count == 1) {
- km.y_down_time = time;
+ km.y_down_time = curTime;
km.y_down_count = 2;
}
if (km.x_vel || km.y_vel) {
if (km.x_down_count) {
- if (time > km.x_down_time + km.delay_time * 12) {
+ if (curTime > km.x_down_time + km.delay_time * 12) {
if (km.x_vel > 0)
km.x_vel++;
else
km.x_vel--;
- } else if (time > km.x_down_time + km.delay_time * 8) {
+ } else if (curTime > km.x_down_time + km.delay_time * 8) {
if (km.x_vel > 0)
km.x_vel = 5;
else
@@ -436,12 +436,12 @@
}
}
if (km.y_down_count) {
- if (time > km.y_down_time + km.delay_time * 12) {
+ if (curTime > km.y_down_time + km.delay_time * 12) {
if (km.y_vel > 0)
km.y_vel++;
else
km.y_vel--;
- } else if (time > km.y_down_time + km.delay_time * 8) {
+ } else if (curTime > km.y_down_time + km.delay_time * 8) {
if (km.y_vel > 0)
km.y_vel = 5;
else
More information about the Scummvm-git-logs
mailing list