summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLAMMJohnson <john_anthony@lavabit.com>2011-04-27 17:10:23 +0100
committerLAMMJohnson <john_anthony@lavabit.com>2011-04-27 17:10:23 +0100
commit9c580c71f69952ec4ee384ac3f133b82d910ef9d (patch)
tree7526fd67c0e5405c86b27db0e07e8a45d6123eae
parenta3dffce69c8b2e491b18980374e50d08deb086fa (diff)
downloadnyancat-9c580c71f69952ec4ee384ac3f133b82d910ef9d.tar.gz
nyancat-9c580c71f69952ec4ee384ac3f133b82d910ef9d.tar.bz2
nyancat-9c580c71f69952ec4ee384ac3f133b82d910ef9d.zip
Tidying
-rw-r--r--nyan.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/nyan.c b/nyan.c
index 1545cff..874ee64 100644
--- a/nyan.c
+++ b/nyan.c
@@ -311,6 +311,8 @@ int main( int argc, char *argv[] )
{
int i, draw_time, last_draw, curr_frame = 0;
+ srand( time(NULL) );
+
/* Handle flags */
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-hw"))
@@ -319,20 +321,17 @@ int main( int argc, char *argv[] )
SURF_TYPE = SDL_SWSURFACE;
}
-
- srand( time(NULL) );
-
SDL_Init( SDL_INIT_EVERYTHING );
screen = SDL_SetVideoMode( 0, 0, SCREEN_BPP, SURF_TYPE | SDL_FULLSCREEN );
- Mix_OpenAudio( 44100, AUDIO_S16, 2, 256 );
+ /* SDL_ShowCursor(0); */
load_images();
- load_music();
+ bgcolor = SDL_MapRGB(screen->format, 0x00, 0x33, 0x66);
+ Mix_OpenAudio( 44100, AUDIO_S16, 2, 256 );
+ load_music();
Mix_PlayMusic(music, 0);
- bgcolor = SDL_MapRGB(screen->format, 0x00, 0x33, 0x66);
-
#ifdef XINERAMA
if (!(dpy = XOpenDisplay(NULL)))
puts("Failed to open Xinerama display information.");
@@ -342,7 +341,6 @@ int main( int argc, char *argv[] )
add_cat((screen->w - cat_img[0]->w) / 2 , (screen->h - cat_img[0]->h) / 2);
#endif /* Xinerama */
-
/* clear initial input */
while( SDL_PollEvent( &event ) ) {}