0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undo of previous accidental checkin

Browse source
This commit is contained in:
Dave White 2004-08-30 02:00:36 +00:00
parent 99781f3447
commit 404c93ad6f
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
View file

@ -181,11 +181,6 @@ simple_targetting=yes
[event]
name=start
[terrain]
x=10-20
y=10-20
letter=d
[/terrain]
[message]
id=msg1_1
speaker=narrator

8
src/titlescreen.cpp
View file

@ -41,6 +41,8 @@ void fade_logo(display& screen, int xpos, int ypos)
std::cerr << "logo size: " << logo->w << "," << logo->h << "\n";
const video_change_detector disp_change_detector(screen.video());
for(int x = 0; x != logo->w; ++x) {
SDL_Rect srcrect = {x,0,1,logo->h};
SDL_Rect dstrect = {xpos+x,ypos,1,logo->h};
@ -63,7 +65,13 @@ void fade_logo(display& screen, int xpos, int ypos)
SDL_Delay(10);
events::pump();
if(disp_change_detector.changed()) {
faded_in = true;
fade_logo(screen,xpos,ypos);
return;
}
}
}
std::cerr << "logo faded in\n";