X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmonster.c;h=77a161df669ab9f8dd217f37b42d6d7f0e255e97;hb=refs%2Fheads%2Frenders;hp=3a5efd44a165ff0d6f9c6c59f2ee1f9c8dd571cf;hpb=563dffaf02ff36da4054f937fcc9f99a072e15bf;p=flatwaifu.git

diff --git a/src/monster.c b/src/monster.c
index 3a5efd4..77a161d 100644
--- a/src/monster.c
+++ b/src/monster.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 <stdlib.h>
@@ -35,7 +30,6 @@
 #include "misc.h"
 #include "fx.h"
 #include "smoke.h"
-#include "my.h"
 #include "player.h"
 #include "error.h"
 #include "game.h"
@@ -97,28 +91,28 @@ static void *snd[MN_TN][5],*impsitsnd[2],*impdthsnd[2],*firsnd,*slopsnd,*gsnd[4]
 static void *swgsnd,*pchsnd,*telesnd;
 static void *positsnd[3],*podthsnd[3];
 static mnsz_t mnsz[MN_TN+1]={
-//rad  ht  life  pain rv jv  slop min_pn
-    0,  0,    0,    0, 0, 0,    0,    0,	// none
-   15, 28,   60,   20, 7,10,	0,   10,	// demon
-   10, 28,   25,   15, 3,10,   30,    0,	// imp
-   10, 28,   15,   10, 3,10,   30,    0,	// zomby
-   10, 28,   20,   10, 3,10,   30,    0,	// sergeant
-   20, 55,  500,   70, 5,10,	0,   50,	// cyberdemon
-   12, 28,   60,   20, 3,10,   30,   10,	// chaingunner
-   12, 32,  150,   40, 3,10,    0,   30, 	// baron of hell
-   12, 32,   75,   40, 3,10,    0,   30, 	// hell knight
-   15, 28,  100,   10, 4, 4,    0,    0,	// cacodemon
-    8, 18,   60,   10, 4, 4,    0,    0,	// lost soul
-   15, 28,  100,   10, 4, 4,    0,    0,	// pain elemental
-   64, 50,  500,   70, 4,10,    0,   50,	// spider mastermind
-   25, 27,  150,   20, 4,10,    0,    0,	// arachnotron
-   18, 30,  200,   40, 3, 7,    0,   20,	// mancubus
-   17, 36,  200,   40, 6,11,    0,   20,	// revenant
-   17, 36,  150,   30, 7,12,    0,   10,	// archvile
-    5,  5,   35,   20,14, 6,    0,   10,	// fish
-    5, 17,   20,    0, 7, 6,    0,    0,	// barrel
-   17, 38,   20,   40, 3, 6,    0,   20,	// robot
-    8, 26,  400,   70, 8,10,   30,   50		// man
+  /* rad  ht life  pain  rv  jv slop min_pn */
+  {    0,  0,   0,    0,  0,  0,   0,     0 }, // none
+  {   15, 28,  60,   20,  7, 10,   0,    10 }, // demon
+  {   10, 28,  25,   15,  3, 10,  30,     0 }, // imp
+  {   10, 28,  15,   10,  3, 10,  30,     0 }, // zomby
+  {   10, 28,  20,   10,  3, 10,  30,     0 }, // sergeant
+  {   20, 55, 500,   70,  5, 10,   0,    50 }, // cyberdemon
+  {   12, 28,  60,   20,  3, 10,  30,    10 }, // chaingunner
+  {   12, 32, 150,   40,  3, 10,   0,    30 }, // baron of hell
+  {   12, 32,  75,   40,  3, 10,   0,    30 }, // hell knight
+  {   15, 28, 100,   10,  4,  4,   0,     0 }, // cacodemon
+  {    8, 18,  60,   10,  4,  4,   0,     0 }, // lost soul
+  {   15, 28, 100,   10,  4,  4,   0,     0 }, // pain elemental
+  {   64, 50, 500,   70,  4, 10,   0,    50 }, // spider mastermind
+  {   25, 27, 150,   20,  4, 10,   0,     0 }, // arachnotron
+  {   18, 30, 200,   40,  3,  7,   0,    20 }, // mancubus
+  {   17, 36, 200,   40,  6, 11,   0,    20 }, // revenant
+  {   17, 36, 150,   30,  7, 12,   0,    10 }, // archvile
+  {    5,  5,  35,   20, 14,  6,   0,    10 }, // fish
+  {    5, 17,  20,    0,  7,  6,   0,     0 }, // barrel
+  {   17, 38,  20,   40,  3,  6,   0,    20 }, // robot
+  {    8, 26, 400,   70,  8, 10,  30,    50 }  // man
 };
 
 void setst (int i, int st) {