* refine ordersong

   * merge topsong and ordersong to single ordersong.c
   * change max song from MAX_MOVIE to MAX_SONG
   * change random menu 'movie' to sequential slide show mode


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4779 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 3 insertions, 4 deletions

diff --git a/include/proto.h b/include/proto.h
index 879d9a8a..80265894 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -141,7 +141,6 @@ int give_money_ui(const char *userid);
 int p_give(void);
 int p_cloak(void);
 int p_from(void);
-int ordersong(void);
 int p_exmail(void);
 int mail_redenvelop(const char* from, const char* to, int money, char *fpath);
 void resolve_over18(void);
@@ -604,9 +603,9 @@ int  term_init(void);
 void term_resize(int w, int h);
 void bell(void);
 
-/* topsong */
-void sortsong(void);
-int topsong(void);
+/* ordersong */
+int  ordersong(void);
+int  topsong(void);
 
 /* user */
 int kill_user(int num, const char *userid);