X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmap.h;h=15cfdd38541764e6ba293f25f5120449f19bd64b;hb=b56f1875b3e8f5c2dfe1f00e35bc3b103044870a;hp=5e574a6bb3e9423de6031ca1d9aa54cc35ead70f;hpb=a46a1d55c077e3aa91a728047409050187e90083;p=flatwaifu.git
diff --git a/src/map.h b/src/map.h
index 5e574a6..15cfdd3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,176 +1,23 @@
-/**************************************************************************\
-* *
-* ФоÑмаÑÑ ÐºÐ°ÑÑ Doom'а 2D ÐеÑÑÐ¸Ñ 2 *
-* *
-* Prikol Software 10.VII.1996 *
-* *
-* РазÑеÑаеÑÑÑ Ñвободно ÑаÑпÑоÑÑÑанÑÑÑ ÑÑÐ¾Ñ Ñайл, пÑи ÑÑловии ÑоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ *
-* ÑÑÑлки на Prikol Software, веÑÑии и даÑÑ Ð²ÑпÑÑка Ñайла. *
-* *
-* ÐÑÐ¾Ñ include-Ñайл ÑаÑÑиÑан на WATCOM C 10.0 и DOS4GW *
-* ÐÑ Ð¼Ð¾Ð¶ÐµÑе пеÑеделаÑÑ ÐµÐ³Ð¾ на лÑбой дÑÑгой ÑзÑк/компилÑÑоÑ, но ÑоÑ
ÑаниÑе *
-* ÑÑÐ¾Ñ Ñайл (еÑли ÑобиÑаеÑеÑÑ ÐµÐ³Ð¾ ÑаÑпÑоÑÑÑанÑÑÑ), а в Ñвоем ÑкажиÑе, *
-* ÑÑо он изменен (пеÑеделан). *
-* *
-\**************************************************************************/
-
-/*
- Copyright (C) Prikol Software 1996-1997
- Copyright (C) Aleksey Volynskov 1996-1997
-
- 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 or
- write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#pragma pack(1)
-
-/* СÑаÑÑй ÑоÑÐ¼Ð°Ñ - веÑÑÐ¸Ñ 1.04 alpha (и ÑанÑÑе)
-
- Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑекÑÑÑÑ (old_wall_t)
- конÑаеÑÑÑ Ð¿ÑÑÑой ÑÑÑокой (old_wall_t.n[0]==0)
-
- Ñон - маÑÑив 100x100 Ð±Ð°Ð¹Ñ - номеÑа ÑекÑÑÑÑ
-
- Ñип ÑÑенок - маÑÑив 100x100 байÑ:
- 0 - пÑÑÑо
- 1 - ÑÑена
- 2 - закÑÑÑÐ°Ñ Ð´Ð²ÐµÑÑ
- 3 - оÑкÑÑÑÐ°Ñ Ð´Ð²ÐµÑÑ
- 4 - ÑÑÑпенÑка
-
- пеÑедний план - маÑÑив 100x100 Ð±Ð°Ð¹Ñ - номеÑа ÑекÑÑÑÑ
-
- веÑи, монÑÑÑÑ Ð¸ дÑ. (old_thing_t)
- конÑаеÑÑÑ Ð½ÑлевÑм Ñипом (old_thing_t.t==0)
-
- пеÑеклÑÑаÑели (old_switch_t)
- конÑаеÑÑÑ Ð½ÑлевÑм Ñипом (old_switch_t.t==0)
-
-*/
-
-typedef struct{
- char n[8]; // название ÑекÑÑÑÑÑ
- char t; // Ñип: 0-ÑплоÑÐ½Ð°Ñ 1-"ÑеÑÑÑка"
-}old_wall_t;
-
-typedef struct{
- short x,y; // кооÑдинаÑÑ
- short t; // Ñип
- unsigned short f; // Ñлаги
-}old_thing_t;
-
-typedef struct{
- unsigned char x,y; // кооÑдинаÑÑ/8
- unsigned char t; // Ñип
- unsigned char tm; // должно бÑÑÑ 0
- unsigned char a,b; // обÑÑно - кооÑдинаÑÑ/8 двеÑи
- unsigned short c; // не иÑполÑзÑеÑÑÑ (вÑоде бÑ)
-}old_switch_t;
-
-/* ÐовÑй ÑоÑÐ¼Ð°Ñ - наÑÐ¸Ð½Ð°Ñ Ñ Ð²ÐµÑÑии 1.05 alpha
-
- заголовок каÑÑÑ (map_header_t)
-
- блоки (map_block_t)
- конÑаеÑÑÑ Ð±Ð»Ð¾ÐºÐ¾Ð¼ MB_END (map_block_t.t==MB_END)
-
-*/
-
-typedef struct{
- char id[8]; // "подпиÑÑ" - "Doom2D\x1A"
- short ver; // веÑÑÐ¸Ñ ÐºÐ°ÑÑÑ
-}map_header_t;
-
-typedef struct{
- short t; // Ñип блока
- short st; // подÑип (меÑод Ñпаковки, напÑимеÑ)
- // еÑли не иÑполÑзÑеÑÑÑ, Ñо должен бÑÑÑ 0
- // (Ð´Ð»Ñ Ð±ÑдÑÑей ÑовмеÑÑимоÑÑи)
- int sz; // ÑÐ°Ð·Ð¼ÐµÑ (ÑколÑко Ð±Ð°Ð¹Ñ Ð¿Ð¾Ñле ÑÑой ÑÑÑÑкÑÑÑÑ)
-}map_block_t;
-
-enum{
- MB_COMMENT=-1,MB_END=0,
- MB_WALLNAMES,MB_BACK,MB_WTYPE,MB_FRONT,MB_THING,MB_SWITCH,
- MB_MUSIC,MB_SKY,
- MB_SWITCH2,
- MB__UNKNOWN
-};
-
-/* ÐеÑÑÐ¸Ñ 0 (Doom2D веÑÑии 1.05 alpha)
-
- MB_COMMENT - комменÑаÑий
-
- MB_WALLNAMES - Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑекÑÑÑÑ (Ñм. ÑÑаÑÑÑ Ð²ÐµÑÑиÑ)
- колиÑеÑÑво - по ÑазмеÑÑ Ð±Ð»Ð¾ÐºÐ°
-
- MB_BACK,MB_WTYPE,MB_FRONT - Ñон,Ñип,пеÑедний план (Ñм. ÑÑаÑÑÑ Ð²ÐµÑÑиÑ)
- подÑип 0 - без Ñпаковки (как в ÑÑаÑой веÑÑии)
-
- MB_THING - веÑи,монÑÑÑÑ Ð¸ дÑ. (Ñм. ÑÑаÑÑÑ Ð²ÐµÑÑиÑ)
- колиÑеÑÑво - по ÑазмеÑÑ Ð±Ð»Ð¾ÐºÐ°
-
- MB_SWITCH - пеÑеклÑÑаÑели (Ñм. ÑÑаÑÑÑ Ð²ÐµÑÑиÑ)
- колиÑеÑÑво - по ÑазмеÑÑ Ð±Ð»Ð¾ÐºÐ°
-
-*/
-
-/* ÐеÑÑÐ¸Ñ 1 (Doom2D веÑÑии 1.06 alpha)
-
- MB_WALLNAMES
- Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð¿Ñевдо-ÑекÑÑÑÑÑ _WATER_*
- где * ÑÑо 0=вода,1=киÑлоÑа,2=кÑовÑ
-
- MB_WTYPE
- добавлен новÑй Ñип 5 - вода
-
- MB_MUSIC - новÑй блок - название мÑзÑки (8 байÑ)
-
- MB_SKY - новÑй блок - Ñип неба (2 байÑа - short)
- 1 = облака
- 2 = гоÑод
- 3 = ад
-
-*/
-
-#define SW_PL_PRESS 1
-#define SW_MN_PRESS 2
-#define SW_PL_NEAR 4
-#define SW_MN_NEAR 8
-#define SW_KEY_R 16
-#define SW_KEY_G 32
-#define SW_KEY_B 64
-
-typedef struct{
- unsigned char x,y; // кооÑдинаÑÑ/8
- unsigned char t; // Ñип
- unsigned char tm; // должно бÑÑÑ 0
- unsigned char a,b; // обÑÑно - кооÑдинаÑÑ/8 двеÑи
- unsigned short c; // не иÑполÑзÑеÑÑÑ (вÑоде бÑ)
- unsigned char f; // Ñлаги
-}switch2_t;
-
-/* ÐеÑÑÐ¸Ñ 2 (Doom2D веÑÑии 1.17 alpha)
-
- блок MB_SWITCH заменен на MB_SWITCH2 (Ñм. switch2_t)
-
-*/
-
-#define LAST_MAP_VER 2 // Ð¡Ð°Ð¼Ð°Ñ Ð¿Ð¾ÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ ÐºÐ°ÑÑÑ
-
-#pragma pack()
-
-/* ÐÐÐÐЦ */
+/* 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 .
+ */
+
+#ifndef MAP_H_INCLUDED
+#define MAP_H_INCLUDED
+
+void F_loadmap (char n[8]);
+
+#endif /* MAP_H_INCLUDED */