mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Update the headers of all source files, add CON_SHOWVIEW based on a patch from CONAN, other minor fixes
git-svn-id: https://svn.eduke32.com/eduke32@484 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
ee4573779c
commit
fd4dfeb6a5
34 changed files with 1582 additions and 1515 deletions
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -19,7 +21,6 @@ along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
#include "duke3d.h"
|
#include "duke3d.h"
|
||||||
|
|
||||||
extern char numenvsnds,actor_tog;
|
extern char numenvsnds,actor_tog;
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
Copyright (C) 2005 - Richard Gobeille (Mapster32 functionality)
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Mapster32
|
This file is part of EDuke32
|
||||||
|
|
||||||
Mapster32 is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License version 2
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation.
|
as published by the Free Software Foundation.
|
||||||
|
|
||||||
|
@ -18,10 +18,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 05/24/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -215,7 +212,7 @@ extern void LoadActor(long sActor);
|
||||||
|
|
||||||
extern long GetGameVar(const char *szGameLabel, long lDefault, int iActor, int iPlayer);
|
extern long GetGameVar(const char *szGameLabel, long lDefault, int iActor, int iPlayer);
|
||||||
extern void DumpGameVars(FILE *fp);
|
extern void DumpGameVars(FILE *fp);
|
||||||
extern void AddLog(const char *psz);
|
// extern void AddLog(const char *psz, ...);
|
||||||
|
|
||||||
extern void ResetSystemDefaults(void);
|
extern void ResetSystemDefaults(void);
|
||||||
extern void InitGameVarPointers(void);
|
extern void InitGameVarPointers(void);
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -6552,57 +6554,60 @@ void animatesprites(long x,long y,short a,long smoothratio)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((display_mirror == 1 || screenpeek != p || s->owner == -1) && ud.multimode > 1 && ud.showweapons && sprite[ps[p].i].extra > 0 && ps[p].curr_weapon > 0)
|
if ((display_mirror == 1 || screenpeek != p || s->owner == -1) && ud.multimode > 1)
|
||||||
{
|
{
|
||||||
memcpy((spritetype *)&tsprite[spritesortcnt],(spritetype *)t,sizeof(spritetype));
|
if (ud.showweapons && sprite[ps[p].i].extra > 0 && ps[p].curr_weapon > 0)
|
||||||
|
|
||||||
tsprite[spritesortcnt].statnum = 99;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].yrepeat = (t->yrepeat>>3);
|
|
||||||
if (t->yrepeat < 4) t->yrepeat = 4;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].shade = t->shade;
|
|
||||||
tsprite[spritesortcnt].cstat = 0;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].picnum = (ps[p].curr_weapon==GROW_WEAPON?GROWSPRITEICON:weapon_sprites[ps[p].curr_weapon]);
|
|
||||||
|
|
||||||
if (s->owner >= 0)
|
|
||||||
tsprite[spritesortcnt].z = ps[p].posz-(12<<8);
|
|
||||||
else tsprite[spritesortcnt].z = s->z-(51<<8);
|
|
||||||
if (tsprite[spritesortcnt].picnum == HEAVYHBOMB)
|
|
||||||
{
|
{
|
||||||
tsprite[spritesortcnt].xrepeat = 10;
|
memcpy((spritetype *)&tsprite[spritesortcnt],(spritetype *)t,sizeof(spritetype));
|
||||||
tsprite[spritesortcnt].yrepeat = 10;
|
|
||||||
|
tsprite[spritesortcnt].statnum = 99;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].yrepeat = (t->yrepeat>>3);
|
||||||
|
if (t->yrepeat < 4) t->yrepeat = 4;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].shade = t->shade;
|
||||||
|
tsprite[spritesortcnt].cstat = 0;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].picnum = (ps[p].curr_weapon==GROW_WEAPON?GROWSPRITEICON:weapon_sprites[ps[p].curr_weapon]);
|
||||||
|
|
||||||
|
if (s->owner >= 0)
|
||||||
|
tsprite[spritesortcnt].z = ps[p].posz-(12<<8);
|
||||||
|
else tsprite[spritesortcnt].z = s->z-(51<<8);
|
||||||
|
if (tsprite[spritesortcnt].picnum == HEAVYHBOMB)
|
||||||
|
{
|
||||||
|
tsprite[spritesortcnt].xrepeat = 10;
|
||||||
|
tsprite[spritesortcnt].yrepeat = 10;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tsprite[spritesortcnt].xrepeat = 16;
|
||||||
|
tsprite[spritesortcnt].yrepeat = 16;
|
||||||
|
}
|
||||||
|
tsprite[spritesortcnt].pal = 0;
|
||||||
|
spritesortcnt++;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
if (sync[p].extbits & (1<<7) && !ud.pause_on)
|
||||||
{
|
{
|
||||||
tsprite[spritesortcnt].xrepeat = 16;
|
memcpy((spritetype *)&tsprite[spritesortcnt],(spritetype *)t,sizeof(spritetype));
|
||||||
tsprite[spritesortcnt].yrepeat = 16;
|
|
||||||
|
tsprite[spritesortcnt].statnum = 99;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].yrepeat = (t->yrepeat>>3);
|
||||||
|
if (t->yrepeat < 4) t->yrepeat = 4;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].cstat = 0;
|
||||||
|
|
||||||
|
tsprite[spritesortcnt].picnum = RESPAWNMARKERGREEN;
|
||||||
|
|
||||||
|
if (s->owner >= 0)
|
||||||
|
tsprite[spritesortcnt].z = ps[p].posz-(20<<8);
|
||||||
|
else tsprite[spritesortcnt].z = s->z-(96<<8);
|
||||||
|
tsprite[spritesortcnt].xrepeat = 32;
|
||||||
|
tsprite[spritesortcnt].yrepeat = 32;
|
||||||
|
tsprite[spritesortcnt].pal = 20;
|
||||||
|
spritesortcnt++;
|
||||||
}
|
}
|
||||||
tsprite[spritesortcnt].pal = 0;
|
|
||||||
spritesortcnt++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((display_mirror == 1 || screenpeek != p || s->owner == -1) && ud.multimode > 1 && sync[p].extbits & (1<<7) && !ud.pause_on)
|
|
||||||
{
|
|
||||||
memcpy((spritetype *)&tsprite[spritesortcnt],(spritetype *)t,sizeof(spritetype));
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].statnum = 99;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].yrepeat = (t->yrepeat>>3);
|
|
||||||
if (t->yrepeat < 4) t->yrepeat = 4;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].cstat = 0;
|
|
||||||
|
|
||||||
tsprite[spritesortcnt].picnum = RESPAWNMARKERGREEN;
|
|
||||||
|
|
||||||
if (s->owner >= 0)
|
|
||||||
tsprite[spritesortcnt].z = ps[p].posz-(20<<8);
|
|
||||||
else tsprite[spritesortcnt].z = s->z-(96<<8);
|
|
||||||
tsprite[spritesortcnt].xrepeat = 32;
|
|
||||||
tsprite[spritesortcnt].yrepeat = 32;
|
|
||||||
tsprite[spritesortcnt].pal = 20;
|
|
||||||
spritesortcnt++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->owner == -1)
|
if (s->owner == -1)
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -776,5 +778,6 @@ enum keywords {
|
||||||
CON_QSTRLEN, // 299
|
CON_QSTRLEN, // 299
|
||||||
CON_GETINCANGLE, // 300
|
CON_GETINCANGLE, // 300
|
||||||
CON_QUAKE, // 301
|
CON_QUAKE, // 301
|
||||||
|
CON_SHOWVIEW, // 302
|
||||||
END
|
END
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -23,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include "duke3d.h"
|
#include "duke3d.h"
|
||||||
#include "gamedef.h"
|
#include "gamedef.h"
|
||||||
|
|
||||||
|
extern int g_i,g_p;
|
||||||
|
|
||||||
static void FreeGameVars(void)
|
static void FreeGameVars(void)
|
||||||
{
|
{
|
||||||
// call this function as many times as needed.
|
// call this function as many times as needed.
|
||||||
|
@ -139,7 +143,7 @@ int ReadGameVars(long fil)
|
||||||
if (kdfread(&l,sizeof(l),1,fil) != 1) goto corrupt;
|
if (kdfread(&l,sizeof(l),1,fil) != 1) goto corrupt;
|
||||||
if (kdfread(g_szBuf,l,1,fil) != 1) goto corrupt;
|
if (kdfread(g_szBuf,l,1,fil) != 1) goto corrupt;
|
||||||
g_szBuf[l]=0;
|
g_szBuf[l]=0;
|
||||||
AddLog(g_szBuf);
|
OSD_Printf("%s\n",g_szBuf);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
{
|
{
|
||||||
|
@ -413,25 +417,25 @@ static int GetGameID(const char *szGameLabel)
|
||||||
long GetGameVarID(int id, int iActor, int iPlayer)
|
long GetGameVarID(int id, int iActor, int iPlayer)
|
||||||
{
|
{
|
||||||
int inv=0;
|
int inv=0;
|
||||||
|
|
||||||
if (id == g_iThisActorID)
|
if (id == g_iThisActorID)
|
||||||
return iActor;
|
return iActor;
|
||||||
|
|
||||||
if (id<0 || id >= iGameVarCount)
|
if (id<0 || id >= iGameVarCount)
|
||||||
{
|
{
|
||||||
if (id==MAXGAMEVARS)
|
if (id==MAXGAMEVARS)
|
||||||
return(*insptr++);
|
return(*insptr++);
|
||||||
|
|
||||||
if (!(id&(MAXGAMEVARS<<1)))
|
if (!(id&(MAXGAMEVARS<<1)))
|
||||||
{
|
{
|
||||||
AddLog("GetGameVarID: Invalid Game ID");
|
OSD_Printf("GetGameVarID(): invalid gamevar ID (%d)\n",id);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
inv=1;
|
inv=1;
|
||||||
id ^= (MAXGAMEVARS<<1);
|
id ^= (MAXGAMEVARS<<1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
|
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
|
||||||
{
|
{
|
||||||
// for the current player
|
// for the current player
|
||||||
|
@ -439,34 +443,34 @@ long GetGameVarID(int id, int iActor, int iPlayer)
|
||||||
{
|
{
|
||||||
//Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %ld\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]);
|
//Bsprintf(g_szBuf,"GetGameVarID(%d, %d, %d) returns %ld\n",id,iActor,iPlayer, aGameVars[id].plValues[iPlayer]);
|
||||||
//AddLog(g_szBuf);
|
//AddLog(g_szBuf);
|
||||||
if (inv) return (-aGameVars[id].plValues[iPlayer]);
|
if (inv) return(-aGameVars[id].plValues[iPlayer]);
|
||||||
return (aGameVars[id].plValues[iPlayer]);
|
return (aGameVars[id].plValues[iPlayer]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inv) return (-aGameVars[id].lValue);
|
if (inv) return(-aGameVars[id].lValue);
|
||||||
return (aGameVars[id].lValue);
|
return (aGameVars[id].lValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
|
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR)
|
||||||
{
|
{
|
||||||
// for the current actor
|
// for the current actor
|
||||||
if (iActor >= 0 && iActor <=MAXSPRITES)
|
if (iActor >= 0 && iActor <=MAXSPRITES)
|
||||||
{
|
{
|
||||||
if (inv) return (-aGameVars[id].plValues[iActor]);
|
if (inv) return(-aGameVars[id].plValues[iActor]);
|
||||||
return (aGameVars[id].plValues[iActor]);
|
return (aGameVars[id].plValues[iActor]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inv) return (-aGameVars[id].lValue);
|
if (inv) return(-aGameVars[id].lValue);
|
||||||
return (aGameVars[id].lValue);
|
return (aGameVars[id].lValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PLONG)
|
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PLONG)
|
||||||
{
|
{
|
||||||
if (inv) return (-(*((long*)aGameVars[id].lValue)));
|
if (inv) return(-(*((long*)aGameVars[id].lValue)));
|
||||||
return(*((long*)aGameVars[id].lValue));
|
return(*((long*)aGameVars[id].lValue));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inv) return (-aGameVars[id].lValue);
|
if (inv) return(-aGameVars[id].lValue);
|
||||||
return (aGameVars[id].lValue);
|
return (aGameVars[id].lValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -474,25 +478,35 @@ void SetGameVarID(int id, long lValue, int iActor, int iPlayer)
|
||||||
{
|
{
|
||||||
if (id<0 || id >= iGameVarCount)
|
if (id<0 || id >= iGameVarCount)
|
||||||
{
|
{
|
||||||
AddLog("Invalid Game ID");
|
OSD_Printf("SetGameVarID(): tried to set invalid gamevar ID (%d) from sprite %d (%d), player %d\n",id,g_i,sprite[g_i].picnum,g_p);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//Bsprintf(g_szBuf,"SGVI: %d ('%s') to %ld for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
|
//Bsprintf(g_szBuf,"SGVI: %d ('%s') to %ld for %d %d",id,aGameVars[id].szLabel,lValue,iActor,iPlayer);
|
||||||
//AddLog(g_szBuf);
|
//AddLog(g_szBuf);
|
||||||
if ((aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER) && (iPlayer != -1))
|
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PERPLAYER)
|
||||||
{
|
{
|
||||||
|
if (iPlayer < 0 || iPlayer > MAXPLAYERS-1)
|
||||||
|
{
|
||||||
|
OSD_Printf("SetGameVarID(): invalid player (%d) for per-player gamevar %s from sprite %d (%d), player %d\n",iPlayer,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
|
||||||
|
return;
|
||||||
|
}
|
||||||
// for the current player
|
// for the current player
|
||||||
aGameVars[id].plValues[iPlayer]=lValue;
|
aGameVars[id].plValues[iPlayer]=lValue;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR) && (iActor != -1))
|
if ((aGameVars[id].dwFlags & GAMEVAR_FLAG_PERACTOR))
|
||||||
{
|
{
|
||||||
|
if (iActor < 0 || iActor > MAXSPRITES-1)
|
||||||
|
{
|
||||||
|
OSD_Printf("SetGameVarID(): invalid sprite (%d) for per-actor gamevar %s from sprite %d (%d), player %d\n",iActor,aGameVars[id].szLabel,g_i,sprite[g_i].picnum,g_p);
|
||||||
|
return;
|
||||||
|
}
|
||||||
// for the current actor
|
// for the current actor
|
||||||
aGameVars[id].plValues[iActor]=lValue;
|
aGameVars[id].plValues[iActor]=lValue;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PLONG)
|
if (aGameVars[id].dwFlags & GAMEVAR_FLAG_PLONG)
|
||||||
{
|
{
|
||||||
// set the value at pointer
|
// set the value at pointer
|
||||||
|
@ -532,7 +546,7 @@ static long *GetGameValuePtr(const char *szGameLabel)
|
||||||
{
|
{
|
||||||
if (!aGameVars[i].plValues)
|
if (!aGameVars[i].plValues)
|
||||||
{
|
{
|
||||||
AddLog("INTERNAL ERROR: NULL array !!!");
|
OSD_Printf("GetGameValuePtr(): INTERNAL ERROR: NULL array !!!\n");
|
||||||
}
|
}
|
||||||
return aGameVars[i].plValues;
|
return aGameVars[i].plValues;
|
||||||
}
|
}
|
||||||
|
@ -609,7 +623,7 @@ void ResetSystemDefaults(void)
|
||||||
// for(i=0;i<MAXTILES;i++)
|
// for(i=0;i<MAXTILES;i++)
|
||||||
// projectile[i] = defaultprojectile[i];
|
// projectile[i] = defaultprojectile[i];
|
||||||
|
|
||||||
Bmemcpy(&projectile,&defaultprojectile,sizeof(defaultprojectile));
|
Bmemcpy(&projectile,&defaultprojectile,sizeof(projectile));
|
||||||
|
|
||||||
//AddLog("EOF:ResetWeaponDefaults");
|
//AddLog("EOF:ResetWeaponDefaults");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -19,7 +21,6 @@ along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
#include "duke3d.h"
|
#include "duke3d.h"
|
||||||
|
|
||||||
char MusicPtr[72000*2];
|
char MusicPtr[72000*2];
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - Richard Gobeille
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Mapster32
|
This file is part of EDuke32
|
||||||
|
|
||||||
Mapster32 is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License version 2
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation.
|
as published by the Free Software Foundation.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
See the GNU General Public License for more details.
|
See the GNU General Public License for more details.
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -90,9 +92,9 @@ void savetemp(char *fn,long daptr,long dasiz)
|
||||||
#define WHEELUP (buttonstat&16)
|
#define WHEELUP (buttonstat&16)
|
||||||
#define WHEELDOWN (buttonstat&32)
|
#define WHEELDOWN (buttonstat&32)
|
||||||
|
|
||||||
ControlInfo minfo;
|
static ControlInfo minfo;
|
||||||
|
|
||||||
short mi, mii;
|
static short mi, mii;
|
||||||
|
|
||||||
static int probe_(int type,int x,int y,int i,int n)
|
static int probe_(int type,int x,int y,int i,int n)
|
||||||
{
|
{
|
||||||
|
@ -102,7 +104,7 @@ static int probe_(int type,int x,int y,int i,int n)
|
||||||
|
|
||||||
{
|
{
|
||||||
CONTROL_GetInput(&minfo);
|
CONTROL_GetInput(&minfo);
|
||||||
mi += minfo.dz;
|
mi += (minfo.dpitch+minfo.dz);
|
||||||
mii += minfo.dyaw;
|
mii += minfo.dyaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,7 +125,6 @@ static int probe_(int type,int x,int y,int i,int n)
|
||||||
|
|
||||||
probey--;
|
probey--;
|
||||||
if (probey < 0) probey = n-1;
|
if (probey < 0) probey = n-1;
|
||||||
minfo.dz = 0;
|
|
||||||
}
|
}
|
||||||
if (KB_KeyPressed(sc_DownArrow) || KB_KeyPressed(sc_PgDn) || KB_KeyPressed(sc_kpad_2) || mi > 8192 || WHEELDOWN)
|
if (KB_KeyPressed(sc_DownArrow) || KB_KeyPressed(sc_PgDn) || KB_KeyPressed(sc_kpad_2) || mi > 8192 || WHEELDOWN)
|
||||||
{
|
{
|
||||||
|
@ -134,7 +135,6 @@ static int probe_(int type,int x,int y,int i,int n)
|
||||||
MOUSE_ClearButton(WHEELDOWN_MOUSE);
|
MOUSE_ClearButton(WHEELDOWN_MOUSE);
|
||||||
sound(KICK_HIT);
|
sound(KICK_HIT);
|
||||||
probey++;
|
probey++;
|
||||||
minfo.dz = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,16 +29,17 @@ BEGIN
|
||||||
#ifdef JFAUD
|
#ifdef JFAUD
|
||||||
CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
|
CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
|
||||||
CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
|
CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
|
||||||
#else
|
|
||||||
CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 28, 50, 8
|
|
||||||
CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
|
|
||||||
#endif
|
|
||||||
CONTROL "&MIDI device:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 44, 50, 8
|
CONTROL "&MIDI device:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 44, 50, 8
|
||||||
CONTROL "", IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
|
CONTROL "", IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
|
||||||
|
|
||||||
CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 80, 50, 8
|
CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 80, 50, 8
|
||||||
CONTROL "Mo&use", IDCINPUTMOUSE, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 80, 49, 8
|
CONTROL "Mo&use", IDCINPUTMOUSE, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 80, 49, 8
|
||||||
CONTROL "&Joystick", IDCINPUTJOY, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 110, 80, 49, 8
|
CONTROL "&Joystick", IDCINPUTJOY, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 110, 80, 49, 8
|
||||||
|
#else
|
||||||
|
CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
|
||||||
|
CONTROL "Mo&use", IDCINPUTMOUSE, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 28, 49, 8
|
||||||
|
CONTROL "&Joystick", IDCINPUTJOY, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 110, 28, 49, 8
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
|
CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
|
||||||
END
|
END
|
||||||
|
|
|
@ -1,28 +1,26 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
Copyright (C) 2004, 2005 - Richard Gobeille (EDuke32 functionality)
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
This file is part of EDuke32
|
|
||||||
|
This file is part of EDuke32
|
||||||
EDuke32 is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU General Public License version 2
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
as published by the Free Software Foundation.
|
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
|
This program is distributed in the hope that it will be useful,
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
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.
|
|
||||||
|
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
|
You should have received a copy of the GNU General Public License
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
Original Source: 1996 - Todd Replogle
|
*/
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
//-------------------------------------------------------------------------
|
||||||
*/
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#define SECTOREFFECTOR 1
|
#define SECTOREFFECTOR 1
|
||||||
#define ACTIVATOR 2
|
#define ACTIVATOR 2
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -17,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
EDuke32 is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
|
@ -664,7 +668,7 @@ cvar[] =
|
||||||
{ "snd_numvoices", "snd_numvoices: the number of concurrent sounds", (void*)&NumVoices, CVAR_INT, 0, 0, 32 },
|
{ "snd_numvoices", "snd_numvoices: the number of concurrent sounds", (void*)&NumVoices, CVAR_INT, 0, 0, 32 },
|
||||||
{ "snd_reversestereo", "snd_reversestereo: reverses the stereo channels", (void*)&ReverseStereo, CVAR_BOOL, 0, 0, 16 },
|
{ "snd_reversestereo", "snd_reversestereo: reverses the stereo channels", (void*)&ReverseStereo, CVAR_BOOL, 0, 0, 16 },
|
||||||
};
|
};
|
||||||
|
|
||||||
static int osdcmd_cvar_set(const osdfuncparm_t *parm)
|
static int osdcmd_cvar_set(const osdfuncparm_t *parm)
|
||||||
{
|
{
|
||||||
int showval = (parm->numparms == 0);
|
int showval = (parm->numparms == 0);
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
@ -2659,7 +2661,8 @@ void getinput(int snum)
|
||||||
|
|
||||||
if ((p->gm&MODE_MENU) || (p->gm&MODE_TYPE) || (ud.pause_on && !KB_KeyPressed(sc_Pause)) || (numplayers > 1 && totalclock < 10)) // HACK: kill getinput() for the first 10 tics of a new map in multi
|
if ((p->gm&MODE_MENU) || (p->gm&MODE_TYPE) || (ud.pause_on && !KB_KeyPressed(sc_Pause)) || (numplayers > 1 && totalclock < 10)) // HACK: kill getinput() for the first 10 tics of a new map in multi
|
||||||
{
|
{
|
||||||
CONTROL_GetInput(&info);
|
if (!(p->gm&MODE_MENU))
|
||||||
|
CONTROL_GetInput(&info);
|
||||||
memset(&lastinfo, 0, sizeof(lastinfo));
|
memset(&lastinfo, 0, sizeof(lastinfo));
|
||||||
loc.fvel = vel = 0;
|
loc.fvel = vel = 0;
|
||||||
loc.svel = svel = 0;
|
loc.svel = svel = 0;
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
This file is part of EDuke32
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License version 2
|
||||||
as published by the Free Software Foundation; either version 2
|
as published by the Free Software Foundation.
|
||||||
of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -18,10 +19,6 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
Original Source: 1996 - Todd Replogle
|
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,26 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
This file is part of EDuke32
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
EDuke32 is free software; you can redistribute it and/or
|
This file is part of EDuke32
|
||||||
modify it under the terms of the GNU General Public License version 2
|
|
||||||
as published by the Free Software Foundation.
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License version 2
|
||||||
This program is distributed in the hope that it will be useful,
|
as published by the Free Software Foundation.
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
See the GNU General Public License for more details.
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
See the GNU General Public License for more details.
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
#define KICK_HIT 0
|
#define KICK_HIT 0
|
||||||
#define PISTOL_RICOCHET 1
|
#define PISTOL_RICOCHET 1
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2005 - EDuke32 team
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
This file is part of EDuke32
|
This file is part of EDuke32
|
||||||
|
|
||||||
|
|
|
@ -1,29 +1,26 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
Copyright (C) 1996, 2003 - 3D Realms Entertainment
|
||||||
|
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
|
||||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
Copyright (C) 2004, 2007 - EDuke32 developers
|
||||||
|
|
||||||
Duke Nukem 3D is free software; you can redistribute it and/or
|
This file is part of EDuke32
|
||||||
modify it under the terms of the GNU General Public License
|
|
||||||
as published by the Free Software Foundation; either version 2
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
of the License, or (at your option) any later version.
|
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
|
This program is distributed in the hope that it will be useful,
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
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.
|
|
||||||
|
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
|
You should have received a copy of the GNU General Public License
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
Original Source: 1996 - Todd Replogle
|
*/
|
||||||
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
//-------------------------------------------------------------------------
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
|
|
||||||
*/
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
|
|
||||||
//****************************************************************************
|
//****************************************************************************
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue