projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3f432f
)
ugly but working fix for the beam bug.
author
Tobias Gläßer
<tobi.web@gmx.de>
Sat, 21 Feb 2004 18:51:42 +0000
(18:51 +0000)
committer
Tobias Gläßer
<tobi.web@gmx.de>
Sat, 21 Feb 2004 18:51:42 +0000
(18:51 +0000)
SVN-Revision: 144
src/intro.c
patch
|
blob
|
history
diff --git
a/src/intro.c
b/src/intro.c
index
bb9f529
..
fffdaf7
100644
(file)
--- a/
src/intro.c
+++ b/
src/intro.c
@@
-205,15
+205,15
@@
int intro(void)
}
}
- if (timer_get_gone(&timer) >= 5000)
+ if (timer_get_gone(&timer) >= 5000
&& timer_get_gone(&timer) <= 8000 && height[j] != 105
)
{
/* Beam gown up! */
texture_draw_part(&bkgd,
{
/* Beam gown up! */
texture_draw_part(&bkgd,
- 3
20, 32 + (copter[0].h), 32
0,
+ 3
10, 32 + (copter[0].h), 31
0,
32 + (copter[0].h),
32 + (copter[0].h),
- (gown_upset.w),
- 3
6
8 + (gown_upset.h) - (copter[0].h), NO_UPDATE);
+ (gown_upset.w)
+ 20
,
+ 3
7
8 + (gown_upset.h) - (copter[0].h), NO_UPDATE);
for (j = 0; j < (gown_upset.sdl_surface -> w); j++)
for (j = 0; j < (gown_upset.sdl_surface -> w); j++)
@@
-233,22
+233,29
@@
int intro(void)
texture_draw_part(&gown_upset,src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE);
texture_draw_part(&gown_upset,src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE);
- height[j] = height[j] - height_speed[j];
+ height[j] = 400 + rand() % 10 - (int)(300. * ((float)(timer_get_gone(&timer) - 5000)/(float)3000.));
+ if(height[j] < 105)
+ height[j] = 105;
- if ((i % 2) == 0)
- height_speed[j]++;
+ height_speed[j] = (float)(timer_get_gone(&timer) - 5000) / 300.;
}
update_rect(screen,
}
update_rect(screen,
- 3
2
0,
+ 3
1
0,
32 + (copter[0].h),
32 + (copter[0].h),
- (gown_upset.w),
+ (gown_upset.w)
+ 20
,
400 + (gown_upset.h) - (copter[0].h));
}
if (timer_get_gone(&timer) >= 8000 && scene == 5)
{
400 + (gown_upset.h) - (copter[0].h));
}
if (timer_get_gone(&timer) >= 8000 && scene == 5)
{
+ texture_draw_part(&bkgd,
+ 310, 32 + (copter[0].h), 310,
+ 32 + (copter[0].h),
+ (gown_upset.w) + 20,
+ 368 + (gown_upset.h) - (copter[0].h), NO_UPDATE);
+
++scene;
/* Tux gets mad! */
++scene;
/* Tux gets mad! */