From: parasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Date: Fri, 11 Feb 2011 21:09:26 +0000 (+0000)
Subject: Fix misnamed function
X-Git-Tag: fremantle/1.5.5-2~65
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=ce861a0141dd6c3e26a7c3d81cd793c1254f2494;p=neverball

Fix misnamed function

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

diff --git a/ball/demo.c b/ball/demo.c
index 53d3e80..4d530aa 100644
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -376,7 +376,7 @@ static void demo_update_read(float dt)
 
 static struct lockstep update_step = { demo_update_read, DT };
 
-float demo_play_blend(void)
+float demo_replay_blend(void)
 {
     return lockstep_blend(&update_step);
 }
diff --git a/ball/demo.h b/ball/demo.h
index a32c817..4d88e33 100644
--- a/ball/demo.h
+++ b/ball/demo.h
@@ -50,7 +50,6 @@ int  demo_play_init(const char *, const struct level *, int, int, int, int);
 void demo_play_step(void);
 void demo_play_stat(int, int, int);
 void demo_play_stop(void);
-float demo_play_blend(void);
 
 int  demo_saved (void);
 void demo_rename(const char *);
@@ -62,6 +61,7 @@ void demo_rename_player(const char *name, const char *player);
 int  demo_replay_init(const char *, int *, int *, int *, int *, int *);
 int  demo_replay_step(float);
 void demo_replay_stop(int);
+float demo_replay_blend(void);
 
 const char *curr_demo(void);
 
diff --git a/ball/st_ball.c b/ball/st_ball.c
index 7daf590..b8939ee 100644
--- a/ball/st_ball.c
+++ b/ball/st_ball.c
@@ -242,7 +242,7 @@ static void ball_timer(int id, float dt)
         load_ball_demo();
     }
 
-    game_client_blend(demo_play_blend());
+    game_client_blend(demo_replay_blend());
 }
 
 static int ball_buttn(int b, int d)
diff --git a/ball/st_demo.c b/ball/st_demo.c
index 51a62df..f087d7d 100644
--- a/ball/st_demo.c
+++ b/ball/st_demo.c
@@ -471,7 +471,7 @@ static void demo_play_timer(int id, float dt)
     else
     {
         progress_step();
-        game_client_blend(demo_play_blend());
+        game_client_blend(demo_replay_blend());
     }
 }
 
diff --git a/ball/st_help.c b/ball/st_help.c
index 39abc4e..ed96797 100644
--- a/ball/st_help.c
+++ b/ball/st_help.c
@@ -395,7 +395,7 @@ static void help_demo_timer(int id, float dt)
     if (!demo_replay_step(dt))
         goto_state(&st_help);
 
-    game_client_blend(demo_play_blend());
+    game_client_blend(demo_replay_blend());
 }
 
 static int help_demo_buttn(int b, int d)
diff --git a/ball/st_title.c b/ball/st_title.c
index b97d54a..d83c029 100644
--- a/ball/st_title.c
+++ b/ball/st_title.c
@@ -264,7 +264,7 @@ static void title_timer(int id, float dt)
             mode = 3;
         }
         else
-            game_client_blend(demo_play_blend());
+            game_client_blend(demo_replay_blend());
 
         break;