Clean up demo_play_init

git-svn-id: https://s.snth.net/svn/neverball/trunk@3346 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/demo.c b/ball/demo.c
index 3076a8e..be4ca1c 100644 (file)
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -277,28 +277,25 @@ const char *demo_format_name(const char *fmt,
 /*---------------------------------------------------------------------------*/
 
 int demo_play_init(const char *name, const struct level *level,
-                   int mode, int t, int g, int e, int s, int b, int tt)
+                   int mode, int goal_e, int scores, int balls, int times)
 {
     struct demo demo;
 
     memset(&demo, 0, sizeof (demo));
 
     strncpy(demo.filename, demo_path(name), sizeof (demo.filename) - 1);
-
-    demo.mode = mode;
-    demo.date = time(NULL);
-
     strncpy(demo.player, config_get_s(CONFIG_PLAYER), sizeof (demo.player) - 1);
-
-    strncpy(demo.shot, level->shot, PATHMAX - 1);
-    strncpy(demo.file, level->file, PATHMAX - 1);
-
-    demo.time   = t;
-    demo.goal   = g;
-    demo.goal_e = e;
-    demo.score  = s;
-    demo.balls  = b;
-    demo.times  = tt;
+    strncpy(demo.shot, level_shot(level), PATHMAX - 1);
+    strncpy(demo.file, level_file(level), PATHMAX - 1);
+
+    demo.mode   = mode;
+    demo.date   = time(NULL);
+    demo.time   = level_time(level);
+    demo.goal   = level_goal(level);
+    demo.goal_e = goal_e;
+    demo.score  = scores;
+    demo.balls  = balls;
+    demo.times  = times;
 
     if ((demo_fp = fs_open(demo.filename, "w")))
     {

diff --git a/ball/demo.h b/ball/demo.h
index 7fccee9..0d59dc6 100644 (file)
--- a/ball/demo.h
+++ b/ball/demo.h
@@ -48,7 +48,7 @@ const char *demo_format_name(const char *fmt,
 /*---------------------------------------------------------------------------*/
 
 int  demo_play_init(const char *, const struct level *,
-                    int, int, int, int, int, int, int);
+                    int, int, int, int, int);
 void demo_play_step(void);
 void demo_play_stat(int, int, int);
 void demo_play_stop(void);

diff --git a/ball/progress.c b/ball/progress.c
index 63edc25..d08516d 100644 (file)
--- a/ball/progress.c
+++ b/ball/progress.c
@@ -94,9 +94,8 @@ void progress_init(int m)
 
 static int init_level(void)
 {
-    demo_play_init(USER_REPLAY_FILE, level, mode,
-                   level_time(level), level_goal(level),
-                   goal_e, curr.score, curr.balls, curr.times);
+    demo_play_init(USER_REPLAY_FILE, level, mode, goal_e,
+                   curr.score, curr.balls, curr.times);
 
     /*
      * Init both client and server, then process the first batch