X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fgame.c;h=ad5e20c60bf9521230f60943234cfb96c704b120;hp=85108333d617a5508dba067bebb48510e2ad34a5;hb=ef16dea09f87b15fc6d58fae0aa0832e0648c00e;hpb=efb17348438f10c929e2e9807013969f71802661

diff --git a/src/game.c b/src/game.c
index 8510833..ad5e20c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,24 +1,19 @@
-/*
-   Copyright (C) Prikol Software 1996-1997
-   Copyright (C) Aleksey Volynskov 1996-1997
-   Copyright (C) <ARembo@gmail.com> 2011
-
-   This file is part of the Doom2D:Rembo project.
-
-   Doom2D:Rembo is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-   Doom2D:Rembo is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/> or
-   write to the Free Software Foundation, Inc.,
-   51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-*/
+/* Copyright (C) 1996-1997 Aleksey Volynskov
+ * Copyright (C) 2011 Rambo
+ * Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "glob.h"
 #include <stdio.h>
@@ -96,7 +91,7 @@ static void set_trans(int st) {
 }
 
 void load_game (int n) {
-  F_freemus();
+  MUS_free();
   W_init();
   F_loadgame(n);
   set_trans(GS_GAME);
@@ -107,13 +102,13 @@ void load_game (int n) {
   BM_mark(&pl1.o,BM_PLR1);
   if(_2pl) BM_mark(&pl2.o,BM_PLR2);
   MN_mark();
-  S_startmusic(music_time);
+  //MUS_start(music_time);
+  MUS_start(0);
 }
 
 void G_start (void) {
   char s[8];
-
-  F_freemus();
+  MUS_free();
   sprintf(s,"MAP%02u",(word)g_map);
   F_loadmap(s);
   set_trans(GS_GAME);
@@ -131,7 +126,8 @@ void G_start (void) {
   BM_mark(&pl1.o,BM_PLR1);
   if(_2pl) BM_mark(&pl2.o,BM_PLR2);
   MN_mark();
-  S_startmusic(music_time);
+  //MUS_start(music_time);
+  MUS_start(0);
 }
 
 #define GGAS_TOTAL (MN__LAST-MN_DEMON+16+10)
@@ -263,7 +259,7 @@ void G_act (void) {
         G_start();
       } else {
 	      g_st = GS_BVIDEO;
-        F_freemus();
+        MUS_free();
 	    }
     }
 #endif
@@ -319,7 +315,7 @@ void G_act (void) {
   if(g_exit==1) {
 
 	if(G_end_video()) {
-	  F_freemus();
+	  MUS_free();
 	  g_st=GS_EVIDEO;
 	  return;
 	}
@@ -330,20 +326,23 @@ inter:
 	  case 31: case 32: g_map=16;set_trans(GS_INTER);break;
 	  default: ++g_map;set_trans(GS_INTER);break;
 	}
-	F_freemus();
-	if(g_st==GS_INTER) {
-	  F_loadmus("INTERMUS");
-        }else {F_loadmus("\x8a\x8e\x8d\x85\x96\x0");if(mus_vol>0) {S_volumemusic(128);} }
-	S_startmusic(0);
+	MUS_free();
+	if (g_st == GS_INTER) {
+	  MUS_load("INTERMUS");
+  } else {
+    MUS_load("\x8a\x8e\x8d\x85\x96\x0");
+    MUS_volume(128);
+  }
+	MUS_start(0);
   }else if(g_exit==2) {
 	switch(g_map) {
 	  case 31: g_map=32;set_trans(GS_INTER);break;
 	  case 32: g_map=16;set_trans(GS_INTER);break;
 	  default: g_map=31;set_trans(GS_INTER);break;
 	}
-	F_freemus();
-	F_loadmus("INTERMUS");
-	S_startmusic(0);
+	MUS_free();
+	MUS_load("INTERMUS");
+	MUS_start(0);
   }
   
 #ifdef DEMO