zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add License header to .h and .cpp files

Browse source
This commit is contained in:
sirlemonhead 2019-11-20 16:21:32 +00:00 committed by Christoph Oelckers
parent 6cb4456c91
commit be65a9863b
118 changed files with 2170 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/exhumed/src/aistuff.cpp
View file

@ -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" #include "aistuff.h"
extern int localclock; extern int localclock;

17
source/exhumed/src/aistuff.h
View file

@ -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__ #ifndef __aistuff_h__
#define __aistuff_h__ #define __aistuff_h__

19
source/exhumed/src/anims.cpp
View file

@ -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 "engine.h"
#include "anims.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].field_2 = 0;
AnimList[nAnim].nSeq = SeqOffsets[val] + val2; AnimList[nAnim].nSeq = SeqOffsets[val] + val2;
AnimList[nAnim].field_4 = 256; AnimList[nAnim].field_4 = 256;
if (nFlag & 0x80) { if (nFlag & 0x80) {
sprite[nSprite].cstat |= 0x2; // set transluscence sprite[nSprite].cstat |= 0x2; // set transluscence
} }

17
source/exhumed/src/anims.h
View file

@ -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__ #ifndef __anims_h__
#define __anims_h__ #define __anims_h__

21
source/exhumed/src/anubis.cpp
View file

@ -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 "exhumed.h"
#include "anubis.h" #include "anubis.h"
@ -356,7 +373,7 @@ void FuncAnubis(int a, int nDamage, int nRun)
default: default:
return; return;
} }
// loc_2564C: // loc_2564C:
if (nAction && nTarget != -1) if (nAction && nTarget != -1)
{ {
@ -462,7 +479,7 @@ void FuncAnubis(int a, int nDamage, int nRun)
return; return;
} }
default: default:
{ {
DebugOut("unknown msg %d for Anubis\n", a & 0x7F0000); DebugOut("unknown msg %d for Anubis\n", a & 0x7F0000);
return; return;

17
source/exhumed/src/anubis.h
View file

@ -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__ #ifndef __anubis_h__
#define __anubis_h__ #define __anubis_h__

23
source/exhumed/src/bubbles.cpp
View file

@ -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 "bubbles.h"
#include "runlist.h" #include "runlist.h"
@ -115,7 +132,7 @@ int BuildBubble(int x, int y, int z, short nSector)
BubbleList[nBubble].nSprite = nSprite; BubbleList[nBubble].nSprite = nSprite;
BubbleList[nBubble]._0 = 0; BubbleList[nBubble]._0 = 0;
BubbleList[nBubble]._2 = SeqOffsets[kSeqBubble] + nSize; BubbleList[nBubble]._2 = SeqOffsets[kSeqBubble] + nSize;
sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nBubble | 0x140000); sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nBubble | 0x140000);
BubbleList[nBubble]._6 = runlist_AddRunRec(NewRun, 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); BuildAnim(-1, 70, 0, sprite[nSprite].x, sprite[nSprite].y, sector[nSectAbove].floorz, nSectAbove, 64, 0);
} }
DestroyBubble(nBubble); DestroyBubble(nBubble);
} }
return; return;
@ -175,7 +192,7 @@ void FuncBubble(int a, int b, int nRun)
default: default:
DebugOut("unknown msg %d for Bubble\n", nMessage); DebugOut("unknown msg %d for Bubble\n", nMessage);
return; return;
} }
} }

17
source/exhumed/src/bubbles.h
View file

@ -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__ #ifndef __bubbles_h__
#define __bubbles_h__ #define __bubbles_h__

17
source/exhumed/src/bullet.cpp
View file

@ -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 "engine.h"
#include "bullet.h" #include "bullet.h"

17
source/exhumed/src/bullet.h
View file

@ -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__ #ifndef __bullet_h__
#define __bullet_h__ #define __bullet_h__

19
source/exhumed/src/cd.cpp
View file

@ -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 "compat.h"
#include "baselayer.h" #include "baselayer.h"
@ -22,7 +39,7 @@ int initcdaudio()
initprintf("No MSCDEX driver installed!\n"); initprintf("No MSCDEX driver installed!\n");
exit(0); exit(0);
} }
return 1; return 1;
} }

17
source/exhumed/src/cd.h
View file

@ -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__ #ifndef __cd_h__
#define __cd_h__ #define __cd_h__

17
source/exhumed/src/cdaudio.cpp
View file

@ -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" #include "cdaudio.h"

17
source/exhumed/src/cdaudio.h
View file

@ -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__ #ifndef __cdaudio_h__
#define __cdaudio_h__ #define __cdaudio_h__

17
source/exhumed/src/cdrom.cpp
View file

@ -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" #include "cdrom.h"

17
source/exhumed/src/cdrom.h
View file

@ -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__ #ifndef __cdrom_h__
#define __cdrom_h__ #define __cdrom_h__

20
source/exhumed/src/config.cpp
View file

@ -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 "compat.h"
#include "renderlayer.h" #include "renderlayer.h"
#include "_control.h" #include "_control.h"
@ -529,7 +547,7 @@ int CONFIG_ReadSetup()
if (cachesize > MAXCACHE1DSIZE) if (cachesize > MAXCACHE1DSIZE)
MAXCACHE1DSIZE = cachesize; MAXCACHE1DSIZE = cachesize;
if (g_noSetup == 0 && g_modDir[0] == '/') if (g_noSetup == 0 && g_modDir[0] == '/')
{ {

17
source/exhumed/src/config.h
View file

@ -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__ #ifndef __config_h__
#define __config_h__ #define __config_h__

17
source/exhumed/src/engine.h
View file

@ -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__ #ifndef __engine_h__
#define __engine_h__ #define __engine_h__

17
source/exhumed/src/enginesubs.cpp
View file

@ -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 "engine.h"

53
source/exhumed/src/exhumed.cpp
View file

@ -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 "compat.h"
#include "baselayer.h" #include "baselayer.h"
@ -81,7 +98,7 @@ void FinishLevel();
int htimer = 0; 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 */ /* 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", "CINEMAS",
"THE ANCIENT EGYPTIAN CITY", "THE ANCIENT EGYPTIAN CITY",
@ -1428,7 +1445,7 @@ void CheckKeys()
// { // {
// if (lMouseSens < 64) // if (lMouseSens < 64)
// lMouseSens++; // lMouseSens++;
// //
// CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Up); // CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Up);
// StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens); // StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens);
// } // }
@ -1438,7 +1455,7 @@ void CheckKeys()
// { // {
// if (lMouseSens >= 1) // if (lMouseSens >= 1)
// lMouseSens -= 1; // lMouseSens -= 1;
// //
// CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Down); // CONTROL_ClearButton(gamefunc_Mouse_Sensitivity_Down);
// StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens); // StatusMessage(500, "MOUSE SENSITIVITY SET TO %d", lMouseSens);
// } // }
@ -1541,7 +1558,7 @@ void CheckKeys()
{ {
bHolly = kFalse; bHolly = kFalse;
StatusMessage(1, " "); StatusMessage(1, " ");
} }
else if (!strcmp(pToken, "GOTO")) else if (!strcmp(pToken, "GOTO"))
{ {
// move player to X, Y coordinates // move player to X, Y coordinates
@ -1758,7 +1775,7 @@ void DoCredits()
for (int i = nStart; i < nCreditsIndex; i++) for (int i = nStart; i < nCreditsIndex; i++)
{ {
// var 24 == // var 24 ==
int nWidth = MyGetStringWidth(gString[edi]); int nWidth = MyGetStringWidth(gString[edi]);
myprintext((320 - nWidth) / 2, y, gString[edi], 0); 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 esi = 1;
//int edi = esi; //int edi = esi;
int doTitle = kFalse; // REVERT kTrue; int doTitle = kTrue; // REVERT kTrue;
int stopTitle = kFalse; int stopTitle = kFalse;
levelnew = 1; levelnew = 1;
@ -2483,7 +2500,7 @@ int app_main(int argc, char const* const* argv)
break; break;
} }
} }
// strupr(gString[j]); // strupr(gString[j]);
@ -2930,7 +2947,7 @@ LOOP3:
// if (nNetTime > 0) // if (nNetTime > 0)
// { // {
// nNetTime--; // nNetTime--;
// //
// if (!nNetTime) { // if (!nNetTime) {
// nFreeze = 3; // nFreeze = 3;
// } // }
@ -3049,7 +3066,7 @@ LOOP3:
nMapMode = (nMapMode+1)%3; nMapMode = (nMapMode+1)%3;
} }
} }
if (nMapMode != 0) if (nMapMode != 0)
{ {
int const timerOffset = ((int) totalclock - nonsharedtimer); 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 destYSize = tilesiz[nDestTile].y;
int srcYSize = tilesiz[nSrcTile].y; int srcYSize = tilesiz[nSrcTile].y;
uint8_t *pSrc = (uint8_t*)waloff[nSrcTile]; uint8_t *pSrc = (uint8_t*)waloff[nSrcTile];
for (int x = 0; x < tilesiz[nSrcTile].x; x++) for (int x = 0; x < tilesiz[nSrcTile].x; x++)
{ {
pDest += destYSize; 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 // add some padding to left and right sides of text in the box
nWidth += 30; nWidth += 30;
int x1 = (320 - nWidth) / 2; int x1 = (320 - nWidth) / 2;
int x2 = x1 + nWidth; int x2 = x1 + nWidth;
@ -3585,7 +3602,7 @@ void InitSpiritHead()
sprite[nSpiritSprite].picnum = kTileRamsesWorkTile; sprite[nSpiritSprite].picnum = kTileRamsesWorkTile;
nHeadStage = 0; nHeadStage = 0;
// work tile is twice as big as the normal head size // work tile is twice as big as the normal head size
tilesiz[kTileRamsesWorkTile].x = 97 * 2; // 194; tilesiz[kTileRamsesWorkTile].x = 97 * 2; // 194;
tilesiz[kTileRamsesWorkTile].y = 106 * 2; // 212; tilesiz[kTileRamsesWorkTile].y = 106 * 2; // 212;
@ -3615,7 +3632,7 @@ void InitSpiritHead()
nCDTrackLength = playCDtrack(nTrack); nCDTrackLength = playCDtrack(nTrack);
bSubTitles = nCDTrackLength == 0; bSubTitles = nCDTrackLength == 0;
StartSwirlies(); StartSwirlies();
sprintf(filename, "LEV%d.PUP", levelnum); sprintf(filename, "LEV%d.PUP", levelnum);
@ -3635,18 +3652,18 @@ void DimSector(short nSector)
{ {
short startwall = sector[nSector].wallptr; short startwall = sector[nSector].wallptr;
short nWalls = sector[nSector].wallnum; short nWalls = sector[nSector].wallnum;
for (int i = 0; i < nWalls; i++) for (int i = 0; i < nWalls; i++)
{ {
if (wall[startwall+i].shade < 40) { if (wall[startwall+i].shade < 40) {
wall[startwall+i].shade++; wall[startwall+i].shade++;
} }
} }
if (sector[nSector].floorshade < 40) { if (sector[nSector].floorshade < 40) {
sector[nSector].floorshade++; sector[nSector].floorshade++;
} }
if (sector[nSector].ceilingshade < 40) { if (sector[nSector].ceilingshade < 40) {
sector[nSector].ceilingshade++; sector[nSector].ceilingshade++;
} }
@ -4016,7 +4033,7 @@ int DoSpiritHead()
for (int i = 0; i < 97; i++) for (int i = 0; i < 97; i++)
{ {
memcpy(pDest, pSrc, 106); memcpy(pDest, pSrc, 106);
pDest += 212; pDest += 212;
pSrc += 106; pSrc += 106;
} }

18
source/exhumed/src/exhumed.h
View file

@ -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__ #ifndef __exhumed_h__
#define __exhumed_h__ #define __exhumed_h__

19
source/exhumed/src/exscript.cpp
View file

@ -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 // 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->_0 = entry;
eax->_4 = pScript; eax->_4 = pScript;
} }

17
source/exhumed/src/exscript.h
View file

@ -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__ #ifndef __exscript_h__
#define __exscript_h__ #define __exscript_h__

17
source/exhumed/src/fish.cpp
View file

@ -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 "fish.h"
#include "anims.h" #include "anims.h"

17
source/exhumed/src/fish.h
View file

@ -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__ #ifndef __fish_h__
#define __fish_h__ #define __fish_h__

19
source/exhumed/src/grenade.cpp
View file

@ -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 "grenade.h"
#include "engine.h" #include "engine.h"
@ -233,7 +250,7 @@ void ExplodeGrenade(short nGrenade)
} }
short nDamage = BulletInfo[kWeaponGrenade].nDamage; short nDamage = BulletInfo[kWeaponGrenade].nDamage;
if (nPlayerDouble[nPlayer] > 0) { if (nPlayerDouble[nPlayer] > 0) {
nDamage *= 2; nDamage *= 2;
} }

17
source/exhumed/src/grenade.h
View file

@ -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__ #ifndef __grenade_h__
#define __grenade_h__ #define __grenade_h__

19
source/exhumed/src/gun.cpp
View file

@ -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 "gun.h"
#include "engine.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 xVect = Sin(sprite[nSprite].ang + 512);
int yVect = Sin(sprite[nSprite].ang); int yVect = Sin(sprite[nSprite].ang);
vec3_t startPos = { *x, *y, *z }; vec3_t startPos = { *x, *y, *z };
hitdata_t hitData; hitdata_t hitData;
hitscan(&startPos, *nSector, xVect, yVect, 0, &hitData, CLIPMASK1); hitscan(&startPos, *nSector, xVect, yVect, 0, &hitData, CLIPMASK1);

17
source/exhumed/src/gun.h
View file

@ -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__ #ifndef __gun_h__
#define __gun_h__ #define __gun_h__

28
source/exhumed/src/init.cpp
View file

@ -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 "compat.h"
#include "keyboard.h" #include "keyboard.h"
#include "control.h" #include "control.h"
@ -531,7 +549,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b)
while (num1 > nCount) while (num1 > nCount)
{ {
short dx = nWallB; short dx = nWallB;
int esi = 0x7FFFFFF; int esi = 0x7FFFFFF;
int edi = esi; int edi = esi;
@ -540,7 +558,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b)
int var_14 = 0; int var_14 = 0;
int nCount2 = 0; int nCount2 = 0;
while (nCount2 < num2) while (nCount2 < num2)
{ {
@ -578,7 +596,7 @@ void SnapSectors(short nSectorA, short nSectorB, short b)
var_34 += var_3C; var_34 += var_3C;
if (var_38 < var_34) if (var_38 < var_34)
{ {
esi = x - wall[dx].x; esi = x - wall[dx].x;
edi = y - wall[dx].y; 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); BuildRex(nSprite, 0, 0, 0, 0, 0, nChannel);
return; return;
} }
case 106: case 106:
{ {
if (bNoCreatures) { if (bNoCreatures) {
mydeletesprite(nSprite); mydeletesprite(nSprite);
@ -982,7 +1000,7 @@ void ProcessSpriteTag(short nSprite, short lotag, short hitag)
{ {
short nSector = sprite[nSprite].sectnum; short nSector = sprite[nSprite].sectnum;
SectDepth[nSector] = hitag << 8; SectDepth[nSector] = hitag << 8;
mydeletesprite(nSprite); mydeletesprite(nSprite);
return; return;
} }

17
source/exhumed/src/init.h
View file

@ -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__ #ifndef __init_h__
#define __init_h__ #define __init_h__

17
source/exhumed/src/input.cpp
View file

@ -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 "input.h"
#include "engine.h" #include "engine.h"

17
source/exhumed/src/input.h
View file

@ -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__ #ifndef __input_h__
#define __input_h__ #define __input_h__

19
source/exhumed/src/items.cpp
View file

@ -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 "items.h"
#include "anims.h" #include "anims.h"
@ -229,7 +246,7 @@ void UseScarab(short nPlayer)
void UseHand(short nPlayer) void UseHand(short nPlayer)
{ {
nPlayerDouble[nPlayer] = 1350; nPlayerDouble[nPlayer] = 1350;
if (nPlayer == nLocalPlayer) if (nPlayer == nLocalPlayer)
{ {
ItemFlash(); ItemFlash();

17
source/exhumed/src/items.h
View file

@ -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__ #ifndef __items_h__
#define __items_h__ #define __items_h__

21
source/exhumed/src/lavadude.cpp
View file

@ -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 "engine.h"
#include "lavadude.h" #include "lavadude.h"
@ -227,7 +244,7 @@ void FuncLava(int a, int nDamage, int nRun)
} }
LavaList[nLava].nHealth -= nDamage; LavaList[nLava].nHealth -= nDamage;
if (LavaList[nLava].nHealth <= 0) if (LavaList[nLava].nHealth <= 0)
{ {
LavaList[nLava].nHealth = 0; LavaList[nLava].nHealth = 0;
@ -301,7 +318,7 @@ void FuncLava(int a, int nDamage, int nRun)
LavaList[nLava].nTarget = -1; LavaList[nLava].nTarget = -1;
} }
} }
switch (nAction) switch (nAction)
{ {
case 0: case 0:

17
source/exhumed/src/lavadude.h
View file

@ -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__ #ifndef __lavadude_h__
#define __lavadude_h__ #define __lavadude_h__

19
source/exhumed/src/light.cpp
View file

@ -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 "light.h"
#include "engine.h" #include "engine.h"
@ -116,7 +133,7 @@ void SetGreenPal()
// { // {
// palookup[i] = palookup[6]; // palookup[i] = palookup[6];
// } // }
// //
// palookup[5] = origpalookup[5]; // palookup[5] = origpalookup[5];
} }

17
source/exhumed/src/light.h
View file

@ -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__ #ifndef __light_h__
#define __light_h__ #define __light_h__

33
source/exhumed/src/lighting.cpp
View file

@ -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 "typedefs.h"
#include "lighting.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; sFlash[nFlash].field_1 = i;
wall[i].pal += 7; wall[i].pal += 7;
ebx += wall[i].shade; ebx += wall[i].shade;
int eax = ebx; int eax = ebx;
if (ebx < -127) { if (ebx < -127) {
eax = -127; eax = -127;
} }
wall[i].shade = eax; wall[i].shade = eax;
if (!var_1C && !wall[i].overpicnum && pNextSector) 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_0 = var_20 | 1;
sFlash[nFlash].field_1 = nSector; sFlash[nFlash].field_1 = nSector;
sFlash[nFlash].shade = sector[nSector].floorshade; sFlash[nFlash].shade = sector[nSector].floorshade;
sector[nSector].floorpal += 7; sector[nSector].floorpal += 7;
int edx = sector[nSector].floorshade + var_28; int edx = sector[nSector].floorshade + var_28;
@ -318,7 +335,7 @@ void UndoFlashes()
uint8_t var_28 = sFlash[nFlash].field_0 & 0x3F; uint8_t var_28 = sFlash[nFlash].field_0 & 0x3F;
short nIndex = sFlash[nFlash].field_1; short nIndex = sFlash[nFlash].field_1;
if (sFlash[nFlash].field_0 & 0x80) if (sFlash[nFlash].field_0 & 0x80)
{ {
int var_20 = var_28 - 1; int var_20 = var_28 - 1;
@ -479,7 +496,7 @@ void AddFlicker(short nSector, int nVal)
} }
sFlicker[nFlickerCount].field_4 = flickermask[nVal]; sFlicker[nFlickerCount].field_4 = flickermask[nVal];
nFlickerCount++; nFlickerCount++;
} }
@ -715,15 +732,15 @@ void SetTorch(int nPlayer, int bTorchOnOff)
// char *pTempPal = origpalookup[kPalTorch]; // char *pTempPal = origpalookup[kPalTorch];
// palookup[kPalTorch] = palookup[kPalNoTorch]; // palookup[kPalTorch] = palookup[kPalNoTorch];
// palookup[kPalNoTorch] = pTempPal; // palookup[kPalNoTorch] = pTempPal;
// //
// pTempPal = origpalookup[kPalTorch]; // pTempPal = origpalookup[kPalTorch];
// origpalookup[kPalTorch] = origpalookup[kPalNoTorch]; // origpalookup[kPalTorch] = origpalookup[kPalNoTorch];
// origpalookup[kPalNoTorch] = pTempPal; // origpalookup[kPalNoTorch] = pTempPal;
// //
// pTempPal = origpalookup[kPalTorch2]; // pTempPal = origpalookup[kPalTorch2];
// origpalookup[kPalTorch2] = origpalookup[kPalNoTorch2]; // origpalookup[kPalTorch2] = origpalookup[kPalNoTorch2];
// origpalookup[kPalNoTorch2] = pTempPal; // origpalookup[kPalNoTorch2] = pTempPal;
// //
// pTempPal = palookup[kPalTorch2]; // pTempPal = palookup[kPalTorch2];
// palookup[kPalNoTorch2] = palookup[kPalTorch2]; // palookup[kPalNoTorch2] = palookup[kPalTorch2];
// palookup[kPalTorch2] = pTempPal; // palookup[kPalTorch2] = pTempPal;

17
source/exhumed/src/lighting.h
View file

@ -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__ #ifndef __lighting_h__
#define __lighting_h__ #define __lighting_h__

27
source/exhumed/src/lion.cpp
View file

@ -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 "lion.h"
#include "engine.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; y = sprite[nSprite].y;
z = sector[sprite[nSprite].sectnum].floorz; z = sector[sprite[nSprite].sectnum].floorz;
nAngle = sprite[nSprite].ang; nAngle = sprite[nSprite].ang;
} }
assert(nSprite >= 0 && nSprite < kMaxSprites); assert(nSprite >= 0 && nSprite < kMaxSprites);
@ -258,7 +275,7 @@ void FuncLion(int a, int nDamage, int nRun)
} }
} }
} }
if (nAction) if (nAction)
{ {
LionList[nLion]._g--; LionList[nLion]._g--;
@ -273,7 +290,7 @@ void FuncLion(int a, int nDamage, int nRun)
else else
{ {
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
} }
LionList[nLion]._g = 100; 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 z = sprite[nSprite].z - (GetSpriteHeight(nSprite) >> 1);
int var_40 = 0x7FFFFFFF; int var_40 = 0x7FFFFFFF;
short nSector = sprite[nSprite].sectnum; short nSector = sprite[nSprite].sectnum;
short var_28 = sprite[nSprite].ang; short var_28 = sprite[nSprite].ang;
@ -489,7 +506,7 @@ void FuncLion(int a, int nDamage, int nRun)
break; break;
} }
} }
return; return;
} }

17
source/exhumed/src/lion.h
View file

@ -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__ #ifndef __lion_h__
#define __lion_h__ #define __lion_h__

18
source/exhumed/src/main.cpp
View file

@ -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.
*/
//-------------------------------------------------------------------------

21
source/exhumed/src/map.cpp
View file

@ -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 "typedefs.h"
#include <string.h> #include <string.h>
@ -40,7 +57,7 @@ void MarkSectorSeen(short nSector)
short startwall = sector[nSector].wallptr; short startwall = sector[nSector].wallptr;
short nWalls = sector[nSector].wallnum; short nWalls = sector[nSector].wallnum;
short endwall = startwall + nWalls; short endwall = startwall + nWalls;
while (startwall <= endwall) while (startwall <= endwall)
{ {
show2dwall[startwall >> 3] = (1 << (startwall & 7)) | show2dwall[startwall >> 3]; 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 (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 || nFloorZ != sector[wall[nWall].nextsector].floorz ||
((wall[nextwall].cstat | wall[nWall].cstat) & 0x30)) ((wall[nextwall].cstat | wall[nWall].cstat) & 0x30))
{ {

17
source/exhumed/src/map.h
View file

@ -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__ #ifndef __map_h__
#define __map_h__ #define __map_h__

58
source/exhumed/src/menu.cpp
View file

@ -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 "compat.h"
#include "build.h" #include "build.h"
#include "exhumed.h" #include "exhumed.h"
@ -144,7 +162,7 @@ void DoEnergyTile()
ptr2 += 64; ptr2 += 64;
nColor++; nColor++;
if (nColor >= 168) { if (nColor >= 168) {
nColor = 160; nColor = 160;
} }
@ -225,7 +243,7 @@ void DoEnergyTile()
*ptrW = 96; *ptrW = 96;
//continue; //continue;
} }
else else
{ {
if (!menu_RandomBit2()) if (!menu_RandomBit2())
{ {
@ -254,13 +272,13 @@ void DoEnergyTile()
} }
ptrW = (uint8_t*)waloff[kEnergy2]; ptrW = (uint8_t*)waloff[kEnergy2];
for (i = 0; i < 4096; i++) for (i = 0; i < 4096; i++)
{ {
if ((*ptrW) == 96) { if ((*ptrW) == 96) {
*ptrW = 255; // -1? *ptrW = 255; // -1?
} }
ptrW++; ptrW++;
} }
@ -464,7 +482,7 @@ void menu_DoPlasma()
if (badOffset) if (badOffset)
continue; continue;
unsigned int nSmokeOffset = 0; unsigned int nSmokeOffset = 0;
if (plasma_A[j]) if (plasma_A[j])
@ -477,7 +495,7 @@ void menu_DoPlasma()
if (al != 255 && al != 96) { if (al != 255 && al != 96) {
break; break;
} }
nSmokeOffset++; nSmokeOffset++;
ptr3++; ptr3++;
} }
@ -508,7 +526,7 @@ void menu_DoPlasma()
overwritesprite(0, 0, nPlasmaTile, 0, 2, kPalNormal); overwritesprite(0, 0, nPlasmaTile, 0, 2, kPalNormal);
overwritesprite(160, 40, kExhumedLogo, 0, 3, kPalNormal); overwritesprite(160, 40, kExhumedLogo, 0, 3, kPalNormal);
// flip between tile 4092 and 4093 // flip between tile 4092 and 4093
if (nPlasmaTile == kTile4092) { if (nPlasmaTile == kTile4092) {
nPlasmaTile = kTile4093; nPlasmaTile = kTile4093;
@ -870,8 +888,8 @@ void menu_AdjustVolume()
overwritesprite(55, 135, kMenuBlankTitleTile, 0, 2, kPalNormal); overwritesprite(55, 135, kMenuBlankTitleTile, 0, 2, kPalNormal);
seq_DrawGunSequence( seq_DrawGunSequence(
SeqOffsets[kSeqSlider], SeqOffsets[kSeqSlider],
gFXVolume % 3, gFXVolume % 3,
(gFXVolume / 2) - 93, (gFXVolume / 2) - 93,
38, 38,
0, 0,
@ -1233,13 +1251,13 @@ check_keys:
KB_KeyDown[sc_Escape] = 0; KB_KeyDown[sc_Escape] = 0;
return -1; return -1;
} }
else else
{ {
// check if a slot name is being typed // check if a slot name is being typed
if ((ch >= '0' && ch <= '9') if ((ch >= '0' && ch <= '9')
|| (ch >= 'A' && ch <= 'Z') || (ch >= 'A' && ch <= 'Z')
|| (ch >= 'a' && ch <= 'z') || (ch >= 'a' && ch <= 'z')
|| (ch == ' ')) || (ch == ' '))
{ {
ch = toupper(ch); ch = toupper(ch);
if (nNameOffset < 24) // n chars per slot name if (nNameOffset < 24) // n chars per slot name
@ -1312,7 +1330,7 @@ int menu_LoadGameMenu()
int spriteY = 90; int spriteY = 90;
int textY = 98; int textY = 98;
for (int i = 0; i < kMaxSaveSlots; i++) for (int i = 0; i < kMaxSaveSlots; i++)
{ {
// TODO - shade flashing // TODO - shade flashing
@ -1414,7 +1432,7 @@ void menu_GameLoad2(FILE *fp)
short menu_GameLoad(int nSlot) short menu_GameLoad(int nSlot)
{ {
memset(&GameStats, 0, sizeof(GameStats)); memset(&GameStats, 0, sizeof(GameStats));
FILE *fp = fopen(kSaveFileName, "rb"); FILE *fp = fopen(kSaveFileName, "rb");
if (fp == NULL) { if (fp == NULL) {
return 0; return 0;
@ -1699,7 +1717,7 @@ LABEL_21:
return 0; return 0;
} }
default: default:
menu_ResetZoom(); menu_ResetZoom();
menu_ResetKeyTimer(); menu_ResetKeyTimer();
break; break;
@ -1878,7 +1896,7 @@ void ComputeCinemaText(int nLine)
nCrawlY = 199; nCrawlY = 199;
nHeight = linecount * 10; nHeight = linecount * 10;
ClearAllKeys(); ClearAllKeys();
} }
@ -2069,7 +2087,7 @@ void GoToTheCinema(int nVal)
case 1: case 1:
ebx = 0; ebx = 0;
break; break;
case 2: case 2:
ebx = 2; ebx = 2;
edx = ebx; edx = ebx;
@ -2207,7 +2225,7 @@ uint8_t CheckForEscape()
if (!KB_KeyWaiting() || (KB_GetCh() != 27)) { if (!KB_KeyWaiting() || (KB_GetCh() != 27)) {
return kFalse; return kFalse;
} }
return kTrue; return kTrue;
} }
@ -2235,7 +2253,7 @@ void DoStatic(int a, int b)
while (v7 < v5) while (v7 < v5)
{ {
*pStart = RandomBit() * 16; *pStart = RandomBit() * 16;
v7++; v7++;
pStart++; pStart++;
} }
@ -2326,7 +2344,7 @@ LABEL_11:
break; break;
int xPos = 70; int xPos = 70;
const char *nChar = gString[nString]; const char *nChar = gString[nString];
nString++; nString++;
@ -2367,7 +2385,7 @@ LABEL_11:
if (v11 <= (int)totalclock) if (v11 <= (int)totalclock)
goto LABEL_11; goto LABEL_11;
} while (!KB_KeyWaiting()); } while (!KB_KeyWaiting());
} }
while (KB_GetCh() != 27); while (KB_GetCh() != 27);
LABEL_28: LABEL_28:

17
source/exhumed/src/menu.h
View file

@ -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__ #ifndef __menu_h__
#define __menu_h__ #define __menu_h__

17
source/exhumed/src/mono.cpp
View file

@ -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_ Name: MonoClear_

17
source/exhumed/src/mono.h
View file

@ -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__ #ifndef __mono_h__
#define __mono_h__ #define __mono_h__

31
source/exhumed/src/move.cpp
View file

@ -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 "engine.h"
#include "exhumed.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 x = pSprite->x;
int y = pSprite->y; int y = pSprite->y;
int z = pSprite->z; int z = pSprite->z;
int nSpriteHeight = GetSpriteHeight(nSprite); int nSpriteHeight = GetSpriteHeight(nSprite);
int nClipDist = (int8_t)pSprite->clipdist << 2; 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) { if (nRet & 0x20000) {
dz = 0; dz = 0;
} }
if ((sector[nSector].floorz - z) < (dz + flordist)) if ((sector[nSector].floorz - z) < (dz + flordist))
{ {
pSprite->x = x; pSprite->x = x;
@ -681,7 +698,7 @@ int FindPlayer(int nSprite, int nVal)
int z = sprite[nSprite].z - GetSpriteHeight(nSprite); int z = sprite[nSprite].z - GetSpriteHeight(nSprite);
nVal <<= 8; nVal <<= 8;
short nPlayerSprite; short nPlayerSprite;
int i = 0; 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 ebx = (sprite[nSprite2].z + ecx) - (sprite[nSprite1].z + nVal);
int edx = (sprite[nSprite2].z + ecx) - (sprite[nSprite1].z + nVal); int edx = (sprite[nSprite2].z + ecx) - (sprite[nSprite1].z + nVal);
ebx >>= 4; ebx >>= 4;
edx >>= 8; edx >>= 8;
@ -1143,14 +1160,14 @@ int AngleChase(int nSprite, int nSprite2, int ebx, int ecx, int push1)
{ {
nAngDelta2 = nAngDelta; nAngDelta2 = nAngDelta;
nAngDelta2 >>= 6; nAngDelta2 >>= 6;
edx = ebx; edx = ebx;
if (nAngDelta2 < 0) if (nAngDelta2 < 0)
nAngDelta2 = -nAngDelta2; nAngDelta2 = -nAngDelta2;
ebx /= nAngDelta2; ebx /= nAngDelta2;
if (ebx < 5) if (ebx < 5)
ebx = 5; ebx = 5;
} }
@ -1159,7 +1176,7 @@ int AngleChase(int nSprite, int nSprite2, int ebx, int ecx, int push1)
if (nAngDeltaC < 0) if (nAngDeltaC < 0)
nAngDeltaC = -nAngDeltaC; nAngDeltaC = -nAngDeltaC;
if (nAngDeltaC > push1) if (nAngDeltaC > push1)
{ {
if (nAngDelta >= 0) if (nAngDelta >= 0)

17
source/exhumed/src/move.h
View file

@ -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__ #ifndef __move_h__
#define __move_h__ #define __move_h__

17
source/exhumed/src/movie.cpp
View file

@ -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 "engine.h"
#include "exhumed.h" #include "exhumed.h"

17
source/exhumed/src/movie.h
View file

@ -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__ #ifndef __movie_h__
#define __movie_h__ #define __movie_h__

19
source/exhumed/src/mummy.cpp
View file

@ -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 "mummy.h"
#include "sequence.h" #include "sequence.h"
@ -469,7 +486,7 @@ void FuncMummy(int a, int nDamage, int nRun)
if (MummyList[nMummy].nHealth <= 0) { if (MummyList[nMummy].nHealth <= 0) {
return; return;
} }
MummyList[nMummy].nHealth -= nDamage; MummyList[nMummy].nHealth -= nDamage;
if (MummyList[nMummy].nHealth <= 0) if (MummyList[nMummy].nHealth <= 0)

17
source/exhumed/src/mummy.h
View file

@ -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__ #ifndef __mummy_h__
#define __mummy_h__ #define __mummy_h__

17
source/exhumed/src/names.h
View file

@ -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__ #ifndef __names_h__
#define __names_h__ #define __names_h__

17
source/exhumed/src/network.cpp
View file

@ -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 // this is net.c in the original code

17
source/exhumed/src/network.h
View file

@ -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__ #ifndef __network_h__
#define __network_h__ #define __network_h__

39
source/exhumed/src/object.cpp
View file

@ -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 "engine.h"
#include "object.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; Elevator[ElevCount].nSprite = nWallSprite;
va_list zlist; va_list zlist;
va_start(zlist, nCount); va_start(zlist, nCount);
@ -1081,7 +1098,7 @@ void FuncSlide(int a, int b, int c)
int var_28 = nSeekB; int var_28 = nSeekB;
dragpoint(SlideData[nSlide].field_0, x, y, 0); dragpoint(SlideData[nSlide].field_0, x, y, 0);
if (edi == 0 && ecx == 0) { if (edi == 0 && ecx == 0) {
ebp = clipmask; ebp = clipmask;
} }
@ -1246,7 +1263,7 @@ void FuncTrap(int a, int b, int c)
if (sTrap[nTrap].field_0 > 10) { if (sTrap[nTrap].field_0 > 10) {
return; return;
} }
short nType = sTrap[nTrap].nType; short nType = sTrap[nTrap].nType;
if (sTrap[nTrap].field_0 == 0) if (sTrap[nTrap].field_0 == 0)
@ -1357,7 +1374,7 @@ int BuildSpark(int nSprite, int nVal)
if (nVal == 3) if (nVal == 3)
{ {
sprite[var_14].xrepeat = 120; sprite[var_14].xrepeat = 120;
sprite[var_14].yrepeat = 120; sprite[var_14].yrepeat = 120;
} }
else else
{ {
@ -1468,7 +1485,7 @@ void DimLights()
sector[i].floorshade++; sector[i].floorshade++;
int nWall = sector[i].wallptr; int nWall = sector[i].wallptr;
while (nWall < nWall + sector[i].wallnum) while (nWall < nWall + sector[i].wallnum)
{ {
if (wall[nWall].shade < 100) if (wall[nWall].shade < 100)
@ -1659,7 +1676,7 @@ void ExplodeEnergyBlock(int nSprite)
sector[nSector].floorshade = 50; sector[nSector].floorshade = 50;
sector[nSector].extra = -1; sector[nSector].extra = -1;
sector[nSector].floorz = sprite[nSprite].z; sector[nSector].floorz = sprite[nSprite].z;
sprite[nSprite].z = (sprite[nSprite].z + sector[nSector].floorz) / 2; sprite[nSprite].z = (sprite[nSprite].z + sector[nSector].floorz) / 2;
BuildSpark(nSprite, 3); BuildSpark(nSprite, 3);
@ -1962,7 +1979,7 @@ void FuncObject(int a, int b, int nRun)
{ {
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
sprite[nSprite].zvel = 0; sprite[nSprite].zvel = 0;
} }
else if (sprite[nSprite].statnum != kStat98) else if (sprite[nSprite].statnum != kStat98)
{ {
@ -2166,7 +2183,7 @@ void DoDrips()
int nFloorZ = sector[nSector].floorz; int nFloorZ = sector[nSector].floorz;
sector[nSector].floorz = edx + sBob[i].z; sector[nSector].floorz = edx + sBob[i].z;
MoveSectorSprites(nSector, sector[nSector].floorz - nFloorZ); MoveSectorSprites(nSector, sector[nSector].floorz - nFloorZ);
} }
} }
@ -2222,7 +2239,7 @@ void AddSectorBob(int nSector, int nHitag, int bx)
sBob[nBobs].field_3 = bx; sBob[nBobs].field_3 = bx;
int z; int z;
if (bx == 0) { if (bx == 0) {
z = sector[nSector].floorz; z = sector[nSector].floorz;
} }
@ -2457,7 +2474,7 @@ void DoMovingSects()
} }
} }
} }
else else
{ {
// repeat of code from loc_23908 // repeat of code from loc_23908
nYVel = ecx; nYVel = ecx;
@ -2465,7 +2482,7 @@ void DoMovingSects()
if (sMoveDir[i] > 0) if (sMoveDir[i] > 0)
{ {
sMoveSect[i].nTrailPoint = nTrailPointNext[sMoveSect[i].nTrailPoint]; sMoveSect[i].nTrailPoint = nTrailPointNext[sMoveSect[i].nTrailPoint];
} }
else else
{ {

17
source/exhumed/src/object.h
View file

@ -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__ #ifndef __object_h__
#define __object_h__ #define __object_h__

17
source/exhumed/src/paul.cpp
View file

@ -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" #include "paul.h"

17
source/exhumed/src/paul.h
View file

@ -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__ #ifndef __paul_h__
#define __paul_h__ #define __paul_h__

62
source/exhumed/src/player.cpp
View file

@ -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 "compat.h"
#include "player.h" #include "player.h"
#include "runlist.h" #include "runlist.h"
@ -51,17 +69,17 @@ short obobangle = 0, bobangle = 0;
short bPlayerPan = 0; short bPlayerPan = 0;
short bLockPan = 0; short bLockPan = 0;
static actionSeq ActionSeq[] = { static actionSeq ActionSeq[] = {
{18, 0}, {0, 0}, {9, 0}, {27, 0}, {63, 0}, {18, 0}, {0, 0}, {9, 0}, {27, 0}, {63, 0},
{72, 0}, {54, 0}, {45, 0}, {54, 0}, {81, 0}, {72, 0}, {54, 0}, {45, 0}, {54, 0}, {81, 0},
{90, 0}, {99, 0}, {108, 0}, {8, 0}, {0, 0}, {90, 0}, {99, 0}, {108, 0}, {8, 0}, {0, 0},
{139, 0}, {117, 1}, {119, 1}, {120, 1}, {121, 1}, {139, 0}, {117, 1}, {119, 1}, {120, 1}, {121, 1},
{122, 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 }; 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, -14080, -14080, -14080, -14080, -14080, -14080, -8320,
-8320, -8320, -8320, -8320, -8320, -8320, -14080, -8320, -8320, -8320, -8320, -8320, -8320, -14080,
-14080, -14080, -14080, -14080, -14080, -14080, -14080 -14080, -14080, -14080, -14080, -14080, -14080, -14080
@ -337,7 +355,7 @@ void PlayerInterruptKeys()
if (aimmode) if (aimmode)
{ {
fix16_t nVPan = nVertPan[nLocalPlayer] - fix16_from_int((info.mousey >> 7)); fix16_t nVPan = nVertPan[nLocalPlayer] - fix16_from_int((info.mousey >> 7));
if (nVPan < F16(0)) if (nVPan < F16(0))
{ {
nVPan = F16(0); nVPan = F16(0);
@ -346,7 +364,7 @@ void PlayerInterruptKeys()
{ {
nVPan = F16(184); nVPan = F16(184);
} }
nVertPan[nLocalPlayer] = nVPan; nVertPan[nLocalPlayer] = nVPan;
} }
else else
@ -363,7 +381,7 @@ void PlayerInterruptKeys()
} }
} }
} }
// loc_18FD4 // loc_18FD4
if (BUTTON(gamefunc_Strafe_Left)) if (BUTTON(gamefunc_Strafe_Left))
{ {
@ -698,7 +716,7 @@ void RestartPlayer(short nPlayer)
sprite[nSprite].zvel = 0; sprite[nSprite].zvel = 0;
nStandHeight = nHeight; nStandHeight = nHeight;
sprite[nSprite].hitag = 0; sprite[nSprite].hitag = 0;
sprite[nSprite].extra = -1; sprite[nSprite].extra = -1;
sprite[nSprite].lotag = runlist_HeadRun() + 1; sprite[nSprite].lotag = runlist_HeadRun() + 1;
@ -911,7 +929,7 @@ void StartDeathSeq(int nPlayer, int nVal)
PlayerList[nPlayer].field_2 = 0; PlayerList[nPlayer].field_2 = 0;
sprite[nSprite].cstat &= 0xFEFE; sprite[nSprite].cstat &= 0xFEFE;
if (nTotalPlayers == 1) if (nTotalPlayers == 1)
{ {
short nLives = nPlayerLives[nPlayer]; 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); seq_PlotSequence(pA & 0xFFFF, SeqOffsets[PlayerList[nPlayer].nSeq] + ActionSeq[nAction].a, PlayerList[nPlayer].field_2, ActionSeq[nAction].b);
return; return;
} }
case 0xA0000: case 0xA0000:
{ {
if (PlayerList[nPlayer].nHealth <= 0) { if (PlayerList[nPlayer].nHealth <= 0) {
@ -1127,7 +1145,7 @@ void FuncPlayer(int pA, int nDamage, int nRun)
PlayerList[nPlayer].field_2 = 0; PlayerList[nPlayer].field_2 = 0;
PlayerList[nPlayer].nAction = 12; PlayerList[nPlayer].nAction = 12;
return; return;
} }
} }
else else
{ {
@ -1374,11 +1392,11 @@ void FuncPlayer(int pA, int nDamage, int nRun)
lPlayerXVel = 0; lPlayerXVel = 0;
lPlayerYVel = 0; lPlayerYVel = 0;
sprite[nPlayerSprite].xvel = 0; sprite[nPlayerSprite].xvel = 0;
sprite[nPlayerSprite].yvel = 0; sprite[nPlayerSprite].yvel = 0;
sprite[nPlayerSprite].zvel = 0; sprite[nPlayerSprite].zvel = 0;
nPlayerDAng = 0; nPlayerDAng = 0;
if (nFreeze < 1) if (nFreeze < 1)
@ -1484,7 +1502,7 @@ void FuncPlayer(int pA, int nDamage, int nRun)
int var_F4 = sPlayerInput[nPlayer].xVel; int var_F4 = sPlayerInput[nPlayer].xVel;
int var_F8 = sPlayerInput[nPlayer].yVel; int var_F8 = sPlayerInput[nPlayer].yVel;
int nMyAngle = GetMyAngle(sPlayerInput[nPlayer].xVel, sPlayerInput[nPlayer].yVel); int nMyAngle = GetMyAngle(sPlayerInput[nPlayer].xVel, sPlayerInput[nPlayer].yVel);
MoveSector(var_B4, nMyAngle, &var_F4, &var_F8); MoveSector(var_B4, nMyAngle, &var_F4, &var_F8);
if (nPlayerPushSound[nPlayer] <= -1) if (nPlayerPushSound[nPlayer] <= -1)
@ -1817,7 +1835,7 @@ loc_1AB8E:
short nValB; short nValB;
// neartag finds the nearest sector, wall, and sprite which has its hitag and/or lotag set to a value. // 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); &nearTagSector, &nearTagWall, &nearTagSprite, (int32_t*)&nearHitDist, 1024, 2, NULL);
feebtag(sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum, feebtag(sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum,
@ -1885,7 +1903,7 @@ do_default_b:
} }
case 1: // Fuel Canister case 1: // Fuel Canister
{ {
if (AddAmmo(nPlayer, 3, sprite[nValB].hitag)) if (AddAmmo(nPlayer, 3, sprite[nValB].hitag))
{ {
var_88 = StaticSound[kSound69]; var_88 = StaticSound[kSound69];
goto do_default; goto do_default;
@ -1948,7 +1966,7 @@ do_default_b:
case 4: // Pickable item case 4: // Pickable item
case 9: // Pickable item case 9: // Pickable item
case 10: // Reserved case 10: // Reserved
case 18: case 18:
case 25: case 25:
case 28: case 28:
case 29: case 29:
@ -2272,7 +2290,7 @@ do_default_b:
case 19: // Extra Life case 19: // Extra Life
{ {
var_88 = -1; var_88 = -1;
if (nPlayerLives[nPlayer] >= kMaxPlayerLives) { if (nPlayerLives[nPlayer] >= kMaxPlayerLives) {
break; break;
} }
@ -2666,7 +2684,7 @@ do_default_b:
var_88 = StaticSound[kSound69]; var_88 = StaticSound[kSound69];
goto do_default; goto do_default;
} }
break; break;
} }
@ -2792,7 +2810,7 @@ do_default_b:
if (PlayerList[nPlayer].nMagic >= 1000) { if (PlayerList[nPlayer].nMagic >= 1000) {
break; break;
} }
var_88 = StaticSound[kSound67]; var_88 = StaticSound[kSound67];
PlayerList[nPlayer].nMagic += 100; PlayerList[nPlayer].nMagic += 100;
@ -3122,7 +3140,7 @@ do_default_b:
// loc_1C05E // loc_1C05E
fix16_t ecx = nDestVertPan[nPlayer] - nVertPan[nPlayer]; fix16_t ecx = nDestVertPan[nPlayer] - nVertPan[nPlayer];
if (aimmode) if (aimmode)
{ {
ecx = 0; ecx = 0;

17
source/exhumed/src/player.h
View file

@ -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__ #ifndef __player_h__
#define __player_h__ #define __player_h__

23
source/exhumed/src/queen.cpp
View file

@ -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 "exhumed.h"
#include "aistuff.h" #include "aistuff.h"
@ -642,7 +659,7 @@ int BuildQueenHead(short nQueen)
nVelShift = 2; nVelShift = 2;
SetHeadVel(nSprite2); SetHeadVel(nSprite2);
sprite[nSprite2].zvel = -8192; sprite[nSprite2].zvel = -8192;
sprite[nSprite2].lotag = runlist_HeadRun() + 1; sprite[nSprite2].lotag = runlist_HeadRun() + 1;
sprite[nSprite2].hitag = 0; sprite[nSprite2].hitag = 0;
@ -723,7 +740,7 @@ void FuncQueenHead(int a, int nDamage, int nRun)
switch (nAction) switch (nAction)
{ {
case 0: case 0:
if (QueenHead.field_C > 0) if (QueenHead.field_C > 0)
{ {
QueenHead.field_C--; QueenHead.field_C--;
@ -918,7 +935,7 @@ __MOVEQS:
sprite[nSprite].xrepeat = 127 - QueenHead.field_E; sprite[nSprite].xrepeat = 127 - QueenHead.field_E;
sprite[nSprite].yrepeat = 127 - QueenHead.field_E; sprite[nSprite].yrepeat = 127 - QueenHead.field_E;
sprite[nSprite].cstat = 0x8000; sprite[nSprite].cstat = 0x8000;
// DEMO-TODO: in disassembly angle was used without masking and thus causing OOB issue. // DEMO-TODO: in disassembly angle was used without masking and thus causing OOB issue.

17
source/exhumed/src/queen.h
View file

@ -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__ #ifndef __queen_h__
#define __queen_h__ #define __queen_h__

19
source/exhumed/src/ra.cpp
View file

@ -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 "ra.h"
#include "runlist.h" #include "runlist.h"
@ -159,7 +176,7 @@ void FuncRa(int a, int nDamage, int nRun)
if (Ra[nPlayer].field_0) if (Ra[nPlayer].field_0)
{ {
seq_MoveSequence(nSprite, edx, Ra[nPlayer].field_2); seq_MoveSequence(nSprite, edx, Ra[nPlayer].field_2);
Ra[nPlayer].field_2++; Ra[nPlayer].field_2++;
if (Ra[nPlayer].field_2 >= SeqSize[edx]) if (Ra[nPlayer].field_2 >= SeqSize[edx])
{ {

17
source/exhumed/src/ra.h
View file

@ -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__ #ifndef __ra_h__
#define __ra_h__ #define __ra_h__

17
source/exhumed/src/random.cpp
View file

@ -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" #include "random.h"

17
source/exhumed/src/random.h
View file

@ -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__ #ifndef __random_h__
#define __random_h__ #define __random_h__

19
source/exhumed/src/rat.cpp
View file

@ -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 "engine.h"
#include "rat.h" #include "rat.h"
@ -204,7 +221,7 @@ void FuncRat(int a, int nDamage, int nRun)
{ {
int nSeq = SeqOffsets[kSeqRat] + ActionSeq[nAction].a; int nSeq = SeqOffsets[kSeqRat] + ActionSeq[nAction].a;
sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RatList[nRat].a); sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RatList[nRat].a);
seq_MoveSequence(nSprite, nSeq, RatList[nRat].a); seq_MoveSequence(nSprite, nSeq, RatList[nRat].a);
RatList[nRat].a++; RatList[nRat].a++;

17
source/exhumed/src/rat.h
View file

@ -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__ #ifndef __rat_h__
#define __rat_h__ #define __rat_h__

19
source/exhumed/src/record.cpp
View file

@ -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 "compat.h"
#include "record.h" #include "record.h"
@ -121,7 +138,7 @@ int ExecRecord(uint8_t *pRecord, int nSize)
PutRecord(pRecord[i]); PutRecord(pRecord[i]);
} }
} }
if (record_mode == 3) { if (record_mode == 3) {
return 0; return 0;
} }

17
source/exhumed/src/record.h
View file

@ -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__ #ifndef __record_h__
#define __record_h__ #define __record_h__

19
source/exhumed/src/rex.cpp
View file

@ -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 "rex.h"
#include "exhumed.h" #include "exhumed.h"
@ -408,7 +425,7 @@ void FuncRex(int a, int nDamage, int nRun)
break; break;
} }
} }
RexList[nRex].nAction = 1; RexList[nRex].nAction = 1;
break; break;
} }

17
source/exhumed/src/rex.h
View file

@ -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__ #ifndef __rex_h__
#define __rex_h__ #define __rex_h__

19
source/exhumed/src/roach.cpp
View file

@ -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 "exhumed.h"
#include "engine.h" #include "engine.h"
@ -336,7 +353,7 @@ void FuncRoach(int a, int nDamage, int nRun)
RoachList[nRoach].field_C = 100; RoachList[nRoach].field_C = 100;
RoachList[nRoach].nTarget = -1; RoachList[nRoach].nTarget = -1;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
} }
return; return;

17
source/exhumed/src/roach.h
View file

@ -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__ #ifndef __roach_h__
#define __roach_h__ #define __roach_h__

31
source/exhumed/src/runlist.cpp
View file

@ -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 "exhumed.h"
#include "engine.h" #include "engine.h"
@ -59,7 +76,7 @@ RunStruct RunData[kMaxRuns];
short word_96760 = 0; short word_96760 = 0;
/* variables /* variables
Name: _sRunStack Name: _sRunStack
Name: _RunFree Name: _RunFree
Name: _channel Name: _channel
@ -285,7 +302,7 @@ void runlist_SendMessageToRunRec(int nRun, int edx, int nDamage)
} }
assert(nFunc < kFuncMax); // REMOVE assert(nFunc < kFuncMax); // REMOVE
// do function pointer call here. // do function pointer call here.
aiFunctions[nFunc](edx, nDamage, nRun); aiFunctions[nFunc](edx, nDamage, nRun);
} }
@ -601,7 +618,7 @@ void runlist_ProcessSectorTag(int nSector, int lotag, int hitag)
{ {
case 0: // Ceiling Doom door case 0: // Ceiling Doom door
{ {
/* /*
This function searches z-coordinates of neighboring sectors to find the This function searches z-coordinates of neighboring sectors to find the
closest (next) ceiling starting at the given z-coordinate (thez). 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 case 11: // Switch activated lift up
{ {
/* /*
fix for original behaviour - nextSector could be -1 the and game would do an invalid memory read 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 when getting the floorz for nextSector. Here, we assume 0 and only set the correct value if nextSector
is valid. is valid.
@ -1450,7 +1467,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag)
int var_24; int var_24;
int var_38 = 0; // TODO - FIXME CHECKME. This doesn't seem to be initialised in the ASM? 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 ebp = 0; // TODO - FIXME CHECKME. This doesn't seem to be initialised in the ASM?
int var_30; int var_30;
@ -1533,7 +1550,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag)
if (nStart == nWall) { if (nStart == nWall) {
break; break;
} }
var_28 = var_18; var_28 = var_18;
var_18 = nWall; var_18 = nWall;
} }
@ -1603,7 +1620,7 @@ void runlist_ProcessWallTag(int nWall, short lotag, short hitag)
case 19: case 19:
{ {
short nStart = nWall; short nStart = nWall;
while (1) while (1)
{ {
nWall = wall[nWall].point2; nWall = wall[nWall].point2;

17
source/exhumed/src/runlist.h
View file

@ -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__ #ifndef __runlist_h__
#define __runlist_h__ #define __runlist_h__

17
source/exhumed/src/save.cpp
View file

@ -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 "save.h"
#include <stdio.h> #include <stdio.h>

17
source/exhumed/src/save.h
View file

@ -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__ #ifndef __save_h__
#define __save_h__ #define __save_h__

27
source/exhumed/src/scorp.cpp
View file

@ -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 "engine.h"
#include "scorp.h" #include "scorp.h"
@ -21,7 +38,7 @@ short ScorpCount = -1;
Scorpion scorpion[kMaxScorpions]; Scorpion scorpion[kMaxScorpions];
short ScorpChan[kMaxScorpions]; short ScorpChan[kMaxScorpions];
static actionSeq ActionSeq[] = { static actionSeq ActionSeq[] = {
{0, 0}, {0, 0},
{8, 0}, {8, 0},
{29, 0}, {29, 0},
@ -174,7 +191,7 @@ void FuncScorp(int a, int nDamage, int nRun)
if (nTarget >= 0) 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; scorpion[nScorp].nTarget = nTarget;
} }
@ -190,7 +207,7 @@ void FuncScorp(int a, int nDamage, int nRun)
if (RandomSize(2)) { if (RandomSize(2)) {
return; return;
} }
D3PlayFX(StaticSound[kSound41], nSprite); D3PlayFX(StaticSound[kSound41], nSprite);
goto FS_Pink_A; 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); sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, scorpion[nScorp].nFrame);
seq_MoveSequence(nSprite, nSeq, scorpion[nScorp].nFrame); seq_MoveSequence(nSprite, nSeq, scorpion[nScorp].nFrame);
scorpion[nScorp].nFrame++; scorpion[nScorp].nFrame++;
if (scorpion[nScorp].nFrame >= SeqSize[nSeq]) if (scorpion[nScorp].nFrame >= SeqSize[nSeq])
@ -456,7 +473,7 @@ FS_Pink_B:
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y);
scorpion[nScorp].h = RandomSize(2) + RandomSize(3); scorpion[nScorp].h = RandomSize(2) + RandomSize(3);
if (!scorpion[nScorp].h) { if (!scorpion[nScorp].h) {

19
source/exhumed/src/scorp.h
View file

@ -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__ #ifndef __scorp_h__
#define __scorp_h__ #define __scorp_h__
#include "compat.h" #include "compat.h"
/* /*
Selkis Boss AI code Selkis Boss AI code
*/ */

27
source/exhumed/src/sequence.cpp
View file

@ -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 "typedefs.h"
#include "sequence.h" #include "sequence.h"
@ -148,7 +165,7 @@ int seq_ReadSequence(const char *seqName)
strcat(buffer, ".seq"); strcat(buffer, ".seq");
int hFile = kopen4load(buffer, 1); int hFile = kopen4load(buffer, 1);
if (hFile == -1) if (hFile == -1)
{ {
initprintf("Unable to open '%s'!\n", buffer); initprintf("Unable to open '%s'!\n", buffer);
kclose(hFile); kclose(hFile);
@ -165,14 +182,14 @@ int seq_ReadSequence(const char *seqName)
} }
short centerx, centery; // TODO - are global vars? short centerx, centery; // TODO - are global vars?
short nSeqs; short nSeqs;
kread(hFile, &centerx, sizeof(centerx)); kread(hFile, &centerx, sizeof(centerx));
kread(hFile, &centery, sizeof(centery)); kread(hFile, &centery, sizeof(centery));
kread(hFile, &nSeqs, sizeof(nSeqs)); kread(hFile, &nSeqs, sizeof(nSeqs));
if (nSeqs <= 0 || sequences + nSeqs >= kMaxSequences) if (nSeqs <= 0 || sequences + nSeqs >= kMaxSequences)
{ {
if (nSeqs < 0) if (nSeqs < 0)
{ {
initprintf("Invalid sequence count!\n"); initprintf("Invalid sequence count!\n");
kclose(hFile); kclose(hFile);
@ -257,7 +274,7 @@ int seq_ReadSequence(const char *seqName)
{ {
short var_20; short var_20;
kread(hFile, &var_20, sizeof(var_20)); kread(hFile, &var_20, sizeof(var_20));
for (i = 0; i < var_20; i++) for (i = 0; i < var_20; i++)
{ {
kread(hFile, &buffer[i * 10], 8); kread(hFile, &buffer[i * 10], 8);
@ -319,7 +336,7 @@ void seq_LoadSequences()
nFontFirstChar = seq_GetFirstSeqPicnum(kSeqFont2); nFontFirstChar = seq_GetFirstSeqPicnum(kSeqFont2);
short nSize = SeqSize[SeqOffsets[kSeqFont2]]; short nSize = SeqSize[SeqOffsets[kSeqFont2]];
for (i = 0; i < nSize; i++) for (i = 0; i < nSize; i++)
{ {
picanm[nFontFirstChar + i].xofs = 0; picanm[nFontFirstChar + i].xofs = 0;

17
source/exhumed/src/sequence.h
View file

@ -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__ #ifndef __sequence_h__
#define __sequence_h__ #define __sequence_h__

17
source/exhumed/src/serial.cpp
View file

@ -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 "typedefs.h"
#include "serial.h" #include "serial.h"

17
source/exhumed/src/serial.h
View file

@ -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__ #ifndef __serial_h__
#define __serial_h__ #define __serial_h__

21
source/exhumed/src/set.cpp
View file

@ -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 "set.h"
#include "engine.h" #include "engine.h"
@ -177,7 +194,7 @@ void FuncSoul(int pA, int, int nRun)
sprite[nSoulSprite].extra &= 0x7FF; sprite[nSoulSprite].extra &= 0x7FF;
int ebx = (Sin(sprite[nSoulSprite].extra + 512) >> 7);// *Sin(sprite[nSoulSprite].ang); 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) 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; int nSet = sprite[nSoulSprite].hitag;
@ -394,7 +411,7 @@ void FuncSet(int a, int nDamage, int nRun)
if ((nSet & 0x1F) == (totalmoves & 0x1F)) if ((nSet & 0x1F) == (totalmoves & 0x1F))
{ {
int nRand = RandomSize(3); int nRand = RandomSize(3);
switch (nRand) switch (nRand)
{ {
case 0: case 0:

17
source/exhumed/src/set.h
View file

@ -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__ #ifndef __set_h__
#define __set_h__ #define __set_h__

21
source/exhumed/src/snake.cpp
View file

@ -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 "engine.h"
#include "exhumed.h" #include "exhumed.h"
@ -332,7 +349,7 @@ SEARCH_ENEMY:
{ {
short nPlayer = nSnakePlayer[nSnake]; short nPlayer = nSnakePlayer[nSnake];
ExplodeSnakeSprite(SnakeList[nSnake].nSprites[0], nPlayer); ExplodeSnakeSprite(SnakeList[nSnake].nSprites[0], nPlayer);
nPlayerSnake[nPlayer] = -1; nPlayerSnake[nPlayer] = -1;
nSnakePlayer[nSnake] = -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), 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); -zVal*(i-1), 0, 0, CLIPMASK1);
var_20 = (var_20 + 128) & kAngleMask; var_20 = (var_20 + 128) & kAngleMask;
} }
} }

17
source/exhumed/src/snake.h
View file

@ -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__ #ifndef __snake_h__
#define __snake_h__ #define __snake_h__

20
source/exhumed/src/sound.cpp
View file

@ -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 "compat.h"
#include "baselayer.h" #include "baselayer.h"
#include "renderlayer.h" // for win_gethwnd() #include "renderlayer.h" // for win_gethwnd()
@ -784,7 +802,7 @@ void UpdateSounds()
nVolume = 0; nVolume = 0;
if (nVolume > 255) if (nVolume > 255)
nVolume = 255; nVolume = 255;
int nPitch = pASound->f_16; int nPitch = pASound->f_16;
short nSoundSect; short nSoundSect;
if (nSoundSprite >= 0) if (nSoundSprite >= 0)

17
source/exhumed/src/sound.h
View file

@ -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__ #ifndef __sound_h__
#define __sound_h__ #define __sound_h__

23
source/exhumed/src/spider.cpp
View file

@ -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 "exhumed.h"
#include "spider.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); sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nSpider | 0xC0000);
SpiderList[nSpider].h = runlist_AddRunRec(NewRun, nSpider | 0xC0000); SpiderList[nSpider].h = runlist_AddRunRec(NewRun, nSpider | 0xC0000);
nCreaturesLeft++; nCreaturesLeft++;
return nSpider | 0xC0000; return nSpider | 0xC0000;
} }
@ -361,7 +378,7 @@ case_3:
seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqSpider] + ActionSeq[nAction].a, SpiderList[nSpider].b, ActionSeq[nAction].b); seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqSpider] + ActionSeq[nAction].a, SpiderList[nSpider].b, ActionSeq[nAction].b);
break; break;
} }
case 0xA0000: case 0xA0000:
{ {
if (SpiderList[nSpider].nHealth <= 0) if (SpiderList[nSpider].nHealth <= 0)

17
source/exhumed/src/spider.h
View file

@ -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__ #ifndef __spider_h__
#define __spider_h__ #define __spider_h__

21
source/exhumed/src/status.cpp
View file

@ -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 "engine.h"
#include "player.h" #include "player.h"
@ -278,7 +295,7 @@ void SetMagicFrame()
if (nMagicLevel < 0) { if (nMagicLevel < 0) {
nMagicLevel = 0; nMagicLevel = 0;
} }
SetItemSeq(); SetItemSeq();
} }
@ -544,7 +561,7 @@ void MoveStatus()
return; return;
} }
} }
if (!(nDigit[0] % 3)) { if (!(nDigit[0] % 3)) {
nCounter = nDigit[0] / 3 + 100 * (nDigit[2] / 3) + 10 * (nDigit[1] / 3); nCounter = nDigit[0] / 3 + 100 * (nDigit[2] / 3) + 10 * (nDigit[1] / 3);
} }

17
source/exhumed/src/status.h
View file

@ -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__ #ifndef __status_h__
#define __status_h__ #define __status_h__

Some files were not shown because too many files have changed in this diff Show more