From be65a9863b6a1c64f6308d8be6124debfe648322 Mon Sep 17 00:00:00 2001 From: sirlemonhead Date: Wed, 20 Nov 2019 16:21:32 +0000 Subject: [PATCH] Add License header to .h and .cpp files --- source/exhumed/src/aistuff.cpp | 17 +++++++++ source/exhumed/src/aistuff.h | 17 +++++++++ source/exhumed/src/anims.cpp | 19 +++++++++- source/exhumed/src/anims.h | 17 +++++++++ source/exhumed/src/anubis.cpp | 21 ++++++++++- source/exhumed/src/anubis.h | 17 +++++++++ source/exhumed/src/bubbles.cpp | 23 ++++++++++-- source/exhumed/src/bubbles.h | 17 +++++++++ source/exhumed/src/bullet.cpp | 17 +++++++++ source/exhumed/src/bullet.h | 17 +++++++++ source/exhumed/src/cd.cpp | 19 +++++++++- source/exhumed/src/cd.h | 17 +++++++++ source/exhumed/src/cdaudio.cpp | 17 +++++++++ source/exhumed/src/cdaudio.h | 17 +++++++++ source/exhumed/src/cdrom.cpp | 17 +++++++++ source/exhumed/src/cdrom.h | 17 +++++++++ source/exhumed/src/config.cpp | 20 +++++++++- source/exhumed/src/config.h | 17 +++++++++ source/exhumed/src/engine.h | 17 +++++++++ source/exhumed/src/enginesubs.cpp | 17 +++++++++ source/exhumed/src/exhumed.cpp | 53 +++++++++++++++++--------- source/exhumed/src/exhumed.h | 18 +++++++++ source/exhumed/src/exscript.cpp | 19 +++++++++- source/exhumed/src/exscript.h | 17 +++++++++ source/exhumed/src/fish.cpp | 17 +++++++++ source/exhumed/src/fish.h | 17 +++++++++ source/exhumed/src/grenade.cpp | 19 +++++++++- source/exhumed/src/grenade.h | 17 +++++++++ source/exhumed/src/gun.cpp | 19 +++++++++- source/exhumed/src/gun.h | 17 +++++++++ source/exhumed/src/init.cpp | 28 +++++++++++--- source/exhumed/src/init.h | 17 +++++++++ source/exhumed/src/input.cpp | 17 +++++++++ source/exhumed/src/input.h | 17 +++++++++ source/exhumed/src/items.cpp | 19 +++++++++- source/exhumed/src/items.h | 17 +++++++++ source/exhumed/src/lavadude.cpp | 21 ++++++++++- source/exhumed/src/lavadude.h | 17 +++++++++ source/exhumed/src/light.cpp | 19 +++++++++- source/exhumed/src/light.h | 17 +++++++++ source/exhumed/src/lighting.cpp | 33 ++++++++++++---- source/exhumed/src/lighting.h | 17 +++++++++ source/exhumed/src/lion.cpp | 27 +++++++++++--- source/exhumed/src/lion.h | 17 +++++++++ source/exhumed/src/main.cpp | 18 ++++++++- source/exhumed/src/map.cpp | 21 ++++++++++- source/exhumed/src/map.h | 17 +++++++++ source/exhumed/src/menu.cpp | 58 +++++++++++++++++++---------- source/exhumed/src/menu.h | 17 +++++++++ source/exhumed/src/mono.cpp | 17 +++++++++ source/exhumed/src/mono.h | 17 +++++++++ source/exhumed/src/move.cpp | 31 ++++++++++++---- source/exhumed/src/move.h | 17 +++++++++ source/exhumed/src/movie.cpp | 17 +++++++++ source/exhumed/src/movie.h | 17 +++++++++ source/exhumed/src/mummy.cpp | 19 +++++++++- source/exhumed/src/mummy.h | 17 +++++++++ source/exhumed/src/names.h | 17 +++++++++ source/exhumed/src/network.cpp | 17 +++++++++ source/exhumed/src/network.h | 17 +++++++++ source/exhumed/src/object.cpp | 39 +++++++++++++------ source/exhumed/src/object.h | 17 +++++++++ source/exhumed/src/paul.cpp | 17 +++++++++ source/exhumed/src/paul.h | 17 +++++++++ source/exhumed/src/player.cpp | 62 ++++++++++++++++++++----------- source/exhumed/src/player.h | 17 +++++++++ source/exhumed/src/queen.cpp | 23 ++++++++++-- source/exhumed/src/queen.h | 17 +++++++++ source/exhumed/src/ra.cpp | 19 +++++++++- source/exhumed/src/ra.h | 17 +++++++++ source/exhumed/src/random.cpp | 17 +++++++++ source/exhumed/src/random.h | 17 +++++++++ source/exhumed/src/rat.cpp | 19 +++++++++- source/exhumed/src/rat.h | 17 +++++++++ source/exhumed/src/record.cpp | 19 +++++++++- source/exhumed/src/record.h | 17 +++++++++ source/exhumed/src/rex.cpp | 19 +++++++++- source/exhumed/src/rex.h | 17 +++++++++ source/exhumed/src/roach.cpp | 19 +++++++++- source/exhumed/src/roach.h | 17 +++++++++ source/exhumed/src/runlist.cpp | 31 ++++++++++++---- source/exhumed/src/runlist.h | 17 +++++++++ source/exhumed/src/save.cpp | 17 +++++++++ source/exhumed/src/save.h | 17 +++++++++ source/exhumed/src/scorp.cpp | 27 +++++++++++--- source/exhumed/src/scorp.h | 19 +++++++++- source/exhumed/src/sequence.cpp | 27 +++++++++++--- source/exhumed/src/sequence.h | 17 +++++++++ source/exhumed/src/serial.cpp | 17 +++++++++ source/exhumed/src/serial.h | 17 +++++++++ source/exhumed/src/set.cpp | 21 ++++++++++- source/exhumed/src/set.h | 17 +++++++++ source/exhumed/src/snake.cpp | 21 ++++++++++- source/exhumed/src/snake.h | 17 +++++++++ source/exhumed/src/sound.cpp | 20 +++++++++- source/exhumed/src/sound.h | 17 +++++++++ source/exhumed/src/spider.cpp | 23 ++++++++++-- source/exhumed/src/spider.h | 17 +++++++++ source/exhumed/src/status.cpp | 21 ++++++++++- source/exhumed/src/status.h | 17 +++++++++ source/exhumed/src/stream.cpp | 17 +++++++++ source/exhumed/src/stream.h | 17 +++++++++ source/exhumed/src/switch.cpp | 21 ++++++++++- source/exhumed/src/switch.h | 17 +++++++++ source/exhumed/src/text2.cpp | 17 +++++++++ source/exhumed/src/text2.h | 17 +++++++++ source/exhumed/src/timer.cpp | 17 +++++++++ source/exhumed/src/timer.h | 17 +++++++++ source/exhumed/src/trigdat.cpp | 17 +++++++++ source/exhumed/src/trigdat.h | 17 +++++++++ source/exhumed/src/typedefs.h | 17 +++++++++ source/exhumed/src/util.h | 17 +++++++++ source/exhumed/src/version.cpp | 17 +++++++++ source/exhumed/src/version.h | 17 +++++++++ source/exhumed/src/view.cpp | 26 +++++++++++-- source/exhumed/src/view.h | 17 +++++++++ source/exhumed/src/wasp.cpp | 19 +++++++++- source/exhumed/src/wasp.h | 17 +++++++++ 118 files changed, 2170 insertions(+), 158 deletions(-) diff --git a/source/exhumed/src/aistuff.cpp b/source/exhumed/src/aistuff.cpp index 78e73eb54..0109727cd 100644 --- a/source/exhumed/src/aistuff.cpp +++ b/source/exhumed/src/aistuff.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "aistuff.h" extern int localclock; diff --git a/source/exhumed/src/aistuff.h b/source/exhumed/src/aistuff.h index 79a8367c9..ba37156ee 100644 --- a/source/exhumed/src/aistuff.h +++ b/source/exhumed/src/aistuff.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __aistuff_h__ #define __aistuff_h__ diff --git a/source/exhumed/src/anims.cpp b/source/exhumed/src/anims.cpp index 63e088492..20cecb00f 100644 --- a/source/exhumed/src/anims.cpp +++ b/source/exhumed/src/anims.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "anims.h" @@ -107,7 +124,7 @@ int BuildAnim(int nSprite, int val, int val2, int x, int y, int z, int nSector, AnimList[nAnim].field_2 = 0; AnimList[nAnim].nSeq = SeqOffsets[val] + val2; AnimList[nAnim].field_4 = 256; - + if (nFlag & 0x80) { sprite[nSprite].cstat |= 0x2; // set transluscence } diff --git a/source/exhumed/src/anims.h b/source/exhumed/src/anims.h index f74326a82..02cb6b7b4 100644 --- a/source/exhumed/src/anims.h +++ b/source/exhumed/src/anims.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __anims_h__ #define __anims_h__ diff --git a/source/exhumed/src/anubis.cpp b/source/exhumed/src/anubis.cpp index 182b89d5b..bcb0bc679 100644 --- a/source/exhumed/src/anubis.cpp +++ b/source/exhumed/src/anubis.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "exhumed.h" #include "anubis.h" @@ -356,7 +373,7 @@ void FuncAnubis(int a, int nDamage, int nRun) default: return; } - + // loc_2564C: if (nAction && nTarget != -1) { @@ -462,7 +479,7 @@ void FuncAnubis(int a, int nDamage, int nRun) return; } - default: + default: { DebugOut("unknown msg %d for Anubis\n", a & 0x7F0000); return; diff --git a/source/exhumed/src/anubis.h b/source/exhumed/src/anubis.h index ef94001a3..4801677a4 100644 --- a/source/exhumed/src/anubis.h +++ b/source/exhumed/src/anubis.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __anubis_h__ #define __anubis_h__ diff --git a/source/exhumed/src/bubbles.cpp b/source/exhumed/src/bubbles.cpp index d91bac3c5..9c9be0ffb 100644 --- a/source/exhumed/src/bubbles.cpp +++ b/source/exhumed/src/bubbles.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "bubbles.h" #include "runlist.h" @@ -115,7 +132,7 @@ int BuildBubble(int x, int y, int z, short nSector) BubbleList[nBubble].nSprite = nSprite; BubbleList[nBubble]._0 = 0; BubbleList[nBubble]._2 = SeqOffsets[kSeqBubble] + nSize; - + sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nBubble | 0x140000); BubbleList[nBubble]._6 = runlist_AddRunRec(NewRun, nBubble | 0x140000); @@ -156,7 +173,7 @@ void FuncBubble(int a, int b, int nRun) BuildAnim(-1, 70, 0, sprite[nSprite].x, sprite[nSprite].y, sector[nSectAbove].floorz, nSectAbove, 64, 0); } - DestroyBubble(nBubble); + DestroyBubble(nBubble); } return; @@ -175,7 +192,7 @@ void FuncBubble(int a, int b, int nRun) default: DebugOut("unknown msg %d for Bubble\n", nMessage); - return; + return; } } diff --git a/source/exhumed/src/bubbles.h b/source/exhumed/src/bubbles.h index 1a1194d5c..d35082fa9 100644 --- a/source/exhumed/src/bubbles.h +++ b/source/exhumed/src/bubbles.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __bubbles_h__ #define __bubbles_h__ diff --git a/source/exhumed/src/bullet.cpp b/source/exhumed/src/bullet.cpp index 4d5ad6d02..ca86c2115 100644 --- a/source/exhumed/src/bullet.cpp +++ b/source/exhumed/src/bullet.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "bullet.h" diff --git a/source/exhumed/src/bullet.h b/source/exhumed/src/bullet.h index 83060acd0..a8592fd28 100644 --- a/source/exhumed/src/bullet.h +++ b/source/exhumed/src/bullet.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __bullet_h__ #define __bullet_h__ diff --git a/source/exhumed/src/cd.cpp b/source/exhumed/src/cd.cpp index b9087908f..b6329a691 100644 --- a/source/exhumed/src/cd.cpp +++ b/source/exhumed/src/cd.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "compat.h" #include "baselayer.h" @@ -22,7 +39,7 @@ int initcdaudio() initprintf("No MSCDEX driver installed!\n"); exit(0); } - + return 1; } diff --git a/source/exhumed/src/cd.h b/source/exhumed/src/cd.h index d18a53721..9ab2c99dc 100644 --- a/source/exhumed/src/cd.h +++ b/source/exhumed/src/cd.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __cd_h__ #define __cd_h__ diff --git a/source/exhumed/src/cdaudio.cpp b/source/exhumed/src/cdaudio.cpp index 50fb8d5c3..0dc6f6ec0 100644 --- a/source/exhumed/src/cdaudio.cpp +++ b/source/exhumed/src/cdaudio.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "cdaudio.h" diff --git a/source/exhumed/src/cdaudio.h b/source/exhumed/src/cdaudio.h index 230fc7ff7..09edb9131 100644 --- a/source/exhumed/src/cdaudio.h +++ b/source/exhumed/src/cdaudio.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __cdaudio_h__ #define __cdaudio_h__ diff --git a/source/exhumed/src/cdrom.cpp b/source/exhumed/src/cdrom.cpp index 66bdd1381..b951bd69f 100644 --- a/source/exhumed/src/cdrom.cpp +++ b/source/exhumed/src/cdrom.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "cdrom.h" diff --git a/source/exhumed/src/cdrom.h b/source/exhumed/src/cdrom.h index 304c0fe8e..66529eaad 100644 --- a/source/exhumed/src/cdrom.h +++ b/source/exhumed/src/cdrom.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __cdrom_h__ #define __cdrom_h__ diff --git a/source/exhumed/src/config.cpp b/source/exhumed/src/config.cpp index 018fc80b5..4de3b573f 100644 --- a/source/exhumed/src/config.cpp +++ b/source/exhumed/src/config.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "renderlayer.h" #include "_control.h" @@ -529,7 +547,7 @@ int CONFIG_ReadSetup() if (cachesize > MAXCACHE1DSIZE) MAXCACHE1DSIZE = cachesize; - + if (g_noSetup == 0 && g_modDir[0] == '/') { diff --git a/source/exhumed/src/config.h b/source/exhumed/src/config.h index 65147257c..e9bc6255c 100644 --- a/source/exhumed/src/config.h +++ b/source/exhumed/src/config.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __config_h__ #define __config_h__ diff --git a/source/exhumed/src/engine.h b/source/exhumed/src/engine.h index 79add7aca..bb143f4d5 100644 --- a/source/exhumed/src/engine.h +++ b/source/exhumed/src/engine.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __engine_h__ #define __engine_h__ diff --git a/source/exhumed/src/enginesubs.cpp b/source/exhumed/src/enginesubs.cpp index 1d8677ec2..52784ad7f 100644 --- a/source/exhumed/src/enginesubs.cpp +++ b/source/exhumed/src/enginesubs.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index 75c7ea791..7b3180484 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "compat.h" #include "baselayer.h" @@ -81,7 +98,7 @@ void FinishLevel(); int htimer = 0; /* these are XORed in the original game executable then XORed back to normal when the game first starts. Here they are normally */ -const char *gString[] = +const char *gString[] = { "CINEMAS", "THE ANCIENT EGYPTIAN CITY", @@ -1428,7 +1445,7 @@ void CheckKeys() // { // if (lMouseSens < 64) // lMouseSens++; - // + // // CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Up); // StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens); // } @@ -1438,7 +1455,7 @@ void CheckKeys() // { // if (lMouseSens >= 1) // lMouseSens -= 1; - // + // // CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Down); // StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens); // } @@ -1541,7 +1558,7 @@ void CheckKeys() { bHolly = kFalse; StatusMessage(1, " "); - } + } else if (!strcmp(pToken, "GOTO")) { // move player to X, Y coordinates @@ -1758,7 +1775,7 @@ void DoCredits() for (int i = nStart; i < nCreditsIndex; i++) { - // var 24 == + // var 24 == int nWidth = MyGetStringWidth(gString[edi]); myprintext((320 - nWidth) / 2, y, gString[edi], 0); @@ -2233,7 +2250,7 @@ int app_main(int argc, char const* const* argv) //int esi = 1; //int edi = esi; - int doTitle = kFalse; // REVERT kTrue; + int doTitle = kTrue; // REVERT kTrue; int stopTitle = kFalse; levelnew = 1; @@ -2483,7 +2500,7 @@ int app_main(int argc, char const* const* argv) break; } - + } // strupr(gString[j]); @@ -2930,7 +2947,7 @@ LOOP3: // if (nNetTime > 0) // { // nNetTime--; - // + // // if (!nNetTime) { // nFreeze = 3; // } @@ -3049,7 +3066,7 @@ LOOP3: nMapMode = (nMapMode+1)%3; } } - + if (nMapMode != 0) { int const timerOffset = ((int) totalclock - nonsharedtimer); @@ -3345,9 +3362,9 @@ void CopyTileToBitmap(short nSrcTile, short nDestTile, int xPos, int yPos) int destYSize = tilesiz[nDestTile].y; int srcYSize = tilesiz[nSrcTile].y; - + uint8_t *pSrc = (uint8_t*)waloff[nSrcTile]; - + for (int x = 0; x < tilesiz[nSrcTile].x; x++) { pDest += destYSize; @@ -3462,7 +3479,7 @@ int Query(short nLines, short nKeys, ...) // add some padding to left and right sides of text in the box nWidth += 30; - + int x1 = (320 - nWidth) / 2; int x2 = x1 + nWidth; @@ -3585,7 +3602,7 @@ void InitSpiritHead() sprite[nSpiritSprite].picnum = kTileRamsesWorkTile; nHeadStage = 0; - + // work tile is twice as big as the normal head size tilesiz[kTileRamsesWorkTile].x = 97 * 2; // 194; tilesiz[kTileRamsesWorkTile].y = 106 * 2; // 212; @@ -3615,7 +3632,7 @@ void InitSpiritHead() nCDTrackLength = playCDtrack(nTrack); bSubTitles = nCDTrackLength == 0; - + StartSwirlies(); sprintf(filename, "LEV%d.PUP", levelnum); @@ -3635,18 +3652,18 @@ void DimSector(short nSector) { short startwall = sector[nSector].wallptr; short nWalls = sector[nSector].wallnum; - + for (int i = 0; i < nWalls; i++) { if (wall[startwall+i].shade < 40) { wall[startwall+i].shade++; } } - + if (sector[nSector].floorshade < 40) { sector[nSector].floorshade++; } - + if (sector[nSector].ceilingshade < 40) { sector[nSector].ceilingshade++; } @@ -4016,7 +4033,7 @@ int DoSpiritHead() for (int i = 0; i < 97; i++) { memcpy(pDest, pSrc, 106); - + pDest += 212; pSrc += 106; } diff --git a/source/exhumed/src/exhumed.h b/source/exhumed/src/exhumed.h index 001edb14e..615160f78 100644 --- a/source/exhumed/src/exhumed.h +++ b/source/exhumed/src/exhumed.h @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #ifndef __exhumed_h__ #define __exhumed_h__ diff --git a/source/exhumed/src/exscript.cpp b/source/exhumed/src/exscript.cpp index b90b5b085..83f1045fa 100644 --- a/source/exhumed/src/exscript.cpp +++ b/source/exhumed/src/exscript.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- // Our replacement for the MACT scripting library as the one Exhumed/Powerslave uses is from an older version. This code is based on that older version @@ -202,7 +219,7 @@ void AddScriptEntry(char *entry, Script *pScript) } } } - + eax->_0 = entry; eax->_4 = pScript; } diff --git a/source/exhumed/src/exscript.h b/source/exhumed/src/exscript.h index 9fbde3553..b09329311 100644 --- a/source/exhumed/src/exscript.h +++ b/source/exhumed/src/exscript.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __exscript_h__ #define __exscript_h__ diff --git a/source/exhumed/src/fish.cpp b/source/exhumed/src/fish.cpp index 1a6bf4b30..bbea5b313 100644 --- a/source/exhumed/src/fish.cpp +++ b/source/exhumed/src/fish.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "fish.h" #include "anims.h" diff --git a/source/exhumed/src/fish.h b/source/exhumed/src/fish.h index 31a4178b9..b29d0a859 100644 --- a/source/exhumed/src/fish.h +++ b/source/exhumed/src/fish.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __fish_h__ #define __fish_h__ diff --git a/source/exhumed/src/grenade.cpp b/source/exhumed/src/grenade.cpp index 3006a13a4..b546b7c87 100644 --- a/source/exhumed/src/grenade.cpp +++ b/source/exhumed/src/grenade.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "grenade.h" #include "engine.h" @@ -233,7 +250,7 @@ void ExplodeGrenade(short nGrenade) } short nDamage = BulletInfo[kWeaponGrenade].nDamage; - + if (nPlayerDouble[nPlayer] > 0) { nDamage *= 2; } diff --git a/source/exhumed/src/grenade.h b/source/exhumed/src/grenade.h index 6f11b0e38..7100ac1b6 100644 --- a/source/exhumed/src/grenade.h +++ b/source/exhumed/src/grenade.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __grenade_h__ #define __grenade_h__ diff --git a/source/exhumed/src/gun.cpp b/source/exhumed/src/gun.cpp index 11937dfbc..8e55c9c4d 100644 --- a/source/exhumed/src/gun.cpp +++ b/source/exhumed/src/gun.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "gun.h" #include "engine.h" @@ -282,7 +299,7 @@ int CheckCloseRange(short nPlayer, int *x, int *y, int *z, short *nSector) int xVect = Sin(sprite[nSprite].ang + 512); int yVect = Sin(sprite[nSprite].ang); - + vec3_t startPos = { *x, *y, *z }; hitdata_t hitData; hitscan(&startPos, *nSector, xVect, yVect, 0, &hitData, CLIPMASK1); diff --git a/source/exhumed/src/gun.h b/source/exhumed/src/gun.h index 6e132b771..d689d2e8a 100644 --- a/source/exhumed/src/gun.h +++ b/source/exhumed/src/gun.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __gun_h__ #define __gun_h__ diff --git a/source/exhumed/src/init.cpp b/source/exhumed/src/init.cpp index c54a0a3ef..dba7dd39e 100644 --- a/source/exhumed/src/init.cpp +++ b/source/exhumed/src/init.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "keyboard.h" #include "control.h" @@ -531,7 +549,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b) while (num1 > nCount) { short dx = nWallB; - + int esi = 0x7FFFFFF; int edi = esi; @@ -540,7 +558,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b) int var_14 = 0; - int nCount2 = 0; + int nCount2 = 0; while (nCount2 < num2) { @@ -578,7 +596,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b) var_34 += var_3C; - if (var_38 < var_34) + if (var_38 < var_34) { esi = x - wall[dx].x; edi = y - wall[dx].y; @@ -861,7 +879,7 @@ void ProcessSpriteTag(short nSprite, short lotag, short hitag) BuildRex(nSprite, 0, 0, 0, 0, 0, nChannel); return; } - case 106: + case 106: { if (bNoCreatures) { mydeletesprite(nSprite); @@ -982,7 +1000,7 @@ void ProcessSpriteTag(short nSprite, short lotag, short hitag) { short nSector = sprite[nSprite].sectnum; SectDepth[nSector] = hitag << 8; - + mydeletesprite(nSprite); return; } diff --git a/source/exhumed/src/init.h b/source/exhumed/src/init.h index 3344f10d4..d9a184b10 100644 --- a/source/exhumed/src/init.h +++ b/source/exhumed/src/init.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __init_h__ #define __init_h__ diff --git a/source/exhumed/src/input.cpp b/source/exhumed/src/input.cpp index 04c1fa74d..8e87fd2d2 100644 --- a/source/exhumed/src/input.cpp +++ b/source/exhumed/src/input.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "input.h" #include "engine.h" diff --git a/source/exhumed/src/input.h b/source/exhumed/src/input.h index 4b8bce7e7..c01ab8f1b 100644 --- a/source/exhumed/src/input.h +++ b/source/exhumed/src/input.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __input_h__ #define __input_h__ diff --git a/source/exhumed/src/items.cpp b/source/exhumed/src/items.cpp index 1b62d7110..b9ea9816e 100644 --- a/source/exhumed/src/items.cpp +++ b/source/exhumed/src/items.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "items.h" #include "anims.h" @@ -229,7 +246,7 @@ void UseScarab(short nPlayer) void UseHand(short nPlayer) { nPlayerDouble[nPlayer] = 1350; - + if (nPlayer == nLocalPlayer) { ItemFlash(); diff --git a/source/exhumed/src/items.h b/source/exhumed/src/items.h index ba015334a..ec333897d 100644 --- a/source/exhumed/src/items.h +++ b/source/exhumed/src/items.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __items_h__ #define __items_h__ diff --git a/source/exhumed/src/lavadude.cpp b/source/exhumed/src/lavadude.cpp index b81834a83..fb1841754 100644 --- a/source/exhumed/src/lavadude.cpp +++ b/source/exhumed/src/lavadude.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "lavadude.h" @@ -227,7 +244,7 @@ void FuncLava(int a, int nDamage, int nRun) } LavaList[nLava].nHealth -= nDamage; - + if (LavaList[nLava].nHealth <= 0) { LavaList[nLava].nHealth = 0; @@ -301,7 +318,7 @@ void FuncLava(int a, int nDamage, int nRun) LavaList[nLava].nTarget = -1; } } - + switch (nAction) { case 0: diff --git a/source/exhumed/src/lavadude.h b/source/exhumed/src/lavadude.h index f42684cb7..9152eff54 100644 --- a/source/exhumed/src/lavadude.h +++ b/source/exhumed/src/lavadude.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __lavadude_h__ #define __lavadude_h__ diff --git a/source/exhumed/src/light.cpp b/source/exhumed/src/light.cpp index 8271a75d9..890602ba7 100644 --- a/source/exhumed/src/light.cpp +++ b/source/exhumed/src/light.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "light.h" #include "engine.h" @@ -116,7 +133,7 @@ void SetGreenPal() // { // palookup[i] = palookup[6]; // } - // + // // palookup[5] = origpalookup[5]; } diff --git a/source/exhumed/src/light.h b/source/exhumed/src/light.h index ac036b30e..e7c547811 100644 --- a/source/exhumed/src/light.h +++ b/source/exhumed/src/light.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __light_h__ #define __light_h__ diff --git a/source/exhumed/src/lighting.cpp b/source/exhumed/src/lighting.cpp index 47386ce08..069acc08a 100644 --- a/source/exhumed/src/lighting.cpp +++ b/source/exhumed/src/lighting.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "typedefs.h" #include "lighting.h" @@ -191,14 +208,14 @@ void AddFlash(short nSector, int x, int y, int z, int val) sFlash[nFlash].field_1 = i; wall[i].pal += 7; - + ebx += wall[i].shade; int eax = ebx; if (ebx < -127) { eax = -127; } - + wall[i].shade = eax; if (!var_1C && !wall[i].overpicnum && pNextSector) @@ -220,7 +237,7 @@ void AddFlash(short nSector, int x, int y, int z, int val) sFlash[nFlash].field_0 = var_20 | 1; sFlash[nFlash].field_1 = nSector; sFlash[nFlash].shade = sector[nSector].floorshade; - + sector[nSector].floorpal += 7; int edx = sector[nSector].floorshade + var_28; @@ -318,7 +335,7 @@ void UndoFlashes() uint8_t var_28 = sFlash[nFlash].field_0 & 0x3F; short nIndex = sFlash[nFlash].field_1; - + if (sFlash[nFlash].field_0 & 0x80) { int var_20 = var_28 - 1; @@ -479,7 +496,7 @@ void AddFlicker(short nSector, int nVal) } sFlicker[nFlickerCount].field_4 = flickermask[nVal]; - + nFlickerCount++; } @@ -715,15 +732,15 @@ void SetTorch(int nPlayer, int bTorchOnOff) // char *pTempPal = origpalookup[kPalTorch]; // palookup[kPalTorch] = palookup[kPalNoTorch]; // palookup[kPalNoTorch] = pTempPal; - // + // // pTempPal = origpalookup[kPalTorch]; // origpalookup[kPalTorch] = origpalookup[kPalNoTorch]; // origpalookup[kPalNoTorch] = pTempPal; - // + // // pTempPal = origpalookup[kPalTorch2]; // origpalookup[kPalTorch2] = origpalookup[kPalNoTorch2]; // origpalookup[kPalNoTorch2] = pTempPal; - // + // // pTempPal = palookup[kPalTorch2]; // palookup[kPalNoTorch2] = palookup[kPalTorch2]; // palookup[kPalTorch2] = pTempPal; diff --git a/source/exhumed/src/lighting.h b/source/exhumed/src/lighting.h index 0d024570b..aded34d95 100644 --- a/source/exhumed/src/lighting.h +++ b/source/exhumed/src/lighting.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __lighting_h__ #define __lighting_h__ diff --git a/source/exhumed/src/lion.cpp b/source/exhumed/src/lion.cpp index 0caaabd9f..63c3a40bc 100644 --- a/source/exhumed/src/lion.cpp +++ b/source/exhumed/src/lion.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "lion.h" #include "engine.h" @@ -59,7 +76,7 @@ int BuildLion(short nSprite, int x, int y, int z, short nSector, short nAngle) y = sprite[nSprite].y; z = sector[sprite[nSprite].sectnum].floorz; nAngle = sprite[nSprite].ang; - + } assert(nSprite >= 0 && nSprite < kMaxSprites); @@ -258,7 +275,7 @@ void FuncLion(int a, int nDamage, int nRun) } } } - + if (nAction) { LionList[nLion]._g--; @@ -273,7 +290,7 @@ void FuncLion(int a, int nDamage, int nRun) else { sprite[nSprite].xvel = 0; - sprite[nSprite].yvel = 0; + sprite[nSprite].yvel = 0; } LionList[nLion]._g = 100; @@ -404,7 +421,7 @@ void FuncLion(int a, int nDamage, int nRun) int z = sprite[nSprite].z - (GetSpriteHeight(nSprite) >> 1); int var_40 = 0x7FFFFFFF; - + short nSector = sprite[nSprite].sectnum; short var_28 = sprite[nSprite].ang; @@ -489,7 +506,7 @@ void FuncLion(int a, int nDamage, int nRun) break; } } - + return; } diff --git a/source/exhumed/src/lion.h b/source/exhumed/src/lion.h index 9cac93f55..991c9190e 100644 --- a/source/exhumed/src/lion.h +++ b/source/exhumed/src/lion.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __lion_h__ #define __lion_h__ diff --git a/source/exhumed/src/main.cpp b/source/exhumed/src/main.cpp index 8b1378917..14d78bdc9 100644 --- a/source/exhumed/src/main.cpp +++ b/source/exhumed/src/main.cpp @@ -1 +1,17 @@ - +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- diff --git a/source/exhumed/src/map.cpp b/source/exhumed/src/map.cpp index 7318f9db1..94300f64a 100644 --- a/source/exhumed/src/map.cpp +++ b/source/exhumed/src/map.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "typedefs.h" #include @@ -40,7 +57,7 @@ void MarkSectorSeen(short nSector) short startwall = sector[nSector].wallptr; short nWalls = sector[nSector].wallnum; short endwall = startwall + nWalls; - + while (startwall <= endwall) { show2dwall[startwall >> 3] = (1 << (startwall & 7)) | show2dwall[startwall >> 3]; @@ -99,7 +116,7 @@ void drawoverheadmap(int cposx, int cposy, int czoom, short cang) { if (nextwall <= nWall || (show2dwall[nextwall >> 3] & (1 << (nextwall & 7))) <= 0) { - if (nCeilZ != sector[wall[nWall].nextsector].ceilingz || + if (nCeilZ != sector[wall[nWall].nextsector].ceilingz || nFloorZ != sector[wall[nWall].nextsector].floorz || ((wall[nextwall].cstat | wall[nWall].cstat) & 0x30)) { diff --git a/source/exhumed/src/map.h b/source/exhumed/src/map.h index b83f5401d..aa9d585b9 100644 --- a/source/exhumed/src/map.h +++ b/source/exhumed/src/map.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __map_h__ #define __map_h__ diff --git a/source/exhumed/src/menu.cpp b/source/exhumed/src/menu.cpp index 89d528079..2f0112508 100644 --- a/source/exhumed/src/menu.cpp +++ b/source/exhumed/src/menu.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "build.h" #include "exhumed.h" @@ -144,7 +162,7 @@ void DoEnergyTile() ptr2 += 64; nColor++; - + if (nColor >= 168) { nColor = 160; } @@ -225,7 +243,7 @@ void DoEnergyTile() *ptrW = 96; //continue; } - else + else { if (!menu_RandomBit2()) { @@ -254,13 +272,13 @@ void DoEnergyTile() } ptrW = (uint8_t*)waloff[kEnergy2]; - + for (i = 0; i < 4096; i++) { if ((*ptrW) == 96) { *ptrW = 255; // -1? } - + ptrW++; } @@ -464,7 +482,7 @@ void menu_DoPlasma() if (badOffset) continue; - + unsigned int nSmokeOffset = 0; if (plasma_A[j]) @@ -477,7 +495,7 @@ void menu_DoPlasma() if (al != 255 && al != 96) { break; } - + nSmokeOffset++; ptr3++; } @@ -508,7 +526,7 @@ void menu_DoPlasma() overwritesprite(0, 0, nPlasmaTile, 0, 2, kPalNormal); overwritesprite(160, 40, kExhumedLogo, 0, 3, kPalNormal); - + // flip between tile 4092 and 4093 if (nPlasmaTile == kTile4092) { nPlasmaTile = kTile4093; @@ -870,8 +888,8 @@ void menu_AdjustVolume() overwritesprite(55, 135, kMenuBlankTitleTile, 0, 2, kPalNormal); seq_DrawGunSequence( - SeqOffsets[kSeqSlider], - gFXVolume % 3, + SeqOffsets[kSeqSlider], + gFXVolume % 3, (gFXVolume / 2) - 93, 38, 0, @@ -1233,13 +1251,13 @@ check_keys: KB_KeyDown[sc_Escape] = 0; return -1; } - else + else { // check if a slot name is being typed if ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') - || (ch == ' ')) + || (ch == ' ')) { ch = toupper(ch); if (nNameOffset < 24) // n chars per slot name @@ -1312,7 +1330,7 @@ int menu_LoadGameMenu() int spriteY = 90; int textY = 98; - + for (int i = 0; i < kMaxSaveSlots; i++) { // TODO - shade flashing @@ -1414,7 +1432,7 @@ void menu_GameLoad2(FILE *fp) short menu_GameLoad(int nSlot) { memset(&GameStats, 0, sizeof(GameStats)); - + FILE *fp = fopen(kSaveFileName, "rb"); if (fp == NULL) { return 0; @@ -1699,7 +1717,7 @@ LABEL_21: return 0; } - default: + default: menu_ResetZoom(); menu_ResetKeyTimer(); break; @@ -1878,7 +1896,7 @@ void ComputeCinemaText(int nLine) nCrawlY = 199; nHeight = linecount * 10; - + ClearAllKeys(); } @@ -2069,7 +2087,7 @@ void GoToTheCinema(int nVal) case 1: ebx = 0; break; - + case 2: ebx = 2; edx = ebx; @@ -2207,7 +2225,7 @@ uint8_t CheckForEscape() if (!KB_KeyWaiting() || (KB_GetCh() != 27)) { return kFalse; } - + return kTrue; } @@ -2235,7 +2253,7 @@ void DoStatic(int a, int b) while (v7 < v5) { *pStart = RandomBit() * 16; - + v7++; pStart++; } @@ -2326,7 +2344,7 @@ LABEL_11: break; int xPos = 70; - + const char *nChar = gString[nString]; nString++; @@ -2367,7 +2385,7 @@ LABEL_11: if (v11 <= (int)totalclock) goto LABEL_11; } while (!KB_KeyWaiting()); - } + } while (KB_GetCh() != 27); LABEL_28: diff --git a/source/exhumed/src/menu.h b/source/exhumed/src/menu.h index a5a43185c..644d7584b 100644 --- a/source/exhumed/src/menu.h +++ b/source/exhumed/src/menu.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __menu_h__ #define __menu_h__ diff --git a/source/exhumed/src/mono.cpp b/source/exhumed/src/mono.cpp index ddd75c354..86fda76ba 100644 --- a/source/exhumed/src/mono.cpp +++ b/source/exhumed/src/mono.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- /* Name: MonoClear_ diff --git a/source/exhumed/src/mono.h b/source/exhumed/src/mono.h index 97cdc4da9..3efb676d0 100644 --- a/source/exhumed/src/mono.h +++ b/source/exhumed/src/mono.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __mono_h__ #define __mono_h__ diff --git a/source/exhumed/src/move.cpp b/source/exhumed/src/move.cpp index 1d9cb2e7f..a71a28e96 100644 --- a/source/exhumed/src/move.cpp +++ b/source/exhumed/src/move.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "exhumed.h" @@ -481,7 +498,7 @@ int movesprite(short nSprite, int dx, int dy, int dz, int ceildist, int flordist int x = pSprite->x; int y = pSprite->y; int z = pSprite->z; - + int nSpriteHeight = GetSpriteHeight(nSprite); int nClipDist = (int8_t)pSprite->clipdist << 2; @@ -533,7 +550,7 @@ int movesprite(short nSprite, int dx, int dy, int dz, int ceildist, int flordist if (nRet & 0x20000) { dz = 0; } - + if ((sector[nSector].floorz - z) < (dz + flordist)) { pSprite->x = x; @@ -681,7 +698,7 @@ int FindPlayer(int nSprite, int nVal) int z = sprite[nSprite].z - GetSpriteHeight(nSprite); nVal <<= 8; - + short nPlayerSprite; int i = 0; @@ -754,7 +771,7 @@ int GetUpAngle(short nSprite1, int nVal, short nSprite2, int ecx) int ebx = (sprite[nSprite2].z + ecx) - (sprite[nSprite1].z + nVal); int edx = (sprite[nSprite2].z + ecx) - (sprite[nSprite1].z + nVal); - + ebx >>= 4; edx >>= 8; @@ -1143,14 +1160,14 @@ int AngleChase(int nSprite, int nSprite2, int ebx, int ecx, int push1) { nAngDelta2 = nAngDelta; nAngDelta2 >>= 6; - + edx = ebx; if (nAngDelta2 < 0) nAngDelta2 = -nAngDelta2; ebx /= nAngDelta2; - + if (ebx < 5) ebx = 5; } @@ -1159,7 +1176,7 @@ int AngleChase(int nSprite, int nSprite2, int ebx, int ecx, int push1) if (nAngDeltaC < 0) nAngDeltaC = -nAngDeltaC; - + if (nAngDeltaC > push1) { if (nAngDelta >= 0) diff --git a/source/exhumed/src/move.h b/source/exhumed/src/move.h index a9389aab4..a7570d9ad 100644 --- a/source/exhumed/src/move.h +++ b/source/exhumed/src/move.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __move_h__ #define __move_h__ diff --git a/source/exhumed/src/movie.cpp b/source/exhumed/src/movie.cpp index 28d5fc97e..657abb430 100644 --- a/source/exhumed/src/movie.cpp +++ b/source/exhumed/src/movie.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "exhumed.h" diff --git a/source/exhumed/src/movie.h b/source/exhumed/src/movie.h index ebd99a012..ddffa4378 100644 --- a/source/exhumed/src/movie.h +++ b/source/exhumed/src/movie.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __movie_h__ #define __movie_h__ diff --git a/source/exhumed/src/mummy.cpp b/source/exhumed/src/mummy.cpp index 0c92835c8..8507b629f 100644 --- a/source/exhumed/src/mummy.cpp +++ b/source/exhumed/src/mummy.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "mummy.h" #include "sequence.h" @@ -469,7 +486,7 @@ void FuncMummy(int a, int nDamage, int nRun) if (MummyList[nMummy].nHealth <= 0) { return; } - + MummyList[nMummy].nHealth -= nDamage; if (MummyList[nMummy].nHealth <= 0) diff --git a/source/exhumed/src/mummy.h b/source/exhumed/src/mummy.h index 637a52278..77df73318 100644 --- a/source/exhumed/src/mummy.h +++ b/source/exhumed/src/mummy.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __mummy_h__ #define __mummy_h__ diff --git a/source/exhumed/src/names.h b/source/exhumed/src/names.h index 242e49a99..e3d8bf0cf 100644 --- a/source/exhumed/src/names.h +++ b/source/exhumed/src/names.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __names_h__ #define __names_h__ diff --git a/source/exhumed/src/network.cpp b/source/exhumed/src/network.cpp index 09e12e3a3..91e0b5d49 100644 --- a/source/exhumed/src/network.cpp +++ b/source/exhumed/src/network.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- // this is net.c in the original code diff --git a/source/exhumed/src/network.h b/source/exhumed/src/network.h index 8b9a2ce74..96adfd310 100644 --- a/source/exhumed/src/network.h +++ b/source/exhumed/src/network.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __network_h__ #define __network_h__ diff --git a/source/exhumed/src/object.cpp b/source/exhumed/src/object.cpp index 69e063551..04817bd1f 100644 --- a/source/exhumed/src/object.cpp +++ b/source/exhumed/src/object.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "object.h" @@ -368,7 +385,7 @@ int BuildElevF(int nChannel, int nSector, int nWallSprite, int arg_4, int arg_5, } Elevator[ElevCount].nSprite = nWallSprite; - + va_list zlist; va_start(zlist, nCount); @@ -1081,7 +1098,7 @@ void FuncSlide(int a, int b, int c) int var_28 = nSeekB; dragpoint(SlideData[nSlide].field_0, x, y, 0); - + if (edi == 0 && ecx == 0) { ebp = clipmask; } @@ -1246,7 +1263,7 @@ void FuncTrap(int a, int b, int c) if (sTrap[nTrap].field_0 > 10) { return; } - + short nType = sTrap[nTrap].nType; if (sTrap[nTrap].field_0 == 0) @@ -1357,7 +1374,7 @@ int BuildSpark(int nSprite, int nVal) if (nVal == 3) { sprite[var_14].xrepeat = 120; - sprite[var_14].yrepeat = 120; + sprite[var_14].yrepeat = 120; } else { @@ -1468,7 +1485,7 @@ void DimLights() sector[i].floorshade++; int nWall = sector[i].wallptr; - + while (nWall < nWall + sector[i].wallnum) { if (wall[nWall].shade < 100) @@ -1659,7 +1676,7 @@ void ExplodeEnergyBlock(int nSprite) sector[nSector].floorshade = 50; sector[nSector].extra = -1; sector[nSector].floorz = sprite[nSprite].z; - + sprite[nSprite].z = (sprite[nSprite].z + sector[nSector].floorz) / 2; BuildSpark(nSprite, 3); @@ -1962,7 +1979,7 @@ void FuncObject(int a, int b, int nRun) { sprite[nSprite].xvel = 0; sprite[nSprite].yvel = 0; - sprite[nSprite].zvel = 0; + sprite[nSprite].zvel = 0; } else if (sprite[nSprite].statnum != kStat98) { @@ -2166,7 +2183,7 @@ void DoDrips() int nFloorZ = sector[nSector].floorz; sector[nSector].floorz = edx + sBob[i].z; - + MoveSectorSprites(nSector, sector[nSector].floorz - nFloorZ); } } @@ -2222,7 +2239,7 @@ void AddSectorBob(int nSector, int nHitag, int bx) sBob[nBobs].field_3 = bx; int z; - + if (bx == 0) { z = sector[nSector].floorz; } @@ -2457,7 +2474,7 @@ void DoMovingSects() } } } - else + else { // repeat of code from loc_23908 nYVel = ecx; @@ -2465,7 +2482,7 @@ void DoMovingSects() if (sMoveDir[i] > 0) { - sMoveSect[i].nTrailPoint = nTrailPointNext[sMoveSect[i].nTrailPoint]; + sMoveSect[i].nTrailPoint = nTrailPointNext[sMoveSect[i].nTrailPoint]; } else { diff --git a/source/exhumed/src/object.h b/source/exhumed/src/object.h index 0c880df65..08b3b184f 100644 --- a/source/exhumed/src/object.h +++ b/source/exhumed/src/object.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __object_h__ #define __object_h__ diff --git a/source/exhumed/src/paul.cpp b/source/exhumed/src/paul.cpp index 2f5627673..99d198dd4 100644 --- a/source/exhumed/src/paul.cpp +++ b/source/exhumed/src/paul.cpp @@ -1,2 +1,19 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "paul.h" diff --git a/source/exhumed/src/paul.h b/source/exhumed/src/paul.h index f952d77db..c8a4c05d6 100644 --- a/source/exhumed/src/paul.h +++ b/source/exhumed/src/paul.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __paul_h__ #define __paul_h__ diff --git a/source/exhumed/src/player.cpp b/source/exhumed/src/player.cpp index 0eaf718f5..a36ac29e7 100644 --- a/source/exhumed/src/player.cpp +++ b/source/exhumed/src/player.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "player.h" #include "runlist.h" @@ -51,17 +69,17 @@ short obobangle = 0, bobangle = 0; short bPlayerPan = 0; short bLockPan = 0; -static actionSeq ActionSeq[] = { +static actionSeq ActionSeq[] = { {18, 0}, {0, 0}, {9, 0}, {27, 0}, {63, 0}, - {72, 0}, {54, 0}, {45, 0}, {54, 0}, {81, 0}, - {90, 0}, {99, 0}, {108, 0}, {8, 0}, {0, 0}, - {139, 0}, {117, 1}, {119, 1}, {120, 1}, {121, 1}, + {72, 0}, {54, 0}, {45, 0}, {54, 0}, {81, 0}, + {90, 0}, {99, 0}, {108, 0}, {8, 0}, {0, 0}, + {139, 0}, {117, 1}, {119, 1}, {120, 1}, {121, 1}, {122, 1} }; static short nHeightTemplate[] = { 0, 0, 0, 0, 0, 0, 7, 7, 7, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0 }; -short nActionEyeLevel[] = { +short nActionEyeLevel[] = { -14080, -14080, -14080, -14080, -14080, -14080, -8320, -8320, -8320, -8320, -8320, -8320, -8320, -14080, -14080, -14080, -14080, -14080, -14080, -14080, -14080 @@ -337,7 +355,7 @@ void PlayerInterruptKeys() if (aimmode) { fix16_t nVPan = nVertPan[nLocalPlayer] - fix16_from_int((info.mousey >> 7)); - + if (nVPan < F16(0)) { nVPan = F16(0); @@ -346,7 +364,7 @@ void PlayerInterruptKeys() { nVPan = F16(184); } - + nVertPan[nLocalPlayer] = nVPan; } else @@ -363,7 +381,7 @@ void PlayerInterruptKeys() } } } - + // loc_18FD4 if (BUTTON(gamefunc_Strafe_Left)) { @@ -698,7 +716,7 @@ void RestartPlayer(short nPlayer) sprite[nSprite].zvel = 0; nStandHeight = nHeight; - + sprite[nSprite].hitag = 0; sprite[nSprite].extra = -1; sprite[nSprite].lotag = runlist_HeadRun() + 1; @@ -911,7 +929,7 @@ void StartDeathSeq(int nPlayer, int nVal) PlayerList[nPlayer].field_2 = 0; sprite[nSprite].cstat &= 0xFEFE; - + if (nTotalPlayers == 1) { short nLives = nPlayerLives[nPlayer]; @@ -1069,7 +1087,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) seq_PlotSequence(pA & 0xFFFF, SeqOffsets[PlayerList[nPlayer].nSeq] + ActionSeq[nAction].a, PlayerList[nPlayer].field_2, ActionSeq[nAction].b); return; } - + case 0xA0000: { if (PlayerList[nPlayer].nHealth <= 0) { @@ -1127,7 +1145,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) PlayerList[nPlayer].field_2 = 0; PlayerList[nPlayer].nAction = 12; return; - } + } } else { @@ -1374,11 +1392,11 @@ void FuncPlayer(int pA, int nDamage, int nRun) lPlayerXVel = 0; lPlayerYVel = 0; - + sprite[nPlayerSprite].xvel = 0; sprite[nPlayerSprite].yvel = 0; sprite[nPlayerSprite].zvel = 0; - + nPlayerDAng = 0; if (nFreeze < 1) @@ -1484,7 +1502,7 @@ void FuncPlayer(int pA, int nDamage, int nRun) int var_F4 = sPlayerInput[nPlayer].xVel; int var_F8 = sPlayerInput[nPlayer].yVel; int nMyAngle = GetMyAngle(sPlayerInput[nPlayer].xVel, sPlayerInput[nPlayer].yVel); - + MoveSector(var_B4, nMyAngle, &var_F4, &var_F8); if (nPlayerPushSound[nPlayer] <= -1) @@ -1817,7 +1835,7 @@ loc_1AB8E: short nValB; // neartag finds the nearest sector, wall, and sprite which has its hitag and/or lotag set to a value. - neartag(sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum, sprite[nPlayerSprite].ang, + neartag(sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum, sprite[nPlayerSprite].ang, &nearTagSector, &nearTagWall, &nearTagSprite, (int32_t*)&nearHitDist, 1024, 2, NULL); feebtag(sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum, @@ -1885,7 +1903,7 @@ do_default_b: } case 1: // Fuel Canister { - if (AddAmmo(nPlayer, 3, sprite[nValB].hitag)) + if (AddAmmo(nPlayer, 3, sprite[nValB].hitag)) { var_88 = StaticSound[kSound69]; goto do_default; @@ -1948,7 +1966,7 @@ do_default_b: case 4: // Pickable item case 9: // Pickable item case 10: // Reserved - case 18: + case 18: case 25: case 28: case 29: @@ -2272,7 +2290,7 @@ do_default_b: case 19: // Extra Life { var_88 = -1; - + if (nPlayerLives[nPlayer] >= kMaxPlayerLives) { break; } @@ -2666,7 +2684,7 @@ do_default_b: var_88 = StaticSound[kSound69]; goto do_default; } - + break; } @@ -2792,7 +2810,7 @@ do_default_b: if (PlayerList[nPlayer].nMagic >= 1000) { break; } - + var_88 = StaticSound[kSound67]; PlayerList[nPlayer].nMagic += 100; @@ -3122,7 +3140,7 @@ do_default_b: // loc_1C05E fix16_t ecx = nDestVertPan[nPlayer] - nVertPan[nPlayer]; - + if (aimmode) { ecx = 0; diff --git a/source/exhumed/src/player.h b/source/exhumed/src/player.h index 28041811a..fdbe28d41 100644 --- a/source/exhumed/src/player.h +++ b/source/exhumed/src/player.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __player_h__ #define __player_h__ diff --git a/source/exhumed/src/queen.cpp b/source/exhumed/src/queen.cpp index 42a4b85f5..9ce62c069 100644 --- a/source/exhumed/src/queen.cpp +++ b/source/exhumed/src/queen.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "exhumed.h" #include "aistuff.h" @@ -642,7 +659,7 @@ int BuildQueenHead(short nQueen) nVelShift = 2; SetHeadVel(nSprite2); - + sprite[nSprite2].zvel = -8192; sprite[nSprite2].lotag = runlist_HeadRun() + 1; sprite[nSprite2].hitag = 0; @@ -723,7 +740,7 @@ void FuncQueenHead(int a, int nDamage, int nRun) switch (nAction) { - case 0: + case 0: if (QueenHead.field_C > 0) { QueenHead.field_C--; @@ -918,7 +935,7 @@ __MOVEQS: sprite[nSprite].xrepeat = 127 - QueenHead.field_E; sprite[nSprite].yrepeat = 127 - QueenHead.field_E; - + sprite[nSprite].cstat = 0x8000; // DEMO-TODO: in disassembly angle was used without masking and thus causing OOB issue. diff --git a/source/exhumed/src/queen.h b/source/exhumed/src/queen.h index d652d0239..a141466fd 100644 --- a/source/exhumed/src/queen.h +++ b/source/exhumed/src/queen.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __queen_h__ #define __queen_h__ diff --git a/source/exhumed/src/ra.cpp b/source/exhumed/src/ra.cpp index 9a24a61b4..e7eb9356e 100644 --- a/source/exhumed/src/ra.cpp +++ b/source/exhumed/src/ra.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "ra.h" #include "runlist.h" @@ -159,7 +176,7 @@ void FuncRa(int a, int nDamage, int nRun) if (Ra[nPlayer].field_0) { seq_MoveSequence(nSprite, edx, Ra[nPlayer].field_2); - + Ra[nPlayer].field_2++; if (Ra[nPlayer].field_2 >= SeqSize[edx]) { diff --git a/source/exhumed/src/ra.h b/source/exhumed/src/ra.h index 8766e3137..3815c84ca 100644 --- a/source/exhumed/src/ra.h +++ b/source/exhumed/src/ra.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __ra_h__ #define __ra_h__ diff --git a/source/exhumed/src/random.cpp b/source/exhumed/src/random.cpp index 7ee78b7c5..1098d16dd 100644 --- a/source/exhumed/src/random.cpp +++ b/source/exhumed/src/random.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "random.h" diff --git a/source/exhumed/src/random.h b/source/exhumed/src/random.h index d1ffa431e..611f0d39b 100644 --- a/source/exhumed/src/random.h +++ b/source/exhumed/src/random.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __random_h__ #define __random_h__ diff --git a/source/exhumed/src/rat.cpp b/source/exhumed/src/rat.cpp index 8539c7c96..bbec0ab3e 100644 --- a/source/exhumed/src/rat.cpp +++ b/source/exhumed/src/rat.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "rat.h" @@ -204,7 +221,7 @@ void FuncRat(int a, int nDamage, int nRun) { int nSeq = SeqOffsets[kSeqRat] + ActionSeq[nAction].a; sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RatList[nRat].a); - + seq_MoveSequence(nSprite, nSeq, RatList[nRat].a); RatList[nRat].a++; diff --git a/source/exhumed/src/rat.h b/source/exhumed/src/rat.h index 6984c62eb..e2cd19d98 100644 --- a/source/exhumed/src/rat.h +++ b/source/exhumed/src/rat.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __rat_h__ #define __rat_h__ diff --git a/source/exhumed/src/record.cpp b/source/exhumed/src/record.cpp index 44771b949..62cebadac 100644 --- a/source/exhumed/src/record.cpp +++ b/source/exhumed/src/record.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "compat.h" #include "record.h" @@ -121,7 +138,7 @@ int ExecRecord(uint8_t *pRecord, int nSize) PutRecord(pRecord[i]); } } - + if (record_mode == 3) { return 0; } diff --git a/source/exhumed/src/record.h b/source/exhumed/src/record.h index 90df23d26..c0a71b29e 100644 --- a/source/exhumed/src/record.h +++ b/source/exhumed/src/record.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __record_h__ #define __record_h__ diff --git a/source/exhumed/src/rex.cpp b/source/exhumed/src/rex.cpp index f13f57d69..b5107c66d 100644 --- a/source/exhumed/src/rex.cpp +++ b/source/exhumed/src/rex.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "rex.h" #include "exhumed.h" @@ -408,7 +425,7 @@ void FuncRex(int a, int nDamage, int nRun) break; } } - + RexList[nRex].nAction = 1; break; } diff --git a/source/exhumed/src/rex.h b/source/exhumed/src/rex.h index ba095ed07..d5572eebe 100644 --- a/source/exhumed/src/rex.h +++ b/source/exhumed/src/rex.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __rex_h__ #define __rex_h__ diff --git a/source/exhumed/src/roach.cpp b/source/exhumed/src/roach.cpp index 53f452267..4b45242f0 100644 --- a/source/exhumed/src/roach.cpp +++ b/source/exhumed/src/roach.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "exhumed.h" #include "engine.h" @@ -336,7 +353,7 @@ void FuncRoach(int a, int nDamage, int nRun) RoachList[nRoach].field_C = 100; RoachList[nRoach].nTarget = -1; sprite[nSprite].xvel = 0; - sprite[nSprite].yvel = 0; + sprite[nSprite].yvel = 0; } return; diff --git a/source/exhumed/src/roach.h b/source/exhumed/src/roach.h index a0bf6b9b3..9eed2203f 100644 --- a/source/exhumed/src/roach.h +++ b/source/exhumed/src/roach.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __roach_h__ #define __roach_h__ diff --git a/source/exhumed/src/runlist.cpp b/source/exhumed/src/runlist.cpp index bc6efdc68..625f7a193 100644 --- a/source/exhumed/src/runlist.cpp +++ b/source/exhumed/src/runlist.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "exhumed.h" #include "engine.h" @@ -59,7 +76,7 @@ RunStruct RunData[kMaxRuns]; short word_96760 = 0; -/* variables +/* variables Name: _sRunStack Name: _RunFree Name: _channel @@ -285,7 +302,7 @@ void runlist_SendMessageToRunRec(int nRun, int edx, int nDamage) } assert(nFunc < kFuncMax); // REMOVE - + // do function pointer call here. aiFunctions[nFunc](edx, nDamage, nRun); } @@ -601,7 +618,7 @@ void runlist_ProcessSectorTag(int nSector, int lotag, int hitag) { case 0: // Ceiling Doom door { - /* + /* This function searches z-coordinates of neighboring sectors to find the closest (next) ceiling starting at the given z-coordinate (thez). */ @@ -787,7 +804,7 @@ void runlist_ProcessSectorTag(int nSector, int lotag, int hitag) case 11: // Switch activated lift up { - /* + /* fix for original behaviour - nextSector could be -1 the and game would do an invalid memory read when getting the floorz for nextSector. Here, we assume 0 and only set the correct value if nextSector is valid. @@ -1450,7 +1467,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag) int var_24; int var_38 = 0; // TODO - FIXME CHECKME. This doesn't seem to be initialised in the ASM? - int var_2C; + int var_2C; int ebp = 0; // TODO - FIXME CHECKME. This doesn't seem to be initialised in the ASM? int var_30; @@ -1533,7 +1550,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag) if (nStart == nWall) { break; } - + var_28 = var_18; var_18 = nWall; } @@ -1603,7 +1620,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag) case 19: { short nStart = nWall; - + while (1) { nWall = wall[nWall].point2; diff --git a/source/exhumed/src/runlist.h b/source/exhumed/src/runlist.h index 01fd36d60..faa78563f 100644 --- a/source/exhumed/src/runlist.h +++ b/source/exhumed/src/runlist.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __runlist_h__ #define __runlist_h__ diff --git a/source/exhumed/src/save.cpp b/source/exhumed/src/save.cpp index 2155fbe68..7eeeec19d 100644 --- a/source/exhumed/src/save.cpp +++ b/source/exhumed/src/save.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "save.h" #include diff --git a/source/exhumed/src/save.h b/source/exhumed/src/save.h index 48cd1f5b7..8705b8aa7 100644 --- a/source/exhumed/src/save.h +++ b/source/exhumed/src/save.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __save_h__ #define __save_h__ diff --git a/source/exhumed/src/scorp.cpp b/source/exhumed/src/scorp.cpp index 2774e03ea..424738725 100644 --- a/source/exhumed/src/scorp.cpp +++ b/source/exhumed/src/scorp.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "scorp.h" @@ -21,7 +38,7 @@ short ScorpCount = -1; Scorpion scorpion[kMaxScorpions]; short ScorpChan[kMaxScorpions]; -static actionSeq ActionSeq[] = { +static actionSeq ActionSeq[] = { {0, 0}, {8, 0}, {29, 0}, @@ -174,7 +191,7 @@ void FuncScorp(int a, int nDamage, int nRun) if (nTarget >= 0) { - if (sprite[nSprite].statnum == 100 || (sprite[nSprite].statnum < 199 && !RandomSize(5))) + if (sprite[nSprite].statnum == 100 || (sprite[nSprite].statnum < 199 && !RandomSize(5))) { scorpion[nScorp].nTarget = nTarget; } @@ -190,7 +207,7 @@ void FuncScorp(int a, int nDamage, int nRun) if (RandomSize(2)) { return; } - + D3PlayFX(StaticSound[kSound41], nSprite); goto FS_Pink_A; @@ -207,7 +224,7 @@ void FuncScorp(int a, int nDamage, int nRun) sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, scorpion[nScorp].nFrame); seq_MoveSequence(nSprite, nSeq, scorpion[nScorp].nFrame); - + scorpion[nScorp].nFrame++; if (scorpion[nScorp].nFrame >= SeqSize[nSeq]) @@ -456,7 +473,7 @@ FS_Pink_B: sprite[nSprite].yvel = 0; sprite[nSprite].xvel = 0; sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); - + scorpion[nScorp].h = RandomSize(2) + RandomSize(3); if (!scorpion[nScorp].h) { diff --git a/source/exhumed/src/scorp.h b/source/exhumed/src/scorp.h index 7f360d385..def468bcf 100644 --- a/source/exhumed/src/scorp.h +++ b/source/exhumed/src/scorp.h @@ -1,10 +1,27 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __scorp_h__ #define __scorp_h__ #include "compat.h" -/* +/* Selkis Boss AI code */ diff --git a/source/exhumed/src/sequence.cpp b/source/exhumed/src/sequence.cpp index 124b145af..1e7c36ec4 100644 --- a/source/exhumed/src/sequence.cpp +++ b/source/exhumed/src/sequence.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "typedefs.h" #include "sequence.h" @@ -148,7 +165,7 @@ int seq_ReadSequence(const char *seqName) strcat(buffer, ".seq"); int hFile = kopen4load(buffer, 1); - if (hFile == -1) + if (hFile == -1) { initprintf("Unable to open '%s'!\n", buffer); kclose(hFile); @@ -165,14 +182,14 @@ int seq_ReadSequence(const char *seqName) } short centerx, centery; // TODO - are global vars? - short nSeqs; + short nSeqs; kread(hFile, ¢erx, sizeof(centerx)); kread(hFile, ¢ery, sizeof(centery)); kread(hFile, &nSeqs, sizeof(nSeqs)); if (nSeqs <= 0 || sequences + nSeqs >= kMaxSequences) { - if (nSeqs < 0) + if (nSeqs < 0) { initprintf("Invalid sequence count!\n"); kclose(hFile); @@ -257,7 +274,7 @@ int seq_ReadSequence(const char *seqName) { short var_20; kread(hFile, &var_20, sizeof(var_20)); - + for (i = 0; i < var_20; i++) { kread(hFile, &buffer[i * 10], 8); @@ -319,7 +336,7 @@ void seq_LoadSequences() nFontFirstChar = seq_GetFirstSeqPicnum(kSeqFont2); short nSize = SeqSize[SeqOffsets[kSeqFont2]]; - + for (i = 0; i < nSize; i++) { picanm[nFontFirstChar + i].xofs = 0; diff --git a/source/exhumed/src/sequence.h b/source/exhumed/src/sequence.h index 7a01591bb..3d59b79ae 100644 --- a/source/exhumed/src/sequence.h +++ b/source/exhumed/src/sequence.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __sequence_h__ #define __sequence_h__ diff --git a/source/exhumed/src/serial.cpp b/source/exhumed/src/serial.cpp index 679918c51..1b091f7cd 100644 --- a/source/exhumed/src/serial.cpp +++ b/source/exhumed/src/serial.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "typedefs.h" #include "serial.h" diff --git a/source/exhumed/src/serial.h b/source/exhumed/src/serial.h index 52fe66071..9743935bb 100644 --- a/source/exhumed/src/serial.h +++ b/source/exhumed/src/serial.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __serial_h__ #define __serial_h__ diff --git a/source/exhumed/src/set.cpp b/source/exhumed/src/set.cpp index e57478d17..5b68b15bb 100644 --- a/source/exhumed/src/set.cpp +++ b/source/exhumed/src/set.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "set.h" #include "engine.h" @@ -177,7 +194,7 @@ void FuncSoul(int pA, int, int nRun) sprite[nSoulSprite].extra &= 0x7FF; int ebx = (Sin(sprite[nSoulSprite].extra + 512) >> 7);// *Sin(sprite[nSoulSprite].ang); - + if (movesprite(nSoulSprite, Sin(sprite[nSoulSprite].ang + 512) * ebx, Sin(sprite[nSoulSprite].ang) * ebx, sprite[nSoulSprite].zvel, 5120, 0, CLIPMASK0) & 0x10000) { int nSet = sprite[nSoulSprite].hitag; @@ -394,7 +411,7 @@ void FuncSet(int a, int nDamage, int nRun) if ((nSet & 0x1F) == (totalmoves & 0x1F)) { int nRand = RandomSize(3); - + switch (nRand) { case 0: diff --git a/source/exhumed/src/set.h b/source/exhumed/src/set.h index 34f814bf7..e4c562223 100644 --- a/source/exhumed/src/set.h +++ b/source/exhumed/src/set.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __set_h__ #define __set_h__ diff --git a/source/exhumed/src/snake.cpp b/source/exhumed/src/snake.cpp index 41701c497..8f1a4ff9d 100644 --- a/source/exhumed/src/snake.cpp +++ b/source/exhumed/src/snake.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "exhumed.h" @@ -332,7 +349,7 @@ SEARCH_ENEMY: { short nPlayer = nSnakePlayer[nSnake]; ExplodeSnakeSprite(SnakeList[nSnake].nSprites[0], nPlayer); - + nPlayerSnake[nPlayer] = -1; nSnakePlayer[nSnake] = -1; @@ -370,7 +387,7 @@ SEARCH_ENEMY: movesprite(nSprite2, var_30 + var_30 * i + eax * Cos(var_28), var_30 + var_34 * i + eax * Sin(var_28), -zVal*(i-1), 0, 0, CLIPMASK1); - + var_20 = (var_20 + 128) & kAngleMask; } } diff --git a/source/exhumed/src/snake.h b/source/exhumed/src/snake.h index cdb8b8b50..8809830df 100644 --- a/source/exhumed/src/snake.h +++ b/source/exhumed/src/snake.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __snake_h__ #define __snake_h__ diff --git a/source/exhumed/src/sound.cpp b/source/exhumed/src/sound.cpp index 8252a0ef3..0d349e918 100644 --- a/source/exhumed/src/sound.cpp +++ b/source/exhumed/src/sound.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 Nuke.YKT, sirlemonhead +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "baselayer.h" #include "renderlayer.h" // for win_gethwnd() @@ -784,7 +802,7 @@ void UpdateSounds() nVolume = 0; if (nVolume > 255) nVolume = 255; - + int nPitch = pASound->f_16; short nSoundSect; if (nSoundSprite >= 0) diff --git a/source/exhumed/src/sound.h b/source/exhumed/src/sound.h index 9801949fb..5d4a784aa 100644 --- a/source/exhumed/src/sound.h +++ b/source/exhumed/src/sound.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __sound_h__ #define __sound_h__ diff --git a/source/exhumed/src/spider.cpp b/source/exhumed/src/spider.cpp index 1a1b87b45..85439a7fb 100644 --- a/source/exhumed/src/spider.cpp +++ b/source/exhumed/src/spider.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "exhumed.h" #include "spider.h" @@ -100,9 +117,9 @@ int BuildSpider(int nSprite, int x, int y, int z, short nSector, int angle) sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nSpider | 0xC0000); SpiderList[nSpider].h = runlist_AddRunRec(NewRun, nSpider | 0xC0000); - + nCreaturesLeft++; - + return nSpider | 0xC0000; } @@ -361,7 +378,7 @@ case_3: seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqSpider] + ActionSeq[nAction].a, SpiderList[nSpider].b, ActionSeq[nAction].b); break; } - + case 0xA0000: { if (SpiderList[nSpider].nHealth <= 0) diff --git a/source/exhumed/src/spider.h b/source/exhumed/src/spider.h index 2730f3c9d..dcb24d1b3 100644 --- a/source/exhumed/src/spider.h +++ b/source/exhumed/src/spider.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __spider_h__ #define __spider_h__ diff --git a/source/exhumed/src/status.cpp b/source/exhumed/src/status.cpp index 3d90565d6..c1d63e1bc 100644 --- a/source/exhumed/src/status.cpp +++ b/source/exhumed/src/status.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "engine.h" #include "player.h" @@ -278,7 +295,7 @@ void SetMagicFrame() if (nMagicLevel < 0) { nMagicLevel = 0; } - + SetItemSeq(); } @@ -544,7 +561,7 @@ void MoveStatus() return; } } - + if (!(nDigit[0] % 3)) { nCounter = nDigit[0] / 3 + 100 * (nDigit[2] / 3) + 10 * (nDigit[1] / 3); } diff --git a/source/exhumed/src/status.h b/source/exhumed/src/status.h index 98880db0a..06705204f 100644 --- a/source/exhumed/src/status.h +++ b/source/exhumed/src/status.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __status_h__ #define __status_h__ diff --git a/source/exhumed/src/stream.cpp b/source/exhumed/src/stream.cpp index c284cde74..de8af1618 100644 --- a/source/exhumed/src/stream.cpp +++ b/source/exhumed/src/stream.cpp @@ -1,2 +1,19 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "stream.h" diff --git a/source/exhumed/src/stream.h b/source/exhumed/src/stream.h index 1b6dc3dc0..3d73ba6ad 100644 --- a/source/exhumed/src/stream.h +++ b/source/exhumed/src/stream.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __stream_h__ #define __stream_h__ diff --git a/source/exhumed/src/switch.cpp b/source/exhumed/src/switch.cpp index 44c20cce1..35c64e456 100644 --- a/source/exhumed/src/switch.cpp +++ b/source/exhumed/src/switch.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "switch.h" #include "exhumed.h" @@ -335,7 +352,7 @@ void FuncSwNotOnPause(int a, int, int nRun) return; } - + case 0x20000: { SwitchData[nSwitch].field_0 -= 4; @@ -397,7 +414,7 @@ void FuncSwPressSector(int a, int, int nRun) { short nSwitch = RunData[nRun].nVal; assert(nSwitch >= 0 && nSwitch < kMaxSwitches); - + int nMessage = a & 0x7F0000; short nChannel = SwitchData[nSwitch].nChannel; diff --git a/source/exhumed/src/switch.h b/source/exhumed/src/switch.h index 8b9471092..add32f80c 100644 --- a/source/exhumed/src/switch.h +++ b/source/exhumed/src/switch.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __switch_h__ #define __switch_h__ diff --git a/source/exhumed/src/text2.cpp b/source/exhumed/src/text2.cpp index 705f5d934..23a32e659 100644 --- a/source/exhumed/src/text2.cpp +++ b/source/exhumed/src/text2.cpp @@ -1,2 +1,19 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "text2.h" diff --git a/source/exhumed/src/text2.h b/source/exhumed/src/text2.h index d6ba45501..a655d66e9 100644 --- a/source/exhumed/src/text2.h +++ b/source/exhumed/src/text2.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __text2_h__ #define __text2_h__ diff --git a/source/exhumed/src/timer.cpp b/source/exhumed/src/timer.cpp index 3e6dccef5..9f5059542 100644 --- a/source/exhumed/src/timer.cpp +++ b/source/exhumed/src/timer.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "compat.h" #include "baselayer.h" diff --git a/source/exhumed/src/timer.h b/source/exhumed/src/timer.h index 0b8c2a05b..fad0463a6 100644 --- a/source/exhumed/src/timer.h +++ b/source/exhumed/src/timer.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __timer_h__ #define __timer_h__ diff --git a/source/exhumed/src/trigdat.cpp b/source/exhumed/src/trigdat.cpp index e9f5f25c7..58274e31e 100644 --- a/source/exhumed/src/trigdat.cpp +++ b/source/exhumed/src/trigdat.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "trigdat.h" #ifndef __WATCOMC__ diff --git a/source/exhumed/src/trigdat.h b/source/exhumed/src/trigdat.h index 23140b937..b13393318 100644 --- a/source/exhumed/src/trigdat.h +++ b/source/exhumed/src/trigdat.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __trigdat_h__ #define __trigdat_h__ diff --git a/source/exhumed/src/typedefs.h b/source/exhumed/src/typedefs.h index 905e2beac..0c54c9c4d 100644 --- a/source/exhumed/src/typedefs.h +++ b/source/exhumed/src/typedefs.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __typedefs_h__ #define __typedefs_h__ diff --git a/source/exhumed/src/util.h b/source/exhumed/src/util.h index e91fd84b5..c4c530e27 100644 --- a/source/exhumed/src/util.h +++ b/source/exhumed/src/util.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __util_h__ #define __util_h__ diff --git a/source/exhumed/src/version.cpp b/source/exhumed/src/version.cpp index e1d705b8d..9fd906037 100644 --- a/source/exhumed/src/version.cpp +++ b/source/exhumed/src/version.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "version.h" diff --git a/source/exhumed/src/version.h b/source/exhumed/src/version.h index fde2a8d92..0f4be784c 100644 --- a/source/exhumed/src/version.h +++ b/source/exhumed/src/version.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __version_h__ #define __version_h__ diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp index 046071516..837f9693c 100644 --- a/source/exhumed/src/view.cpp +++ b/source/exhumed/src/view.cpp @@ -1,3 +1,21 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- + #include "compat.h" #include "keyboard.h" #include "control.h" @@ -152,7 +170,7 @@ static void analyzesprites() int nTSprite; tspritetype *pTSprite; -// int var_20 = var_24; +// int var_20 = var_24; for (nTSprite = spritesortcnt-1, pTSprite = &tsprite[nTSprite]; nTSprite >= 0; nTSprite--, pTSprite--) { @@ -447,7 +465,7 @@ void DrawView(int smoothRatio) else { clipmove_old((int32_t*)&playerX, (int32_t*)&playerY, (int32_t*)&playerZ, &nSector, - -2000 * Sin(inita + 512), + -2000 * Sin(inita + 512), -2000 * Sin(inita), 4, 0, 0, CLIPMASK1); @@ -549,7 +567,7 @@ void DrawView(int smoothRatio) int ang2 = fix16_to_int(nCameraa) - sprite[nPlayerSprite].ang; if (ang2 < 0) ang2 = -ang2; - + if (ang2 > 10) { inita -= (ang2 >> 3); @@ -560,7 +578,7 @@ void DrawView(int smoothRatio) { if (levelnum == 1) ReadyCinemaText(1); - else + else ReadyCinemaText(5); } } diff --git a/source/exhumed/src/view.h b/source/exhumed/src/view.h index 68aeec61d..c6375cf12 100644 --- a/source/exhumed/src/view.h +++ b/source/exhumed/src/view.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __view_h__ #define __view_h__ diff --git a/source/exhumed/src/wasp.cpp b/source/exhumed/src/wasp.cpp index f7d468144..645bc8b52 100644 --- a/source/exhumed/src/wasp.cpp +++ b/source/exhumed/src/wasp.cpp @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #include "wasp.h" #include "engine.h" @@ -192,7 +209,7 @@ void FuncWasp(int a, int nDamage, int nRun) WaspList[nWasp].nAction = 3; WaspList[nWasp].field_2 = 0; } - + WaspList[nWasp].nAction = 1; sprite[nSprite].ang += RandomSize(9) + 768; sprite[nSprite].ang &= kAngleMask; diff --git a/source/exhumed/src/wasp.h b/source/exhumed/src/wasp.h index bd5fbc81e..0fd019e61 100644 --- a/source/exhumed/src/wasp.h +++ b/source/exhumed/src/wasp.h @@ -1,3 +1,20 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 sirlemonhead, Nuke.YKT +This file is part of PCExhumed. +PCExhumed 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. +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- #ifndef __wasp_h__ #define __wasp_h__