2006-04-13 20:47:06 +00:00
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
/*
|
2016-02-02 00:21:24 +00:00
|
|
|
Copyright (C) 2016 EDuke32 developers and contributors
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2010-05-25 10:56:00 +00:00
|
|
|
This file is part of EDuke32.
|
2006-04-13 20:47:06 +00:00
|
|
|
|
|
|
|
EDuke32 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
|
2014-07-20 08:55:56 +00:00
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2006-04-13 20:47:06 +00:00
|
|
|
*/
|
|
|
|
//-------------------------------------------------------------------------
|
2016-02-02 00:21:24 +00:00
|
|
|
|
2017-02-25 08:15:36 +00:00
|
|
|
#include "compat.h"
|
2016-02-07 02:38:03 +00:00
|
|
|
#include "duke3d.h"
|
2006-04-13 20:47:06 +00:00
|
|
|
|
|
|
|
#include "scriplib.h"
|
2010-08-02 08:13:51 +00:00
|
|
|
#include "savegame.h"
|
2008-08-11 10:38:46 +00:00
|
|
|
#include "osdcmds.h"
|
2010-08-02 08:13:51 +00:00
|
|
|
#include "menus.h"
|
2014-06-13 09:04:05 +00:00
|
|
|
#include "input.h"
|
2015-02-11 05:22:07 +00:00
|
|
|
#include "anim.h"
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2012-06-03 15:45:59 +00:00
|
|
|
#ifdef LUNATIC
|
2012-11-10 20:59:00 +00:00
|
|
|
# include "lunatic_game.h"
|
2012-02-09 22:45:18 +00:00
|
|
|
#endif
|
|
|
|
|
2010-01-24 23:33:17 +00:00
|
|
|
#if KRANDDEBUG
|
|
|
|
# define GAMEEXEC_INLINE
|
|
|
|
# define GAMEEXEC_STATIC
|
|
|
|
#else
|
|
|
|
# define GAMEEXEC_INLINE inline
|
|
|
|
# define GAMEEXEC_STATIC static
|
|
|
|
#endif
|
|
|
|
|
2013-07-13 21:04:45 +00:00
|
|
|
vmstate_t vm;
|
|
|
|
|
|
|
|
#if !defined LUNATIC
|
2012-11-29 12:49:34 +00:00
|
|
|
enum vmflags_t {
|
|
|
|
VM_RETURN = 0x00000001,
|
|
|
|
VM_KILL = 0x00000002,
|
|
|
|
VM_NOEXECUTE = 0x00000004,
|
|
|
|
};
|
|
|
|
|
2009-01-09 09:29:17 +00:00
|
|
|
int32_t g_tw;
|
2013-02-07 21:00:52 +00:00
|
|
|
int32_t g_errorLineNum;
|
2011-08-03 17:22:46 +00:00
|
|
|
int32_t g_currentEventExec = -1;
|
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
intptr_t const *insptr;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t g_returnVarID = -1; // var ID of "RETURN"
|
|
|
|
int32_t g_weaponVarID = -1; // var ID of "WEAPON"
|
|
|
|
int32_t g_worksLikeVarID = -1; // var ID of "WORKSLIKE"
|
|
|
|
int32_t g_zRangeVarID = -1; // var ID of "ZRANGE"
|
|
|
|
int32_t g_angRangeVarID = -1; // var ID of "ANGRANGE"
|
|
|
|
int32_t g_aimAngleVarID = -1; // var ID of "AUTOAIMANGLE"
|
|
|
|
int32_t g_lotagVarID = -1; // var ID of "LOTAG"
|
|
|
|
int32_t g_hitagVarID = -1; // var ID of "HITAG"
|
|
|
|
int32_t g_textureVarID = -1; // var ID of "TEXTURE"
|
|
|
|
int32_t g_thisActorVarID = -1; // var ID of "THISACTOR"
|
|
|
|
int32_t g_structVarIDs = -1;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
GAMEEXEC_STATIC void VM_Execute(int loop);
|
2008-02-16 22:18:48 +00:00
|
|
|
|
2017-02-01 10:20:54 +00:00
|
|
|
# include "gamestructures.cpp"
|
2013-01-01 15:24:18 +00:00
|
|
|
#endif
|
2008-12-13 08:02:22 +00:00
|
|
|
|
2014-10-29 17:05:46 +00:00
|
|
|
#define VM_CONDITIONAL(xxx) \
|
2014-11-22 12:29:25 +00:00
|
|
|
{ \
|
2015-01-11 04:56:10 +00:00
|
|
|
if ((xxx) || ((insptr = (intptr_t *)*(insptr + 1)) && (((*insptr) & VM_INSTMASK) == CON_ELSE))) \
|
2014-11-22 12:29:25 +00:00
|
|
|
{ \
|
|
|
|
insptr += 2; \
|
|
|
|
VM_Execute(0); \
|
|
|
|
} \
|
2014-10-29 17:05:46 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2013-01-19 18:29:00 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:40:06 +00:00
|
|
|
void VM_ScriptInfo(intptr_t const *ptr, int range)
|
2016-05-23 04:47:22 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!apScript)
|
2010-05-05 07:31:38 +00:00
|
|
|
return;
|
|
|
|
|
2016-01-07 03:30:07 +00:00
|
|
|
if (ptr)
|
2008-08-25 20:25:49 +00:00
|
|
|
{
|
2012-01-01 04:14:06 +00:00
|
|
|
initprintf("\n");
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
for (intptr_t const *pScript = max(ptr - (range >> 1), apScript),
|
|
|
|
*p_end = min(ptr + (range >> 1), apScript + g_scriptSize);
|
|
|
|
pScript < p_end; pScript++)
|
2010-05-05 07:31:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
initprintf("%5d: %3d: ", (int32_t) (pScript - apScript), (int32_t) (pScript - ptr));
|
2012-01-01 04:14:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (*pScript >> 12 && (*pScript & VM_INSTMASK) < CON_END)
|
|
|
|
initprintf("%5d %s\n", (int32_t) (*pScript >> 12), keyw[*pScript & VM_INSTMASK]);
|
2015-01-11 04:56:10 +00:00
|
|
|
else
|
2016-08-27 01:40:35 +00:00
|
|
|
initprintf("%d\n", (int32_t) *pScript);
|
2010-05-05 07:31:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
initprintf("\n");
|
2008-08-25 20:25:49 +00:00
|
|
|
}
|
2010-05-05 07:31:38 +00:00
|
|
|
|
2016-01-07 03:30:07 +00:00
|
|
|
if (ptr == insptr)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.spriteNum)
|
2017-06-23 03:59:06 +00:00
|
|
|
initprintf("current actor: %d (%d)\n", vm.spriteNum, vm.pUSprite->picnum);
|
2010-05-05 07:31:38 +00:00
|
|
|
|
2016-01-07 03:30:07 +00:00
|
|
|
initprintf("g_errorLineNum: %d, g_tw: %d\n", g_errorLineNum, g_tw);
|
|
|
|
}
|
2008-08-25 20:25:49 +00:00
|
|
|
}
|
2016-05-23 04:47:22 +00:00
|
|
|
#endif
|
2008-08-25 20:25:49 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static void VM_DeleteSprite(int const spriteNum, int const playerNum)
|
2013-02-21 18:54:07 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned) spriteNum >= MAXSPRITES))
|
2013-08-06 23:51:51 +00:00
|
|
|
return;
|
2013-02-21 18:54:07 +00:00
|
|
|
|
2013-08-06 23:51:51 +00:00
|
|
|
// if player was set to squish, first stop that...
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(playerNum >= 0 && g_player[playerNum].ps->actorsqu == spriteNum))
|
|
|
|
g_player[playerNum].ps->actorsqu = -1;
|
2013-08-06 23:51:51 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DeleteSprite(spriteNum);
|
2013-02-21 18:54:07 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
intptr_t apScriptEvents[MAXGAMEEVENTS];
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2012-05-29 20:01:55 +00:00
|
|
|
// May recurse, e.g. through EVENT_XXX -> ... -> EVENT_KILLIT
|
2012-06-03 15:45:59 +00:00
|
|
|
#ifdef LUNATIC
|
2017-02-25 08:15:53 +00:00
|
|
|
static FORCE_INLINE int32_t VM_EventCommon_(int eventNum, int spriteNum, int playerNum, int playerDist, int32_t returnValue)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2014-10-25 03:33:53 +00:00
|
|
|
const double t = gethiticks();
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t ret = El_CallEvent(&g_ElState, eventNum, spriteNum, playerNum, playerDist, &returnValue);
|
2013-07-13 21:04:45 +00:00
|
|
|
|
2014-10-25 03:33:53 +00:00
|
|
|
// NOTE: the run times are those of the called event plus any events
|
|
|
|
// called by it, *not* "self" time.
|
2016-08-27 01:40:35 +00:00
|
|
|
g_eventTotalMs[eventNum] += gethiticks()-t;
|
|
|
|
g_eventCalls[eventNum]++;
|
2013-02-21 18:54:07 +00:00
|
|
|
|
2014-10-25 03:33:53 +00:00
|
|
|
if (ret == 1)
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_DeleteSprite(spriteNum, playerNum);
|
2014-11-22 12:29:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
return returnValue;
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
2013-02-21 18:54:07 +00:00
|
|
|
#else
|
2017-06-23 03:59:19 +00:00
|
|
|
// do not inline
|
|
|
|
static void VM_DummySprite(void)
|
|
|
|
{
|
|
|
|
static uspritetype dummy_sprite;
|
|
|
|
static actor_t dummy;
|
|
|
|
|
|
|
|
vm.pUSprite = &dummy_sprite;
|
|
|
|
vm.pActor = &dummy;
|
|
|
|
vm.pData = &dummy.t_data[0];
|
|
|
|
}
|
|
|
|
|
2017-02-25 08:15:53 +00:00
|
|
|
static FORCE_INLINE int32_t VM_EventCommon_(int const eventNum, int const spriteNum, int const playerNum,
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerDist, int32_t returnValue)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
// this is initialized first thing because spriteNum, playerNum, lDist, etc are already right there on the stack
|
2014-11-22 12:29:25 +00:00
|
|
|
// from the function call
|
2016-08-27 01:40:35 +00:00
|
|
|
const vmstate_t tempvm = { spriteNum,
|
|
|
|
playerNum,
|
|
|
|
playerDist,
|
|
|
|
0,
|
|
|
|
&sprite[(unsigned)spriteNum],
|
|
|
|
&actor[(unsigned)spriteNum].t_data[0],
|
2017-06-23 03:59:19 +00:00
|
|
|
g_player[playerNum].ps,
|
|
|
|
&actor[(unsigned) spriteNum] };
|
2014-11-22 12:29:25 +00:00
|
|
|
|
|
|
|
// since we're targeting C99 and C++ now, we can interweave these to avoid
|
|
|
|
// having to load addresses for things twice
|
|
|
|
// for example, because we are loading backupReturnVar with the value of
|
2016-08-27 01:40:06 +00:00
|
|
|
// aGameVars[g_iReturnVarID].lValue, the compiler can avoid having to
|
|
|
|
// reload the address of aGameVars[g_iReturnVarID].lValue in order to
|
2014-11-22 12:29:25 +00:00
|
|
|
// set it to the value of iReturn (...which should still be on the stack!)
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const backupReturnVar = aGameVars[g_returnVarID].global;
|
|
|
|
aGameVars[g_returnVarID].global = returnValue;
|
|
|
|
int const backupEventExec = g_currentEventExec;
|
|
|
|
g_currentEventExec = eventNum;
|
|
|
|
intptr_t const *oinsptr = insptr;
|
|
|
|
insptr = apScript + apScriptEvents[eventNum];
|
|
|
|
const vmstate_t vm_backup = vm;
|
2014-11-22 12:29:25 +00:00
|
|
|
|
|
|
|
vm = tempvm;
|
|
|
|
|
|
|
|
// check tempvm instead of vm... this way, we are not actually loading
|
|
|
|
// FROM vm anywhere until VM_Execute() is called
|
2017-06-23 03:59:19 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned) tempvm.spriteNum >= MAXSPRITES))
|
|
|
|
VM_DummySprite();
|
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if ((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers)
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pPlayer = g_player[0].ps;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2014-10-25 03:33:53 +00:00
|
|
|
VM_Execute(1);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.flags & VM_KILL)
|
|
|
|
VM_DeleteSprite(vm.spriteNum, vm.playerNum);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2014-11-22 12:29:25 +00:00
|
|
|
// this needs to happen after VM_DeleteSprite() because VM_DeleteSprite()
|
|
|
|
// can trigger additional events
|
2012-05-16 00:45:10 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
vm = vm_backup;
|
|
|
|
insptr = oinsptr;
|
|
|
|
g_currentEventExec = backupEventExec;
|
2016-08-27 01:40:35 +00:00
|
|
|
returnValue = aGameVars[g_returnVarID].global;
|
|
|
|
aGameVars[g_returnVarID].global = backupReturnVar;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
return returnValue;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2014-11-22 12:29:25 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// the idea here is that the compiler inlines the call to VM_EventCommon_() and gives us a set of full functions
|
|
|
|
// which are not only optimized further based on lDist or iReturn (or both) having values known at compile time,
|
|
|
|
// but are called faster due to having less parameters
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int32_t VM_OnEventWithBoth_(int const nEventID, int const spriteNum, int const playerNum, int const nDist, int32_t const nReturn)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
return VM_EventCommon_(nEventID, spriteNum, playerNum, nDist, nReturn);
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int32_t VM_OnEventWithReturn_(int const nEventID, int const spriteNum, int const playerNum, int32_t const nReturn)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
return VM_EventCommon_(nEventID, spriteNum, playerNum, -1, nReturn);
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int32_t VM_OnEventWithDist_(int const nEventID, int const spriteNum, int const playerNum, int const nDist)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
return VM_EventCommon_(nEventID, spriteNum, playerNum, nDist, 0);
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int32_t VM_OnEvent_(int const nEventID, int const spriteNum, int const playerNum)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
return VM_EventCommon_(nEventID, spriteNum, playerNum, -1, 0);
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2014-10-25 03:36:34 +00:00
|
|
|
static int32_t VM_CheckSquished(void)
|
2006-12-10 03:15:56 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
usectortype const * const pSector = (usectortype *)§or[vm.pSprite->sectnum];
|
2006-12-10 03:15:56 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSector->lotag == ST_23_SWINGING_DOOR ||
|
|
|
|
(pSector->lotag == ST_1_ABOVE_WATER &&
|
|
|
|
!A_CheckNoSE7Water((uspritetype const *)vm.pSprite, vm.pSprite->sectnum, pSector->lotag, NULL)) ||
|
|
|
|
(vm.pSprite->picnum == APLAYER && ud.noclip))
|
2010-05-02 23:27:30 +00:00
|
|
|
return 0;
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t floorZ = pSector->floorz;
|
|
|
|
int32_t ceilZ = pSector->ceilingz;
|
2011-10-03 17:44:06 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2016-03-14 00:07:12 +00:00
|
|
|
int16_t cb, fb;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
yax_getbunches(vm.pSprite->sectnum, &cb, &fb);
|
2011-10-03 17:44:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (cb >= 0 && (pSector->ceilingstat&512)==0) // if ceiling non-blocking...
|
2016-08-27 01:40:56 +00:00
|
|
|
ceilZ -= ZOFFSET5; // unconditionally don't squish... yax_getneighborsect is slowish :/
|
2016-08-27 01:40:35 +00:00
|
|
|
if (fb >= 0 && (pSector->floorstat&512)==0)
|
2016-08-27 01:40:56 +00:00
|
|
|
floorZ += ZOFFSET5;
|
2011-10-03 17:44:06 +00:00
|
|
|
#endif
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->pal == 1 ?
|
2016-08-27 01:40:56 +00:00
|
|
|
(floorZ - ceilZ >= ZOFFSET5 || (pSector->lotag&32768)) :
|
2016-08-27 01:40:35 +00:00
|
|
|
(floorZ - ceilZ >= ZOFFSET4))
|
2016-03-14 00:07:12 +00:00
|
|
|
return 0;
|
2016-06-05 04:46:28 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_DoQuote(QUOTE_SQUISHED, vm.pPlayer);
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite))
|
|
|
|
vm.pSprite->xvel = 0;
|
2006-12-10 03:15:56 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(vm.pSprite->pal == 1)) // frozen
|
2010-05-02 23:27:30 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->picnum = SHOTSPARK1;
|
|
|
|
vm.pActor->extra = 1;
|
2010-05-02 23:27:30 +00:00
|
|
|
return 0;
|
2006-12-10 03:15:56 +00:00
|
|
|
}
|
2010-05-02 23:27:30 +00:00
|
|
|
|
|
|
|
return 1;
|
2006-12-10 03:15:56 +00:00
|
|
|
}
|
|
|
|
|
2014-04-19 22:42:22 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:40:35 +00:00
|
|
|
GAMEEXEC_STATIC GAMEEXEC_INLINE void P_ForceAngle(DukePlayer_t *pPlayer)
|
2006-12-10 06:49:01 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const nAngle = 128-(krand()&255);
|
2006-12-10 06:49:01 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->horiz += 64;
|
|
|
|
pPlayer->return_to_center = 9;
|
|
|
|
pPlayer->rotscrnang = nAngle >> 1;
|
|
|
|
pPlayer->look_ang = pPlayer->rotscrnang;
|
2006-12-10 06:49:01 +00:00
|
|
|
}
|
2014-04-19 22:42:22 +00:00
|
|
|
#endif
|
2006-12-10 06:49:01 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
// wow, this function sucks
|
|
|
|
static int32_t A_Dodge(spritetype * const pSprite)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
if (A_CheckEnemySprite(pSprite) && pSprite->extra <= 0) // hack
|
2008-12-01 10:44:18 +00:00
|
|
|
return 0;
|
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
vec2_t const msin = { sintable[(pSprite->ang + 512) & 2047], sintable[pSprite->ang & 2047] };
|
|
|
|
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t nexti, SPRITES_OF_STAT_SAFE(STAT_PROJECTILE, i, nexti)) //weapons list
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (OW(i) == i)
|
2006-04-13 20:47:06 +00:00
|
|
|
continue;
|
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
vec2_t const b = { SX(i) - pSprite->x, SY(i) - pSprite->y };
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const v = { sintable[(SA(i) + 512) & 2047], sintable[SA(i) & 2047] };
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (((msin.x * b.x) + (msin.y * b.y) >= 0) && ((v.x * b.x) + (v.y * b.y) < 0))
|
2011-02-25 21:50:19 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
if (klabs((v.x * b.y) - (v.y * b.x)) < 65536 << 6)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->ang -= 512+(krand()&1024);
|
2011-02-25 21:50:19 +00:00
|
|
|
return 1;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2011-02-25 21:50:19 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2006-04-13 20:47:06 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int32_t A_GetFurthestAngle(int const spriteNum, int const angDiv)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
uspritetype *const pSprite = (uspritetype *)&sprite[spriteNum];
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSprite->picnum != APLAYER && (AC_COUNT(actor[spriteNum].t_data)&63) > 2)
|
|
|
|
return pSprite->ang + 1024;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
int32_t furthestAngle = 0;
|
|
|
|
int32_t greatestDist = INT32_MIN;
|
|
|
|
int const angIncs = tabledivide32_noinline(2048, angDiv);
|
2015-02-18 20:46:53 +00:00
|
|
|
hitdata_t hit;
|
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
for (bssize_t j = pSprite->ang; j < (2048 + pSprite->ang); j += angIncs)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z -= ZOFFSET3;
|
|
|
|
hitscan((const vec3_t *)pSprite, pSprite->sectnum,
|
2015-02-18 20:46:53 +00:00
|
|
|
sintable[(j+512)&2047],
|
|
|
|
sintable[j&2047], 0,
|
|
|
|
&hit, CLIPMASK1);
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z += ZOFFSET3;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
int const hitDist = klabs(hit.pos.x-pSprite->x) + klabs(hit.pos.y-pSprite->y);
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
if (hitDist > greatestDist)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
greatestDist = hitDist;
|
|
|
|
furthestAngle = j;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
return furthestAngle&2047;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
int A_FurthestVisiblePoint(int const spriteNum, uspritetype * const ts, vec2_t * const vect)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (AC_COUNT(actor[spriteNum].t_data)&63)
|
2012-05-14 18:12:27 +00:00
|
|
|
return -1;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
const uspritetype *const pnSprite = (uspritetype *)&sprite[spriteNum];
|
2015-02-18 20:46:53 +00:00
|
|
|
|
|
|
|
hitdata_t hit;
|
2016-08-27 01:40:06 +00:00
|
|
|
int const angincs = 128;
|
|
|
|
// ((!g_netServer && ud.multimode < 2) && ud.player_skill < 3) ? 2048 / 2 : tabledivide32_noinline(2048, 1 + (krand() & 1));
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2016-09-06 04:25:32 +00:00
|
|
|
for (bssize_t j = ts->ang; j < (2048 + ts->ang); j += (angincs /*-(krand()&511)*/))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-09-06 04:25:32 +00:00
|
|
|
ts->z -= ZOFFSET2;
|
|
|
|
hitscan((const vec3_t *)ts, ts->sectnum, sintable[(j + 512) & 2047], sintable[j & 2047],
|
2016-08-27 01:40:06 +00:00
|
|
|
16384 - (krand() & 32767), &hit, CLIPMASK1);
|
2016-09-06 04:25:32 +00:00
|
|
|
ts->z += ZOFFSET2;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (hit.sect < 0)
|
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-09-06 04:25:32 +00:00
|
|
|
int const d = FindDistance2D(hit.pos.x - ts->x, hit.pos.y - ts->y);
|
2016-08-27 01:40:06 +00:00
|
|
|
int const da = FindDistance2D(hit.pos.x - pnSprite->x, hit.pos.y - pnSprite->y);
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (d < da)
|
|
|
|
{
|
|
|
|
if (cansee(hit.pos.x, hit.pos.y, hit.pos.z, hit.sect,
|
|
|
|
pnSprite->x, pnSprite->y, pnSprite->z - ZOFFSET2, pnSprite->sectnum))
|
2015-02-18 20:46:53 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
vect->x = hit.pos.x;
|
|
|
|
vect->y = hit.pos.y;
|
2015-02-18 20:46:53 +00:00
|
|
|
return hit.sect;
|
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2015-02-18 20:46:53 +00:00
|
|
|
|
|
|
|
return -1;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static void VM_GetZRange(int const spriteNum, int32_t * const ceilhit, int32_t * const florhit, int const wallDist)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
uspritetype *const pSprite = (uspritetype *)&sprite[spriteNum];
|
2016-09-06 04:25:32 +00:00
|
|
|
int const ocstat = pSprite->cstat;
|
2009-01-19 06:41:28 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->cstat = 0;
|
|
|
|
pSprite->z -= ZOFFSET;
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
getzrange((vec3_t *)pSprite, pSprite->sectnum,
|
|
|
|
&actor[spriteNum].ceilingz, ceilhit,
|
|
|
|
&actor[spriteNum].floorz, florhit,
|
|
|
|
wallDist, CLIPMASK0);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z += ZOFFSET;
|
|
|
|
pSprite->cstat = ocstat;
|
2015-02-18 20:46:53 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
void A_GetZLimits(int const spriteNum)
|
2015-02-18 20:46:53 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spritetype *const pSprite = &sprite[spriteNum];
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t ceilhit, florhit;
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_GetZRange(spriteNum, &ceilhit, &florhit, (pSprite->statnum == STAT_PROJECTILE) ? 4 : 127);
|
|
|
|
actor[spriteNum].flags &= ~SFLAG_NOFLOORSHADOW;
|
2012-01-12 20:48:00 +00:00
|
|
|
|
2015-02-18 20:46:53 +00:00
|
|
|
if ((florhit&49152) == 49152 && (sprite[florhit&(MAXSPRITES-1)].cstat&48) == 0)
|
2014-10-25 03:36:34 +00:00
|
|
|
{
|
2016-06-21 00:33:58 +00:00
|
|
|
uspritetype const * const hitspr = (uspritetype *)&sprite[florhit&(MAXSPRITES-1)];
|
2011-12-21 18:42:49 +00:00
|
|
|
|
2015-02-18 20:46:53 +00:00
|
|
|
florhit &= (MAXSPRITES-1);
|
2011-12-21 18:42:49 +00:00
|
|
|
|
2015-02-18 20:46:53 +00:00
|
|
|
// If a non-projectile would fall onto non-frozen enemy OR an enemy onto a player...
|
2016-08-27 01:40:06 +00:00
|
|
|
if ((A_CheckEnemySprite(hitspr) && hitspr->pal != 1 && pSprite->statnum != STAT_PROJECTILE)
|
|
|
|
|| (hitspr->picnum == APLAYER && A_CheckEnemySprite(pSprite)))
|
2014-10-25 03:36:34 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
actor[spriteNum].flags |= SFLAG_NOFLOORSHADOW; // No shadows on actors
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->xvel = -256; // SLIDE_ABOVE_ENEMY
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SetSprite(spriteNum, CLIPMASK0);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
else if (pSprite->statnum == STAT_PROJECTILE && hitspr->picnum == APLAYER && pSprite->owner==florhit)
|
2010-08-02 08:13:51 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
actor[spriteNum].ceilingz = sector[pSprite->sectnum].ceilingz;
|
|
|
|
actor[spriteNum].floorz = sector[pSprite->sectnum].floorz;
|
2010-08-02 08:13:51 +00:00
|
|
|
}
|
2014-10-25 03:36:34 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
void A_Fall(int const spriteNum)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spritetype *const pSprite = &sprite[spriteNum];
|
|
|
|
int spriteGravity = g_spriteGravity;
|
2015-02-18 20:46:53 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(G_CheckForSpaceFloor(pSprite->sectnum)))
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteGravity = 0;
|
2016-08-27 01:40:06 +00:00
|
|
|
else if (sector[pSprite->sectnum].lotag == ST_2_UNDERWATER || EDUKE32_PREDICT_FALSE(G_CheckForSpaceCeiling(pSprite->sectnum)))
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteGravity = g_spriteGravity/6;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (pSprite->statnum == STAT_ACTOR || pSprite->statnum == STAT_PLAYER || pSprite->statnum == STAT_ZOMBIEACTOR || pSprite->statnum == STAT_STANDABLE)
|
2009-01-13 12:23:18 +00:00
|
|
|
{
|
2015-02-18 20:46:53 +00:00
|
|
|
int32_t ceilhit, florhit;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_GetZRange(spriteNum, &ceilhit, &florhit, 127);
|
2009-01-13 12:23:18 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
actor[spriteNum].ceilingz = sector[pSprite->sectnum].ceilingz;
|
|
|
|
actor[spriteNum].floorz = sector[pSprite->sectnum].floorz;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2011-05-07 18:23:34 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2016-08-27 01:40:06 +00:00
|
|
|
int fbunch = (sector[pSprite->sectnum].floorstat&512) ? -1 : yax_getbunch(pSprite->sectnum, YAX_FLOOR);
|
2011-05-07 18:23:34 +00:00
|
|
|
#endif
|
2013-04-15 10:48:18 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSprite->z < actor[spriteNum].floorz-ZOFFSET
|
2011-05-07 18:23:34 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2013-04-15 10:48:18 +00:00
|
|
|
|| fbunch >= 0
|
2011-05-07 18:23:34 +00:00
|
|
|
#endif
|
2012-05-14 18:12:27 +00:00
|
|
|
)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
if (sector[pSprite->sectnum].lotag == ST_2_UNDERWATER && pSprite->zvel > 3122)
|
|
|
|
pSprite->zvel = 3144;
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z += pSprite->zvel = min(6144, pSprite->zvel+spriteGravity);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2013-04-15 10:48:18 +00:00
|
|
|
|
2011-05-07 18:23:34 +00:00
|
|
|
#ifdef YAX_ENABLE
|
|
|
|
if (fbunch >= 0)
|
2016-08-27 01:40:35 +00:00
|
|
|
setspritez(spriteNum, (vec3_t *)pSprite);
|
2013-04-15 10:48:18 +00:00
|
|
|
else
|
2011-05-07 18:23:34 +00:00
|
|
|
#endif
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSprite->z >= actor[spriteNum].floorz-ZOFFSET)
|
2012-05-14 18:12:27 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z = actor[spriteNum].floorz-ZOFFSET;
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->zvel = 0;
|
2012-05-14 18:12:27 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int G_GetAngleDelta(int currAngle, int newAngle)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
currAngle &= 2047;
|
|
|
|
newAngle &= 2047;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (klabs(currAngle-newAngle) < 1024)
|
2007-03-11 00:20:32 +00:00
|
|
|
{
|
2008-11-20 14:06:36 +00:00
|
|
|
// OSD_Printf("G_GetAngleDelta() returning %d\n",na-a);
|
2016-08-27 01:40:35 +00:00
|
|
|
return newAngle-currAngle;
|
2007-03-11 00:47:32 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newAngle > 1024) newAngle -= 2048;
|
|
|
|
if (currAngle > 1024) currAngle -= 2048;
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2008-11-20 14:06:36 +00:00
|
|
|
// OSD_Printf("G_GetAngleDelta() returning %d\n",na-a);
|
2016-08-27 01:40:35 +00:00
|
|
|
return newAngle-currAngle;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
GAMEEXEC_STATIC void VM_AlterAng(int32_t const moveFlags)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const elapsedTics = (AC_COUNT(vm.pData))&31;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2013-02-07 21:00:48 +00:00
|
|
|
#if !defined LUNATIC
|
2011-12-21 18:40:47 +00:00
|
|
|
const intptr_t *moveptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.pData) >= (unsigned)g_scriptSize-1))
|
2012-03-11 17:37:50 +00:00
|
|
|
|
2010-08-07 22:52:58 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_MOVE_ID(vm.pData) = 0;
|
2017-06-23 03:59:06 +00:00
|
|
|
OSD_Printf(OSD_ERROR "bad moveptr for actor %d (%d)!\n", vm.spriteNum, vm.pUSprite->picnum);
|
2010-08-07 22:59:46 +00:00
|
|
|
return;
|
2010-08-07 22:52:58 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
moveptr = apScript + AC_MOVE_ID(vm.pData);
|
2011-12-21 18:40:47 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->xvel += (moveptr[0] - vm.pSprite->xvel)/5;
|
|
|
|
if (vm.pSprite->zvel < 648)
|
|
|
|
vm.pSprite->zvel += ((moveptr[1]<<4) - vm.pSprite->zvel)/5;
|
2012-06-03 15:46:08 +00:00
|
|
|
#else
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pSprite->xvel += (vm.pActor->mv.hvel - vm.pSprite->xvel)/5;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->zvel < 648)
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pSprite->zvel += ((vm.pActor->mv.vvel<<4) - vm.pSprite->zvel)/5;
|
2012-06-03 15:46:08 +00:00
|
|
|
#endif
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->extra <= 0) // hack
|
2008-12-01 10:44:18 +00:00
|
|
|
return;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (moveFlags&seekplayer)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteAngle = vm.pSprite->ang;
|
2017-06-23 03:58:54 +00:00
|
|
|
int const holoDukeSprite = vm.pPlayer->holoduke_on;
|
2008-09-03 04:20:46 +00:00
|
|
|
|
2006-04-13 20:47:06 +00:00
|
|
|
// NOTE: looks like 'owner' is set to target sprite ID...
|
|
|
|
|
2016-09-06 04:25:32 +00:00
|
|
|
vm.pSprite->owner
|
|
|
|
= (holoDukeSprite >= 0 && cansee(sprite[holoDukeSprite].x, sprite[holoDukeSprite].y, sprite[holoDukeSprite].z,
|
|
|
|
sprite[holoDukeSprite].sectnum, vm.pSprite->x, vm.pSprite->y, vm.pSprite->z, vm.pSprite->sectnum))
|
|
|
|
? holoDukeSprite
|
|
|
|
: vm.pPlayer->i;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int const goalAng = (sprite[vm.pSprite->owner].picnum == APLAYER)
|
2017-06-23 03:59:19 +00:00
|
|
|
? getangle(vm.pActor->lastv.x - vm.pSprite->x, vm.pActor->lastv.y - vm.pSprite->y)
|
2016-09-06 04:25:32 +00:00
|
|
|
: getangle(sprite[vm.pSprite->owner].x - vm.pSprite->x, sprite[vm.pSprite->owner].y - vm.pSprite->y);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->xvel && vm.pSprite->picnum != DRONE)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
int const angDiff = G_GetAngleDelta(spriteAngle, goalAng);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (elapsedTics < 2)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (klabs(angDiff) < 256)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
int const angInc = 128-(krand()&256);
|
|
|
|
vm.pSprite->ang += angInc;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_GetHitscanRange(vm.spriteNum) < 844)
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pSprite->ang -= angInc;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (elapsedTics > 18 && elapsedTics < GAMETICSPERSEC) // choose
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (klabs(angDiff>>2) < 128) vm.pSprite->ang = goalAng;
|
|
|
|
else vm.pSprite->ang += angDiff>>2;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else vm.pSprite->ang = goalAng;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (elapsedTics < 1)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (moveFlags&furthestdir)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->ang = A_GetFurthestAngle(vm.spriteNum, 2);
|
|
|
|
vm.pSprite->owner = vm.pPlayer->i;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (moveFlags&fleeenemy)
|
|
|
|
vm.pSprite->ang = A_GetFurthestAngle(vm.spriteNum, 2);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static inline void VM_AddAngle(int const shift, int const goalAng)
|
2012-06-07 17:38:01 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int angDiff = G_GetAngleDelta(vm.pSprite->ang, goalAng) >> shift;
|
2012-06-07 17:38:01 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((angDiff > -8 && angDiff < 0) || (angDiff < 8 && angDiff > 0))
|
|
|
|
angDiff <<= 1;
|
2012-06-07 17:38:01 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->ang += angDiff;
|
2012-06-07 17:38:01 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static inline void VM_FacePlayer(int const shift)
|
2012-06-07 17:38:01 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_AddAngle(shift, (vm.pPlayer->newowner >= 0) ? getangle(vm.pPlayer->opos.x - vm.pSprite->x, vm.pPlayer->opos.y - vm.pSprite->y)
|
|
|
|
: getangle(vm.pPlayer->pos.x - vm.pSprite->x, vm.pPlayer->pos.y - vm.pSprite->y));
|
2012-06-07 17:38:01 +00:00
|
|
|
}
|
|
|
|
|
2013-04-12 11:59:35 +00:00
|
|
|
////////// TROR get*zofslope //////////
|
|
|
|
// These rather belong into the engine.
|
|
|
|
|
2014-11-22 12:29:25 +00:00
|
|
|
static int32_t VM_GetCeilZOfSlope(void)
|
2013-04-12 11:59:35 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const vect = *(vec2_t *)vm.pSprite;
|
|
|
|
int const sectnum = vm.pSprite->sectnum;
|
2014-11-22 12:29:25 +00:00
|
|
|
|
2013-04-12 11:59:35 +00:00
|
|
|
#ifdef YAX_ENABLE
|
|
|
|
if ((sector[sectnum].ceilingstat&512)==0)
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const nsect = yax_getneighborsect(vect.x, vect.y, sectnum, YAX_CEILING);
|
2013-04-12 11:59:35 +00:00
|
|
|
if (nsect >= 0)
|
2016-08-27 01:40:06 +00:00
|
|
|
return getceilzofslope(nsect, vect.x, vect.y);
|
2013-04-12 11:59:35 +00:00
|
|
|
}
|
|
|
|
#endif
|
2016-08-27 01:40:06 +00:00
|
|
|
return getceilzofslope(sectnum, vect.x, vect.y);
|
2013-04-12 11:59:35 +00:00
|
|
|
}
|
|
|
|
|
2014-11-22 12:29:25 +00:00
|
|
|
static int32_t VM_GetFlorZOfSlope(void)
|
2013-04-12 11:59:35 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const vect = *(vec2_t *)vm.pSprite;
|
|
|
|
int const sectnum = vm.pSprite->sectnum;
|
2014-11-22 12:29:25 +00:00
|
|
|
|
2013-04-12 11:59:35 +00:00
|
|
|
#ifdef YAX_ENABLE
|
|
|
|
if ((sector[sectnum].floorstat&512)==0)
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const nsect = yax_getneighborsect(vect.x, vect.y, sectnum, YAX_FLOOR);
|
2013-04-12 11:59:35 +00:00
|
|
|
if (nsect >= 0)
|
2016-08-27 01:40:06 +00:00
|
|
|
return getflorzofslope(nsect, vect.x, vect.y);
|
2013-04-12 11:59:35 +00:00
|
|
|
}
|
|
|
|
#endif
|
2016-08-27 01:40:06 +00:00
|
|
|
return getflorzofslope(sectnum, vect.x, vect.y);
|
2013-04-12 11:59:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////
|
|
|
|
|
2015-02-05 16:30:13 +00:00
|
|
|
static int32_t A_GetWaterZOffset(int spritenum);
|
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
GAMEEXEC_STATIC void VM_Move(void)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2013-06-30 20:38:48 +00:00
|
|
|
// NOTE: commented out condition is dead since r3159 (making hi/lotag unsigned).
|
|
|
|
// XXX: Does it break anything? Where are movflags with all bits set created?
|
2017-06-23 03:58:54 +00:00
|
|
|
const uint16_t * const movflagsptr = &AC_MOVFLAGS(vm.pSprite, &actor[vm.spriteNum]);
|
2016-08-27 01:40:06 +00:00
|
|
|
int const movflags = /*(*movflagsptr==-1) ? 0 :*/ *movflagsptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
int const deadflag = (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->extra <= 0);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_COUNT(vm.pData)++;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (AC_MOVE_ID(vm.pData) == 0 || movflags == 0)
|
2008-12-01 10:44:18 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
if (deadflag || (vm.pActor->bpos.x != vm.pSprite->x) || (vm.pActor->bpos.y != vm.pSprite->y))
|
2008-12-01 10:44:18 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->bpos.x = vm.pSprite->x;
|
|
|
|
vm.pActor->bpos.y = vm.pSprite->y;
|
2016-08-27 01:40:35 +00:00
|
|
|
setsprite(vm.spriteNum, (vec3_t *)vm.pSprite);
|
2008-12-01 10:44:18 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (deadflag)
|
|
|
|
goto dead;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (movflags&face_player)
|
2013-02-07 21:00:48 +00:00
|
|
|
VM_FacePlayer(2);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (movflags&spin)
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->ang += sintable[((AC_COUNT(vm.pData)<<3)&2047)]>>6;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (movflags&face_player_slow)
|
2013-02-07 21:00:48 +00:00
|
|
|
VM_FacePlayer(4);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2014-03-16 14:37:52 +00:00
|
|
|
if ((movflags&jumptoplayer_bits) == jumptoplayer_bits)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (AC_COUNT(vm.pData) < 16)
|
|
|
|
vm.pSprite->zvel -= (sintable[(512+(AC_COUNT(vm.pData)<<4))&2047]>>5);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (movflags&face_player_smart)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const vect = { vm.pPlayer->pos.x + (vm.pPlayer->vel.x / 768),
|
|
|
|
vm.pPlayer->pos.y + (vm.pPlayer->vel.y / 768) };
|
|
|
|
VM_AddAngle(2, getangle(vect.x - vm.pSprite->x, vect.y - vm.pSprite->y));
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
dead:
|
2013-02-07 21:00:48 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.pData) >= (unsigned)g_scriptSize-1))
|
2010-08-07 22:52:58 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_MOVE_ID(vm.pData) = 0;
|
2017-06-23 03:59:06 +00:00
|
|
|
OSD_Printf(OSD_ERROR "clearing bad moveptr for actor %d (%d)\n", vm.spriteNum, vm.pUSprite->picnum);
|
2010-08-07 22:59:46 +00:00
|
|
|
return;
|
2010-08-07 22:38:15 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
intptr_t const * const moveptr = apScript + AC_MOVE_ID(vm.pData);
|
2011-12-21 18:40:47 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (movflags&geth) vm.pSprite->xvel += ((moveptr[0])-vm.pSprite->xvel)>>1;
|
|
|
|
if (movflags&getv) vm.pSprite->zvel += ((moveptr[1]<<4)-vm.pSprite->zvel)>>1;
|
2012-06-03 15:46:08 +00:00
|
|
|
#else
|
2017-06-23 03:59:19 +00:00
|
|
|
if (movflags&geth) vm.pSprite->xvel += (vm.pActor->mv.hvel - vm.pSprite->xvel)>>1;
|
|
|
|
if (movflags&getv) vm.pSprite->zvel += (16*vm.pActor->mv.vvel - vm.pSprite->zvel)>>1;
|
2012-06-03 15:46:08 +00:00
|
|
|
#endif
|
2011-03-04 08:50:58 +00:00
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (movflags&dodgebullet && !deadflag)
|
2016-08-27 01:40:35 +00:00
|
|
|
A_Dodge(vm.pSprite);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->picnum != APLAYER)
|
2013-06-30 20:38:45 +00:00
|
|
|
VM_AlterAng(movflags);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->xvel > -6 && vm.pSprite->xvel < 6)
|
|
|
|
vm.pSprite->xvel = 0;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int badguyp = A_CheckEnemySprite(vm.pSprite);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->xvel || vm.pSprite->zvel)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:41:50 +00:00
|
|
|
int spriteXvel = vm.pSprite->xvel;
|
|
|
|
int angDiff = vm.pSprite->ang;
|
2012-06-07 17:38:01 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (badguyp && vm.pSprite->picnum != ROTATEGUN)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((vm.pSprite->picnum == DRONE || vm.pSprite->picnum == COMMANDER) && vm.pSprite->extra > 0)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->picnum == COMMANDER)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t nSectorZ;
|
2013-04-12 11:59:26 +00:00
|
|
|
// NOTE: COMMANDER updates both actor[].floorz and
|
|
|
|
// .ceilingz regardless of its zvel.
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->floorz = nSectorZ = VM_GetFlorZOfSlope();
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->z > nSectorZ-ZOFFSET3)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->z = nSectorZ-ZOFFSET3;
|
|
|
|
vm.pSprite->zvel = 0;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->ceilingz = nSectorZ = VM_GetCeilZOfSlope();
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->z < nSectorZ+(80<<8))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->z = nSectorZ+(80<<8);
|
|
|
|
vm.pSprite->zvel = 0;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t nSectorZ;
|
2013-04-12 11:59:26 +00:00
|
|
|
// The DRONE updates either .floorz or .ceilingz, not both.
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->zvel > 0)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->floorz = nSectorZ = VM_GetFlorZOfSlope();
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->z > nSectorZ-(30<<8))
|
|
|
|
vm.pSprite->z = nSectorZ-(30<<8);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->ceilingz = nSectorZ = VM_GetCeilZOfSlope();
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->z < nSectorZ+(50<<8))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->z = nSectorZ+(50<<8);
|
|
|
|
vm.pSprite->zvel = 0;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (vm.pSprite->picnum != ORGANTIC)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2015-02-18 20:46:49 +00:00
|
|
|
// All other actors besides ORGANTIC don't update .floorz or
|
|
|
|
// .ceilingz here.
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->zvel > 0)
|
2015-02-05 16:30:12 +00:00
|
|
|
{
|
2017-06-23 03:59:19 +00:00
|
|
|
if (vm.pSprite->z > vm.pActor->floorz)
|
|
|
|
vm.pSprite->z = vm.pActor->floorz;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->z += A_GetWaterZOffset(vm.spriteNum);
|
2015-02-05 16:30:12 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (vm.pSprite->zvel < 0)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const l = VM_GetCeilZOfSlope();
|
2015-02-18 20:46:49 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->z < l+(66<<8))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->z = l+(66<<8);
|
|
|
|
vm.pSprite->zvel >>= 1;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.playerDist < 960 && vm.pSprite->xrepeat > 16)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:41:50 +00:00
|
|
|
spriteXvel = -(1024 - vm.playerDist);
|
2016-08-27 01:40:35 +00:00
|
|
|
angDiff = getangle(vm.pPlayer->pos.x - vm.pSprite->x, vm.pPlayer->pos.y - vm.pSprite->y);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.playerDist < 512)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pPlayer->vel.x = 0;
|
|
|
|
vm.pPlayer->vel.y = 0;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pPlayer->vel.x = mulscale16(vm.pPlayer->vel.x, vm.pPlayer->runspeed - 0x2000);
|
|
|
|
vm.pPlayer->vel.y = mulscale16(vm.pPlayer->vel.y, vm.pPlayer->runspeed - 0x2000);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (vm.pSprite->picnum != DRONE && vm.pSprite->picnum != SHARK && vm.pSprite->picnum != COMMANDER)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pPlayer->actorsqu == vm.spriteNum)
|
2013-06-30 20:38:48 +00:00
|
|
|
return;
|
2012-10-30 15:54:35 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!A_CheckSpriteFlags(vm.spriteNum, SFLAG_SMOOTHMOVE))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (AC_COUNT(vm.pData) & 1)
|
2013-06-30 20:38:48 +00:00
|
|
|
return;
|
2016-08-27 01:41:50 +00:00
|
|
|
spriteXvel <<= 1;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (vm.pSprite->picnum == APLAYER)
|
2017-06-23 03:59:19 +00:00
|
|
|
if (vm.pSprite->z < vm.pActor->ceilingz+ZOFFSET5)
|
|
|
|
vm.pSprite->z = vm.pActor->ceilingz+ZOFFSET5;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
vec3_t const vect = { (spriteXvel * (sintable[(angDiff + 512) & 2047])) >> 14,
|
|
|
|
(spriteXvel * (sintable[angDiff & 2047])) >> 14, vm.pSprite->zvel };
|
2009-01-13 04:40:56 +00:00
|
|
|
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->movflag = A_MoveSprite(vm.spriteNum, &vect, (A_CheckSpriteFlags(vm.spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK0));
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2013-06-30 20:38:45 +00:00
|
|
|
if (!badguyp)
|
2012-06-07 17:38:01 +00:00
|
|
|
return;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->shade += (sector[vm.pSprite->sectnum].ceilingstat & 1) ? (sector[vm.pSprite->sectnum].ceilingshade - vm.pSprite->shade) >> 1
|
|
|
|
: (sector[vm.pSprite->sectnum].floorshade - vm.pSprite->shade) >> 1;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static void P_AddWeaponMaybeSwitch(DukePlayer_t * const ps, int const weaponNum)
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2014-10-29 17:05:46 +00:00
|
|
|
if ((ps->weaponswitch & (1|4)) == (1|4))
|
2012-08-27 03:52:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerNum = P_Get(ps->i);
|
2016-08-27 01:40:06 +00:00
|
|
|
int new_wchoice = -1;
|
|
|
|
int curr_wchoice = -1;
|
2012-08-27 03:52:38 +00:00
|
|
|
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i=0; i<=FREEZE_WEAPON && (new_wchoice < 0 || curr_wchoice < 0); i++)
|
2012-08-27 03:52:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int w = g_player[playerNum].wchoice[i];
|
2012-08-27 03:52:38 +00:00
|
|
|
|
2013-12-26 19:44:56 +00:00
|
|
|
if (w == KNEE_WEAPON)
|
|
|
|
w = FREEZE_WEAPON;
|
2012-08-27 03:52:38 +00:00
|
|
|
else w--;
|
|
|
|
|
|
|
|
if (w == ps->curr_weapon)
|
|
|
|
curr_wchoice = i;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (w == weaponNum)
|
2012-08-27 03:52:38 +00:00
|
|
|
new_wchoice = i;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_AddWeapon(ps, weaponNum, (new_wchoice < curr_wchoice));
|
2012-08-27 03:52:38 +00:00
|
|
|
}
|
|
|
|
else
|
2013-12-26 19:45:00 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
P_AddWeapon(ps, weaponNum, (ps->weaponswitch & 1));
|
2013-12-26 19:45:00 +00:00
|
|
|
}
|
2012-08-10 19:11:47 +00:00
|
|
|
}
|
|
|
|
|
2013-02-24 16:05:47 +00:00
|
|
|
#if defined LUNATIC
|
|
|
|
void P_AddWeaponMaybeSwitchI(int32_t snum, int32_t weap)
|
|
|
|
{
|
|
|
|
P_AddWeaponMaybeSwitch(g_player[snum].ps, weap);
|
|
|
|
}
|
|
|
|
#else
|
2017-06-23 03:58:54 +00:00
|
|
|
static void P_AddWeaponAmmoCommon(DukePlayer_t * const pPlayer, int const weaponNum, int const nAmount)
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:46 +00:00
|
|
|
P_AddAmmo(pPlayer, weaponNum, nAmount);
|
2012-08-10 19:11:47 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (PWEAPON(vm.playerNum, pPlayer->curr_weapon, WorksLike) == KNEE_WEAPON && (pPlayer->gotweapon & (1 << weaponNum)))
|
|
|
|
P_AddWeaponMaybeSwitch(pPlayer, weaponNum);
|
2012-08-10 19:11:47 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static int VM_AddWeapon(DukePlayer_t * const pPlayer, int const weaponNum, int const nAmount)
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS))
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum);
|
2012-08-10 19:11:47 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((pPlayer->gotweapon & (1 << weaponNum)) == 0)
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
P_AddWeaponMaybeSwitch(pPlayer, weaponNum);
|
2012-08-10 19:11:47 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum])
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags |= VM_NOEXECUTE;
|
2012-08-10 19:11:47 +00:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_AddWeaponAmmoCommon(pPlayer, weaponNum, nAmount);
|
2012-08-10 19:11:47 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2013-01-01 15:24:18 +00:00
|
|
|
#endif
|
2012-08-10 19:11:47 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
static int32_t A_GetVerticalVel(actor_t const * const pActor)
|
2015-02-05 16:30:12 +00:00
|
|
|
{
|
|
|
|
#ifdef LUNATIC
|
2016-08-27 01:40:06 +00:00
|
|
|
return pActor->mv.vvel;
|
2015-02-05 16:30:12 +00:00
|
|
|
#else
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t moveScriptOfs = AC_MOVE_ID(pActor->t_data);
|
2015-02-05 16:30:12 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
return ((unsigned) moveScriptOfs < (unsigned) g_scriptSize - 1) ? apScript[moveScriptOfs + 1] : 0;
|
2015-02-05 16:30:12 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static int32_t A_GetWaterZOffset(int const spriteNum)
|
2015-02-05 16:30:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
uspritetype const *const pSprite = (uspritetype *)&sprite[spriteNum];
|
|
|
|
actor_t const *const pActor = &actor[spriteNum];
|
2015-02-05 16:30:12 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (sector[pSprite->sectnum].lotag == ST_1_ABOVE_WATER)
|
2015-02-05 16:30:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckSpriteFlags(spriteNum, SFLAG_NOWATERDIP))
|
2015-02-05 16:30:12 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
// fix for flying/jumping monsters getting stuck in water
|
2016-08-27 01:40:06 +00:00
|
|
|
if ((AC_MOVFLAGS(pSprite, pActor) & jumptoplayer_only) || (G_HaveActor(pSprite->picnum) && A_GetVerticalVel(pActor) != 0))
|
2015-02-05 16:30:12 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return ACTOR_ONWATER_ADDZ;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static void VM_Fall(int const spriteNum, spritetype * const pSprite)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2016-08-27 01:41:50 +00:00
|
|
|
int spriteGravity = g_spriteGravity;
|
2012-12-03 18:24:20 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->xoffset = pSprite->yoffset = 0;
|
2012-12-03 18:24:20 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (sector[pSprite->sectnum].lotag == ST_2_UNDERWATER || EDUKE32_PREDICT_FALSE(G_CheckForSpaceCeiling(pSprite->sectnum)))
|
2016-08-27 01:41:50 +00:00
|
|
|
spriteGravity = g_spriteGravity/6;
|
2016-08-27 01:40:06 +00:00
|
|
|
else if (EDUKE32_PREDICT_FALSE(G_CheckForSpaceFloor(pSprite->sectnum)))
|
2016-08-27 01:41:50 +00:00
|
|
|
spriteGravity = 0;
|
2012-12-03 18:24:20 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!actor[spriteNum].cgg-- || (sector[pSprite->sectnum].floorstat&2))
|
2013-04-15 10:48:22 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
A_GetZLimits(spriteNum);
|
|
|
|
actor[spriteNum].cgg = 3;
|
2013-04-15 10:48:22 +00:00
|
|
|
}
|
2012-12-03 18:24:20 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSprite->z < actor[spriteNum].floorz-ZOFFSET)
|
2013-04-15 10:48:22 +00:00
|
|
|
{
|
|
|
|
// Free fall.
|
2016-08-27 01:41:50 +00:00
|
|
|
pSprite->zvel = min(pSprite->zvel+spriteGravity, ACTOR_MAXFALLINGZVEL);
|
|
|
|
int newZ = pSprite->z + pSprite->zvel;
|
2015-02-05 16:30:12 +00:00
|
|
|
|
2012-12-03 18:24:20 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2016-08-27 01:40:06 +00:00
|
|
|
if (yax_getbunch(pSprite->sectnum, YAX_FLOOR) >= 0 &&
|
|
|
|
(sector[pSprite->sectnum].floorstat&512)==0)
|
2016-08-27 01:40:35 +00:00
|
|
|
setspritez(spriteNum, (vec3_t *)pSprite);
|
2013-04-15 10:48:22 +00:00
|
|
|
else
|
2012-12-03 18:24:20 +00:00
|
|
|
#endif
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newZ > actor[spriteNum].floorz - ZOFFSET)
|
|
|
|
newZ = actor[spriteNum].floorz - ZOFFSET;
|
2015-02-05 16:30:12 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z = newZ;
|
2013-04-15 10:48:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2013-04-15 10:48:09 +00:00
|
|
|
|
2015-02-05 16:30:12 +00:00
|
|
|
// Preliminary new z position of the actor.
|
2016-08-27 01:41:50 +00:00
|
|
|
int newZ = actor[spriteNum].floorz - ZOFFSET;
|
2012-12-03 18:24:20 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (A_CheckEnemySprite(pSprite) || (pSprite->picnum == APLAYER && pSprite->owner >= 0))
|
2013-04-15 10:48:22 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
if (pSprite->zvel > 3084 && pSprite->extra <= 1)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2013-04-15 10:48:22 +00:00
|
|
|
// I'm guessing this DRONE check is from a beta version of the game
|
|
|
|
// where they crashed into the ground when killed
|
2016-08-27 01:40:06 +00:00
|
|
|
if (!(pSprite->picnum == APLAYER && pSprite->extra > 0) && pSprite->pal != 1 && pSprite->picnum != DRONE)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DoGuts(spriteNum,JIBS6,15);
|
|
|
|
A_PlaySound(SQUISHED,spriteNum);
|
|
|
|
A_Spawn(spriteNum,BLOODPOOL);
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
2013-04-15 10:48:09 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
actor[spriteNum].picnum = SHOTSPARK1;
|
|
|
|
actor[spriteNum].extra = 1;
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->zvel = 0;
|
2013-04-15 10:48:22 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
else if (pSprite->zvel > 2048 && sector[pSprite->sectnum].lotag != ST_1_ABOVE_WATER)
|
2013-04-15 10:48:22 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int16_t newsect = pSprite->sectnum;
|
2013-04-15 10:48:09 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
pushmove((vec3_t *)pSprite, &newsect, 128, 4<<8, 4<<8, CLIPMASK0);
|
2013-04-15 10:48:22 +00:00
|
|
|
if ((unsigned)newsect < MAXSECTORS)
|
2016-08-27 01:40:35 +00:00
|
|
|
changespritesect(spriteNum, newsect);
|
2013-04-15 10:48:22 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
A_PlaySound(THUD, spriteNum);
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (sector[pSprite->sectnum].lotag == ST_1_ABOVE_WATER)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z = newZ + A_GetWaterZOffset(spriteNum);
|
2012-12-03 18:24:20 +00:00
|
|
|
return;
|
|
|
|
}
|
2013-02-07 21:00:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->z = newZ;
|
2016-08-27 01:40:06 +00:00
|
|
|
pSprite->zvel = 0;
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
static int32_t VM_ResetPlayer(int const playerNum, int32_t vmFlags, int32_t const resetFlags)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
|
|
|
//AddLog("resetplayer");
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!g_netServer && ud.multimode < 2 && !(resetFlags & 2))
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (g_lastSaveSlot >= 0 && ud.recstat != 2 && !(resetFlags & 1))
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2016-11-01 01:35:32 +00:00
|
|
|
Menu_Open(playerNum);
|
2012-12-03 18:24:20 +00:00
|
|
|
KB_ClearKeyDown(sc_Space);
|
2014-06-13 09:04:05 +00:00
|
|
|
I_AdvanceTriggerClear();
|
2016-11-01 01:35:32 +00:00
|
|
|
Menu_Change(MENU_RESETPLAYER);
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else g_player[playerNum].ps->gm = MODE_RESTART;
|
2013-07-13 21:04:45 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:40:35 +00:00
|
|
|
vmFlags |= VM_NOEXECUTE;
|
2013-07-13 21:04:45 +00:00
|
|
|
#endif
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (playerNum == myconnectindex)
|
2012-12-03 18:24:20 +00:00
|
|
|
{
|
2013-01-19 18:28:32 +00:00
|
|
|
CAMERADIST = 0;
|
|
|
|
CAMERACLOCK = totalclock;
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (g_fakeMultiMode)
|
2016-08-27 01:40:35 +00:00
|
|
|
P_ResetPlayer(playerNum);
|
2012-12-09 13:24:44 +00:00
|
|
|
#ifndef NETCODE_DISABLE
|
2012-12-03 18:24:20 +00:00
|
|
|
if (g_netServer)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
P_ResetPlayer(playerNum);
|
|
|
|
Net_SpawnPlayer(playerNum);
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
2012-12-09 13:24:44 +00:00
|
|
|
#endif
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
2013-02-07 21:00:52 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_UpdateScreenPal(g_player[playerNum].ps);
|
2012-12-03 18:24:20 +00:00
|
|
|
//AddLog("EOF: resetplayer");
|
2013-02-07 21:00:52 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
return vmFlags;
|
2012-12-03 18:24:20 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
void G_GetTimeDate(int32_t * const pValues)
|
2013-02-16 18:53:00 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
time_t timeStruct;
|
|
|
|
time(&timeStruct);
|
|
|
|
struct tm *pTime = localtime(&timeStruct);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2013-02-16 18:53:00 +00:00
|
|
|
// initprintf("Time&date: %s\n",asctime (ti));
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pValues[0] = pTime->tm_sec;
|
|
|
|
pValues[1] = pTime->tm_min;
|
|
|
|
pValues[2] = pTime->tm_hour;
|
|
|
|
pValues[3] = pTime->tm_mday;
|
|
|
|
pValues[4] = pTime->tm_mon;
|
|
|
|
pValues[5] = pTime->tm_year+1900;
|
|
|
|
pValues[6] = pTime->tm_wday;
|
|
|
|
pValues[7] = pTime->tm_yday;
|
2013-02-16 18:53:00 +00:00
|
|
|
}
|
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
int G_StartTrack(int const levelNum)
|
2013-02-16 18:53:18 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned)levelNum < MAXLEVELS)
|
2013-02-16 18:53:18 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int trackNum = MAXLEVELS*ud.volume_number + levelNum;
|
2013-02-16 18:53:18 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (g_mapInfo[trackNum].musicfn != NULL)
|
2013-02-16 18:53:18 +00:00
|
|
|
{
|
2013-03-03 16:06:40 +00:00
|
|
|
// Only set g_musicIndex on success.
|
2016-08-27 01:40:35 +00:00
|
|
|
g_musicIndex = trackNum;
|
2016-08-27 01:42:01 +00:00
|
|
|
S_PlayMusic(g_mapInfo[trackNum].musicfn);
|
2013-02-16 18:53:18 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
LUNATIC_EXTERN void G_ShowView(vec3_t vec, int32_t a, int32_t horiz, int32_t sect,
|
2013-06-07 14:26:32 +00:00
|
|
|
int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t unbiasedp)
|
|
|
|
{
|
|
|
|
if (g_screenCapture)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (offscreenrendering)
|
|
|
|
{
|
|
|
|
clearview(0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x1 > x2) swaplong(&x1,&x2);
|
|
|
|
if (y1 > y2) swaplong(&y1,&y2);
|
|
|
|
|
|
|
|
if (!unbiasedp)
|
|
|
|
{
|
|
|
|
// The showview command has a rounding bias towards zero,
|
|
|
|
// e.g. floor((319*1680)/320) == 1674
|
|
|
|
x1 = scale(x1,xdim,320);
|
|
|
|
y1 = scale(y1,ydim,200);
|
|
|
|
x2 = scale(x2,xdim,320);
|
|
|
|
y2 = scale(y2,ydim,200);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// This will map the maximum 320-based coordinate to the
|
|
|
|
// maximum real screen coordinate:
|
|
|
|
// floor((319*1679)/319) == 1679
|
|
|
|
x1 = scale(x1,xdim-1,319);
|
|
|
|
y1 = scale(y1,ydim-1,199);
|
|
|
|
x2 = scale(x2,xdim-1,319);
|
|
|
|
y2 = scale(y2,ydim-1,199);
|
|
|
|
}
|
|
|
|
|
|
|
|
horiz = clamp(horiz, HORIZ_MIN, HORIZ_MAX);
|
|
|
|
|
|
|
|
#ifdef USE_OPENGL
|
2016-08-27 01:40:06 +00:00
|
|
|
int const oprojhacks = glprojectionhacks;
|
2013-06-07 14:26:32 +00:00
|
|
|
glprojectionhacks = 0;
|
|
|
|
#endif
|
2016-08-27 01:40:06 +00:00
|
|
|
int const onewaspect = newaspect_enable;
|
|
|
|
newaspect_enable = r_usenewaspect;
|
|
|
|
setaspect_new_use_dimen = 1;
|
|
|
|
setview(x1,y1,x2,y2);
|
|
|
|
setaspect_new_use_dimen = 0;
|
|
|
|
newaspect_enable = onewaspect;
|
|
|
|
|
|
|
|
int const smoothratio = calc_smoothratio(totalclock, ototalclock);
|
2013-06-07 14:26:32 +00:00
|
|
|
G_DoInterpolations(smoothratio);
|
2015-03-24 00:40:55 +00:00
|
|
|
G_HandleMirror(vec.x, vec.y, vec.z, a, horiz, smoothratio);
|
2013-06-07 14:26:32 +00:00
|
|
|
#ifdef POLYMER
|
|
|
|
if (getrendermode() == REND_POLYMER)
|
2015-03-24 00:40:55 +00:00
|
|
|
polymer_setanimatesprites(G_DoSpriteAnimations, vec.x,vec.y,a,smoothratio);
|
2013-06-07 14:26:32 +00:00
|
|
|
#endif
|
|
|
|
yax_preparedrawrooms();
|
2015-03-24 00:40:55 +00:00
|
|
|
drawrooms(vec.x,vec.y,vec.z,a,horiz,sect);
|
2013-06-07 14:26:32 +00:00
|
|
|
yax_drawrooms(G_DoSpriteAnimations, sect, 0, smoothratio);
|
|
|
|
|
|
|
|
display_mirror = 2;
|
2015-03-24 00:40:55 +00:00
|
|
|
G_DoSpriteAnimations(vec.x,vec.y,a,smoothratio);
|
2013-06-07 14:26:32 +00:00
|
|
|
display_mirror = 0;
|
|
|
|
drawmasks();
|
|
|
|
G_RestoreInterpolations();
|
|
|
|
G_UpdateScreenArea();
|
|
|
|
#ifdef USE_OPENGL
|
|
|
|
glprojectionhacks = oprojhacks;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2013-01-19 18:29:00 +00:00
|
|
|
#if !defined LUNATIC
|
2014-11-22 12:29:25 +00:00
|
|
|
GAMEEXEC_STATIC void VM_Execute(int loop)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-01-01 13:23:29 +00:00
|
|
|
int32_t tw = *insptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
DukePlayer_t * const pPlayer = vm.pPlayer;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
// jump directly into the loop, saving us from the checks during the first iteration
|
|
|
|
goto skip_check;
|
|
|
|
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
while (loop)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.flags & (VM_RETURN | VM_KILL | VM_NOEXECUTE))
|
2015-01-11 04:56:10 +00:00
|
|
|
break;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
tw = *insptr;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
skip_check:
|
2009-06-19 01:10:10 +00:00
|
|
|
// Bsprintf(g_szBuf,"Parsing: %d",*insptr);
|
|
|
|
// AddLog(g_szBuf);
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
g_errorLineNum = tw>>12;
|
2015-01-11 04:56:10 +00:00
|
|
|
g_tw = tw &= VM_INSTMASK;
|
|
|
|
|
|
|
|
if (tw == CON_LEFTBRACE)
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
insptr++, loop++;
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (tw == CON_RIGHTBRACE)
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
insptr++, loop--;
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (tw == CON_ELSE)
|
|
|
|
{
|
|
|
|
insptr = (intptr_t *) *(insptr+1);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (tw == CON_STATE)
|
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
intptr_t const * const tempscrptr = insptr + 2;
|
2015-01-11 04:56:10 +00:00
|
|
|
insptr = (intptr_t *)*(insptr + 1);
|
|
|
|
VM_Execute(1);
|
|
|
|
insptr = tempscrptr;
|
|
|
|
continue;
|
|
|
|
}
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
switch (tw)
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
case CON_IFVARE:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw == *insptr);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_REDEFINEQUOTE:
|
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const strIndex = *insptr++;
|
|
|
|
int const XstrIndex = *insptr++;
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE((apStrings[strIndex] == NULL || apXStrings[XstrIndex] == NULL)))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("%d %d null quote\n", strIndex,XstrIndex);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[strIndex],apXStrings[XstrIndex]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETTHISPROJECTILE:
|
2015-03-25 06:27:25 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetActiveProjectile(spriteNum, labelNum));
|
2015-03-25 06:27:25 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETTHISPROJECTILE:
|
|
|
|
insptr++;
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
2015-03-25 06:27:25 +00:00
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetActiveProjectile(spriteNum, labelNum, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFRND:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(rnd(*(++insptr)));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFCANSHOOTTARGET:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.playerDist > 1024)
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
int16_t temphit;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((tw = A_CheckHitSprite(vm.spriteNum, &temphit)) == (1 << 30))
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(1);
|
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
int dist = 768;
|
2016-08-27 01:40:35 +00:00
|
|
|
int angDiff = 16;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->xrepeat > 56)
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:41:50 +00:00
|
|
|
dist = 3084;
|
2016-08-27 01:40:35 +00:00
|
|
|
angDiff = 48;
|
2015-01-11 04:56:10 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
#define CHECK(x) \
|
|
|
|
if (x >= 0 && sprite[x].picnum == vm.pSprite->picnum) \
|
|
|
|
{ \
|
|
|
|
VM_CONDITIONAL(0); \
|
|
|
|
continue; \
|
2016-08-27 01:40:35 +00:00
|
|
|
}
|
2016-08-27 01:41:50 +00:00
|
|
|
#define CHECK2(x) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
vm.pSprite->ang += x; \
|
|
|
|
tw = A_CheckHitSprite(vm.spriteNum, &temphit); \
|
|
|
|
vm.pSprite->ang -= x; \
|
2016-08-27 01:40:35 +00:00
|
|
|
} while (0)
|
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
if (tw > dist)
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CHECK(temphit);
|
2016-08-27 01:40:35 +00:00
|
|
|
CHECK2(angDiff);
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
if (tw > dist)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
CHECK(temphit);
|
2016-08-27 01:40:35 +00:00
|
|
|
CHECK2(-angDiff);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (tw > 768)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
CHECK(temphit);
|
2015-01-11 04:56:10 +00:00
|
|
|
VM_CONDITIONAL(1);
|
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-11-15 01:16:55 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(1);
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFCANSEETARGET:
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = cansee(vm.pSprite->x, vm.pSprite->y, vm.pSprite->z-((krand()&41)<<8),
|
|
|
|
vm.pSprite->sectnum, pPlayer->pos.x, pPlayer->pos.y,
|
|
|
|
pPlayer->pos.z/*-((krand()&41)<<8)*/, sprite[pPlayer->i].sectnum);
|
2015-01-11 04:56:10 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
2017-06-23 03:59:19 +00:00
|
|
|
if (tw) vm.pActor->timetosleep = SLEEPTIME;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFACTORNOTSTAYPUT:
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL(vm.pActor->actorstayput == -1);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFCANSEE:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
uspritetype *pSprite = (uspritetype *)&sprite[pPlayer->i];
|
2009-06-24 08:20:10 +00:00
|
|
|
|
|
|
|
// select sprite for monster to target
|
|
|
|
// if holoduke is on, let them target holoduke first.
|
|
|
|
//
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pPlayer->holoduke_on >= 0)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite = (uspritetype *)&sprite[pPlayer->holoduke_on];
|
2016-08-27 01:40:56 +00:00
|
|
|
tw = cansee(vm.pSprite->x,vm.pSprite->y,vm.pSprite->z-(krand()&(ZOFFSET5-1)),vm.pSprite->sectnum,
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite->x,pSprite->y,pSprite->z,pSprite->sectnum);
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (tw == 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2009-06-24 08:20:10 +00:00
|
|
|
// they can't see player's holoduke
|
|
|
|
// check for player...
|
2016-08-27 01:40:35 +00:00
|
|
|
pSprite = (uspritetype *)&sprite[pPlayer->i];
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-24 08:20:10 +00:00
|
|
|
// can they see player, (or player's holoduke)
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = cansee(vm.pSprite->x,vm.pSprite->y,vm.pSprite->z-(krand()&((47<<8))),vm.pSprite->sectnum,
|
|
|
|
pSprite->x,pSprite->y,pSprite->z-(24<<8),pSprite->sectnum);
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (tw == 0)
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2010-05-02 23:27:30 +00:00
|
|
|
// search around for target player
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
// also modifies 'target' x&y if found..
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 1;
|
2017-06-23 03:59:19 +00:00
|
|
|
if (A_FurthestVisiblePoint(vm.spriteNum,pSprite,&vm.pActor->lastv) == -1)
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 0;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// else, they did see it.
|
|
|
|
// save where we were looking...
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->lastv.x = pSprite->x;
|
|
|
|
vm.pActor->lastv.y = pSprite->y;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (tw && (vm.pSprite->statnum == STAT_ACTOR || vm.pSprite->statnum == STAT_STANDABLE))
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->timetosleep = SLEEPTIME;
|
2009-01-18 07:32:35 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFHITWEAPON:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(A_IncurDamage(vm.spriteNum) >= 0);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFSQUISHED:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(VM_CheckSquished());
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFDEAD:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.pSprite->extra <= 0);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_AI:
|
2009-01-18 07:32:35 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
//Following changed to use pointersizes
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_AI_ID(vm.pData) = *insptr++; // Ai
|
|
|
|
AC_ACTION_ID(vm.pData) = *(apScript + AC_AI_ID(vm.pData)); // Action
|
2013-02-03 12:48:17 +00:00
|
|
|
|
2013-06-30 20:38:48 +00:00
|
|
|
// NOTE: "if" check added in r1155. It used to be a pointer though.
|
2016-08-27 01:40:35 +00:00
|
|
|
if (AC_AI_ID(vm.pData))
|
|
|
|
AC_MOVE_ID(vm.pData) = *(apScript + AC_AI_ID(vm.pData) + 1); // move
|
2013-06-30 20:38:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->hitag = *(apScript + AC_AI_ID(vm.pData) + 2); // move flags
|
2013-06-30 20:38:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_COUNT(vm.pData) = 0;
|
|
|
|
AC_ACTION_COUNT(vm.pData) = 0;
|
|
|
|
AC_CURFRAME(vm.pData) = 0;
|
2012-03-11 17:37:50 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!A_CheckEnemySprite(vm.pSprite) || vm.pSprite->extra > 0) // hack
|
|
|
|
if (vm.pSprite->hitag&random_angle)
|
|
|
|
vm.pSprite->ang = krand()&2047;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ACTION:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_ACTION_COUNT(vm.pData) = 0;
|
|
|
|
AC_CURFRAME(vm.pData) = 0;
|
|
|
|
AC_ACTION_ID(vm.pData) = *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2013-05-23 18:28:04 +00:00
|
|
|
case CON_IFPLAYERSL:
|
|
|
|
VM_CONDITIONAL(numplayers < *(++insptr));
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFPDISTL:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.playerDist < *(++insptr));
|
2017-06-23 03:59:19 +00:00
|
|
|
if (vm.playerDist > MAXSLEEPDIST && vm.pActor->timetosleep == 0)
|
|
|
|
vm.pActor->timetosleep = SLEEPTIME;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-04-15 20:04:52 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFPDISTG:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.playerDist > *(++insptr));
|
2017-06-23 03:59:19 +00:00
|
|
|
if (vm.playerDist > MAXSLEEPDIST && vm.pActor->timetosleep == 0)
|
|
|
|
vm.pActor->timetosleep = SLEEPTIME;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-04-15 20:04:52 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDSTRENGTH:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->extra += *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_STRENGTH:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->extra = *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFGOTWEAPONCE:
|
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if ((g_gametypeFlags[ud.coop]&GAMETYPE_WEAPSTAY) && (g_netServer || ud.multimode > 1))
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
if (*insptr == 0)
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int j = 0;
|
2016-08-27 01:40:35 +00:00
|
|
|
for (; j < pPlayer->weapreccnt; ++j)
|
|
|
|
if (pPlayer->weaprecs[j] == vm.pSprite->picnum)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(j < pPlayer->weapreccnt && vm.pSprite->owner == vm.spriteNum);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (pPlayer->weapreccnt < MAX_WEAPONS)
|
2007-04-15 20:04:52 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->weaprecs[pPlayer->weapreccnt++] = vm.pSprite->picnum;
|
|
|
|
VM_CONDITIONAL(vm.pSprite->owner == vm.spriteNum);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2007-04-15 20:04:52 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(0);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GETLASTPAL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->picnum == APLAYER)
|
|
|
|
vm.pSprite->pal = g_player[P_GetP(vm.pSprite)].ps->palookup;
|
2009-06-19 01:10:10 +00:00
|
|
|
else
|
2007-04-15 20:04:52 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->pal == 1 && vm.pSprite->extra == 0) // hack for frozen
|
|
|
|
vm.pSprite->extra++;
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pSprite->pal = vm.pActor->tempang;
|
2007-04-15 20:04:52 +00:00
|
|
|
}
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->tempang = 0;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_TOSSWEAPON:
|
|
|
|
insptr++;
|
2013-12-28 17:04:31 +00:00
|
|
|
// NOTE: assumes that current actor is APLAYER
|
2016-08-27 01:40:35 +00:00
|
|
|
P_DropWeapon(P_GetP(vm.pSprite));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MIKESND:
|
2011-03-09 18:53:04 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(((unsigned)vm.pSprite->yvel >= MAXSOUNDS)))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", vm.pUSprite->yvel);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!S_CheckSoundPlaying(vm.spriteNum,vm.pSprite->yvel))
|
|
|
|
A_PlaySound(vm.pSprite->yvel,vm.spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_PKICK:
|
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((g_netServer || ud.multimode > 1) && vm.pSprite->picnum == APLAYER)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
if (g_player[otherp].ps->quick_kick == 0)
|
|
|
|
g_player[otherp].ps->quick_kick = 14;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (vm.pSprite->picnum != APLAYER && pPlayer->quick_kick == 0)
|
|
|
|
pPlayer->quick_kick = 14;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SIZETO:
|
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = (*insptr++ - vm.pSprite->xrepeat)<<1;
|
|
|
|
vm.pSprite->xrepeat += ksgn(tw);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((vm.pSprite->picnum == APLAYER && vm.pSprite->yrepeat < 36) || *insptr < vm.pSprite->yrepeat ||
|
2017-06-23 03:59:19 +00:00
|
|
|
((vm.pSprite->yrepeat*(tilesiz[vm.pSprite->picnum].y+8))<<2) < (vm.pActor->floorz - vm.pActor->ceilingz))
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = ((*insptr)-vm.pSprite->yrepeat)<<1;
|
|
|
|
if (klabs(tw)) vm.pSprite->yrepeat += ksgn(tw);
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SIZEAT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->xrepeat = (uint8_t)*insptr++;
|
|
|
|
vm.pSprite->yrepeat = (uint8_t)*insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SHOOT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_Shoot(vm.spriteNum,*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SOUNDONCE:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", (int32_t)*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!S_CheckSoundPlaying(vm.spriteNum, *insptr++))
|
|
|
|
A_PlaySound(*(insptr-1),vm.spriteNum);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-07-15 01:26:38 +00:00
|
|
|
case CON_IFACTORSOUND:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const soundNum = Gv_GetVarX(*insptr++);
|
2009-07-15 01:26:38 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum >= MAXSOUNDS))
|
2009-07-15 01:26:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", soundNum);
|
2009-07-15 01:26:38 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2009-07-15 01:26:38 +00:00
|
|
|
insptr--;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(A_CheckSoundPlaying(spriteNum, soundNum));
|
2009-07-15 01:26:38 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFSOUND:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", (int32_t)*insptr);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(S_CheckSoundPlaying(vm.spriteNum,*insptr));
|
|
|
|
// VM_DoConditional(SoundOwner[*insptr][0].ow == vm.spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_STOPSOUND:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
|
2008-08-11 10:17:18 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", (int32_t)*insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
2008-08-11 10:17:18 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (S_CheckSoundPlaying(vm.spriteNum,*insptr))
|
2009-07-24 02:31:34 +00:00
|
|
|
S_StopSound((int16_t)*insptr);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-07-15 01:26:38 +00:00
|
|
|
case CON_STOPACTORSOUND:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const soundNum = Gv_GetVarX(*insptr++);
|
2009-07-15 01:26:38 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum >= MAXSOUNDS))
|
2009-07-15 01:26:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", soundNum);
|
2009-07-15 01:26:38 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckSoundPlaying(spriteNum, soundNum))
|
|
|
|
S_StopEnvSound(soundNum, spriteNum);
|
2009-07-15 01:26:38 +00:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-11-03 23:08:54 +00:00
|
|
|
case CON_SETACTORSOUNDPITCH:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const soundNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const newPitch = Gv_GetVarX(*insptr++);
|
2011-11-03 23:08:54 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum>=MAXSOUNDS))
|
2011-11-03 23:08:54 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", soundNum);
|
2011-11-03 23:08:54 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
S_ChangeSoundPitch(soundNum, spriteNum, newPitch);
|
2011-11-03 23:08:54 +00:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GLOBALSOUND:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", (int32_t)*insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2016-08-27 01:42:01 +00:00
|
|
|
if (vm.playerNum == screenpeek || (g_gametypeFlags[ud.coop]&GAMETYPE_COOPSOUND)
|
2014-01-12 14:04:51 +00:00
|
|
|
#ifdef SPLITSCREEN_MOD_HACKS
|
2012-08-22 22:51:38 +00:00
|
|
|
|| (g_fakeMultiMode==2)
|
2014-01-12 14:04:51 +00:00
|
|
|
#endif
|
2012-08-13 18:26:06 +00:00
|
|
|
)
|
2009-07-15 01:26:38 +00:00
|
|
|
A_PlaySound(*insptr,g_player[screenpeek].ps->i);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-09-30 06:51:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SOUND:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", (int32_t)*insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
A_PlaySound(*insptr++,vm.spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_TIP:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->tipincs = GAMETICSPERSEC;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-12-13 21:01:33 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FALL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_Fall(vm.spriteNum, vm.pSprite);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-12-13 21:01:33 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RETURN:
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags |= VM_RETURN;
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ENDA:
|
|
|
|
case CON_BREAK:
|
|
|
|
case CON_ENDS:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
return;
|
2014-10-29 17:05:46 +00:00
|
|
|
case CON_NULLOP:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2014-10-29 17:05:46 +00:00
|
|
|
continue;
|
2012-08-10 19:11:47 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDAMMO:
|
2012-08-10 19:11:47 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const weaponNum = *insptr++;
|
|
|
|
int const addAmount = *insptr++;
|
2012-08-10 19:11:47 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS))
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum);
|
2012-08-10 19:11:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum])
|
2012-08-10 19:11:47 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags |= VM_NOEXECUTE;
|
2014-11-22 12:29:25 +00:00
|
|
|
return;
|
2012-08-10 19:11:47 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_AddWeaponAmmoCommon(pPlayer, weaponNum, addAmount);
|
2012-08-10 19:11:47 +00:00
|
|
|
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-12-13 21:01:33 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MONEY:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SpawnMultiple(vm.spriteNum, MONEY, *insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_MAIL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SpawnMultiple(vm.spriteNum, MAIL, *insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SLEEPTIME:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->timetosleep = (int16_t)*insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_PAPER:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SpawnMultiple(vm.spriteNum, PAPER, *insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ADDKILLS:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->actors_killed += *insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->actorstayput = -1;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_LOTSOFGLASS:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SpawnGlass(vm.spriteNum,*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_KILLIT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags |= VM_KILL;
|
2014-11-22 12:29:25 +00:00
|
|
|
return;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ADDWEAPON:
|
2012-08-10 19:11:47 +00:00
|
|
|
insptr++;
|
2008-12-13 21:01:33 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const weaponNum = *insptr++;
|
|
|
|
VM_AddWeapon(pPlayer, weaponNum, *insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-12-13 21:01:33 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DEBUG:
|
|
|
|
insptr++;
|
2017-06-05 10:05:12 +00:00
|
|
|
buildprint(*insptr++, "\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ENDOFGAME:
|
2013-05-23 18:28:04 +00:00
|
|
|
case CON_ENDOFLEVEL:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->timebeforeexit = *insptr++;
|
|
|
|
pPlayer->customexitsound = -1;
|
2009-06-19 01:10:10 +00:00
|
|
|
ud.eog = 1;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ADDPHEALTH:
|
|
|
|
insptr++;
|
|
|
|
|
2007-12-20 19:14:38 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pPlayer->newowner >= 0)
|
|
|
|
G_ClearCameraView(pPlayer);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int newHealth = sprite[pPlayer->i].extra;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->picnum != ATOMICHEALTH)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newHealth > pPlayer->max_player_health && *insptr > 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newHealth > 0)
|
|
|
|
newHealth += *insptr;
|
|
|
|
if (newHealth > pPlayer->max_player_health && *insptr > 0)
|
|
|
|
newHealth = pPlayer->max_player_health;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
}
|
2008-02-18 08:10:54 +00:00
|
|
|
else
|
2008-08-11 10:17:18 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newHealth > 0)
|
|
|
|
newHealth += *insptr;
|
|
|
|
if (newHealth > (pPlayer->max_player_health<<1))
|
|
|
|
newHealth = (pPlayer->max_player_health<<1);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (newHealth < 0) newHealth = 0;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
if (ud.god == 0)
|
|
|
|
{
|
|
|
|
if (*insptr > 0)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((newHealth - *insptr) < (pPlayer->max_player_health>>2) &&
|
|
|
|
newHealth >= (pPlayer->max_player_health>>2))
|
|
|
|
A_PlaySound(DUKE_GOTHEALTHATLOW,pPlayer->i);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->last_extra = newHealth;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
sprite[pPlayer->i].extra = newHealth;
|
2007-12-20 19:14:38 +00:00
|
|
|
}
|
|
|
|
}
|
2008-02-18 08:10:54 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_MOVE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_COUNT(vm.pData) = 0;
|
|
|
|
AC_MOVE_ID(vm.pData) = *insptr++;
|
|
|
|
vm.pSprite->hitag = *insptr++;
|
|
|
|
if (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->extra <= 0) // hack
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->hitag&random_angle)
|
|
|
|
vm.pSprite->ang = krand()&2047;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ADDWEAPONVAR:
|
|
|
|
insptr++;
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const weaponNum = Gv_GetVarX(*insptr++);
|
|
|
|
VM_AddWeapon(pPlayer, weaponNum, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case CON_SETASPECT:
|
2016-08-27 01:40:06 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const xRange = Gv_GetVarX(*insptr++);
|
|
|
|
setaspect(xRange, Gv_GetVarX(*insptr++));
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SSP:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const clipType = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2008-08-10 10:53:55 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sprite %d\n", spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
2008-08-10 10:53:55 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
A_SetSprite(spriteNum, clipType);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_ACTIVATEBYSECTOR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2008-08-10 10:53:55 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectNum);
|
2008-08-10 10:53:55 +00:00
|
|
|
break;
|
2016-08-27 01:40:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
G_ActivateBySector(sectNum, spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_OPERATESECTORS:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2016-08-27 01:40:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectNum);
|
2008-08-10 10:53:55 +00:00
|
|
|
break;
|
2016-08-27 01:40:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
G_OperateSectors(sectNum, spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_OPERATEACTIVATORS:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const nTag = Gv_GetVarX(*insptr++);
|
|
|
|
int const playerNum = (*insptr++ == g_thisActorVarID) ? vm.playerNum : Gv_GetVarX(*(insptr-1));
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers))
|
2016-08-27 01:40:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid player %d\n", playerNum);
|
2009-01-13 04:40:56 +00:00
|
|
|
break;
|
2008-08-10 10:53:55 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
G_OperateActivators(nTag, playerNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CANSEESPR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const nSprite1 = Gv_GetVarX(*insptr++);
|
|
|
|
int const nSprite2 = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:35 +00:00
|
|
|
int nResult = 0;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)nSprite1 >= MAXSPRITES || (unsigned)nSprite2 >= MAXSPRITES))
|
|
|
|
CON_ERRPRINTF("Invalid sprite %d\n", (unsigned)nSprite1 >= MAXSPRITES ? nSprite1 : nSprite2);
|
2015-03-24 00:40:55 +00:00
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
nResult = cansee(sprite[nSprite1].x, sprite[nSprite1].y, sprite[nSprite1].z, sprite[nSprite1].sectnum,
|
|
|
|
sprite[nSprite2].x, sprite[nSprite2].y, sprite[nSprite2].z, sprite[nSprite2].sectnum);
|
2008-08-10 10:53:55 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
Gv_SetVarX(*insptr++, nResult);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case CON_OPERATERESPAWNS:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
insptr++;
|
|
|
|
G_OperateRespawns(Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_OPERATEMASTERSWITCHES:
|
|
|
|
insptr++;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
G_OperateMasterSwitches(Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
case CON_CHECKACTIVATORMOTION:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = G_CheckActivatorMotion(Gv_GetVarX(*insptr++));
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
continue;
|
2008-12-19 00:53:54 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_INSERTSPRITEQ:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
A_AddToDeleteQueue(vm.spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-12-19 00:53:54 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QSTRLEN:
|
|
|
|
insptr++;
|
2009-01-04 22:22:33 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const quoteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[quoteNum] == NULL))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("null quote %d\n", quoteNum);
|
|
|
|
Gv_SetVarX(gameVar, -1);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, Bstrlen(apStrings[quoteNum]));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-04 22:22:33 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2013-06-01 06:55:00 +00:00
|
|
|
case CON_QSTRDIM:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t dim = { 0, 0, };
|
|
|
|
int const widthVar = *insptr++;
|
|
|
|
int const heightVar = *insptr++;
|
|
|
|
int32_t params[16];
|
2013-06-01 06:55:00 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(16, params);
|
2013-06-01 06:55:00 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const tileNum = params[0];
|
|
|
|
vec3_t vect = { params[1], params[2], params[3] };
|
|
|
|
int const blockAngle = params[4];
|
|
|
|
int const quoteNum = params[5];
|
|
|
|
int const orientation = params[6] & (ROTATESPRITE_MAX - 1);
|
|
|
|
vec2_t offset = { params[7], params[8] };
|
|
|
|
vec2_t between = { params[9], params[10] };
|
|
|
|
int const f = params[11];
|
|
|
|
vec2_t upperLeft = { params[12], params[13] };
|
|
|
|
vec2_t lowerRight = { params[14], params[15] };
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE(tileNum < 0 || tileNum + 255 >= MAXTILES))
|
|
|
|
CON_ERRPRINTF("invalid base tilenum %d\n", tileNum);
|
|
|
|
else if (EDUKE32_PREDICT_FALSE((unsigned)quoteNum >= MAXQUOTES || apStrings[quoteNum] == NULL))
|
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", quoteNum);
|
2013-06-01 06:55:00 +00:00
|
|
|
else
|
2017-06-23 03:58:54 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
dim = G_ScreenTextSize(tileNum, vect.x, vect.y, vect.z, blockAngle, apStrings[quoteNum],
|
2017-06-23 03:58:54 +00:00
|
|
|
2 | orientation, offset.x, offset.y, between.x, between.y, f,
|
|
|
|
upperLeft.x, upperLeft.y, lowerRight.x, lowerRight.y);
|
2013-06-01 06:55:00 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
Gv_SetVarX(widthVar, dim.x);
|
|
|
|
Gv_SetVarX(heightVar, dim.y);
|
|
|
|
}
|
2013-06-01 06:55:00 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_HEADSPRITESTAT:
|
|
|
|
insptr++;
|
2009-01-04 22:22:33 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum > MAXSTATUS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid status list %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, headspritestat[spriteNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-04 22:22:33 +00:00
|
|
|
}
|
2008-09-30 17:27:23 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_PREVSPRITESTAT:
|
|
|
|
insptr++;
|
2009-01-04 22:22:33 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2008-09-01 07:15:16 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-09-01 07:15:16 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, prevspritestat[spriteNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-04 22:22:33 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_NEXTSPRITESTAT:
|
|
|
|
insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, nextspritestat[spriteNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_HEADSPRITESECT:
|
|
|
|
insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
2017-06-23 03:58:54 +00:00
|
|
|
int const sectNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2017-06-23 03:58:54 +00:00
|
|
|
CON_ERRPRINTF("invalid sector %d\n", sectNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
Gv_SetVarX(gameVar, headspritesect[sectNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_PREVSPRITESECT:
|
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, prevspritesect[spriteNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_NEXTSPRITESECT:
|
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const gameVar = *insptr++;
|
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(gameVar, nextspritesect[spriteNum]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETKEYNAME:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const quoteIndex = Gv_GetVarX(*insptr++);
|
|
|
|
int const gameFunc = Gv_GetVarX(*insptr++);
|
|
|
|
int const funcPos = Gv_GetVarX(*insptr++);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)quoteIndex >= MAXQUOTES || apStrings[quoteIndex] == NULL))
|
2012-11-17 16:48:11 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", quoteIndex);
|
2012-11-17 16:48:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (EDUKE32_PREDICT_FALSE((unsigned)gameFunc >= NUMGAMEFUNCTIONS))
|
2012-11-17 16:48:11 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid function %d\n", gameFunc);
|
2012-11-17 16:48:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
else
|
2008-08-24 19:09:17 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (funcPos < 2)
|
|
|
|
Bstrcpy(tempbuf, KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][funcPos]));
|
2009-06-19 01:10:10 +00:00
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(tempbuf, KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][0]));
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
if (!*tempbuf)
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(tempbuf, KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][1]));
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-08-24 19:09:17 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
if (*tempbuf)
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[quoteIndex], tempbuf);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QSUBSTR:
|
|
|
|
insptr++;
|
2006-11-16 03:02:42 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[4];
|
|
|
|
|
|
|
|
Gv_GetManyVars(4, params);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const outputQuote = params[0];
|
|
|
|
int const inputQuote = params[1];
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)outputQuote>=MAXQUOTES || apStrings[outputQuote] == NULL))
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", outputQuote);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)inputQuote>=MAXQUOTES || apStrings[inputQuote] == NULL))
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", inputQuote);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int quotePos = params[2];
|
|
|
|
int quoteLength = params[3];
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)quotePos >= MAXQUOTELEN))
|
2014-08-31 11:15:22 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid start position %d\n", quotePos);
|
2014-08-31 11:15:22 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(quoteLength < 0))
|
2014-08-31 11:15:22 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid length %d\n", quoteLength);
|
2014-08-31 11:15:22 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
char * pOutput = apStrings[outputQuote];
|
|
|
|
char const *pInput = apStrings[inputQuote];
|
2009-06-24 08:20:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
while (*pInput && quotePos--) pInput++;
|
|
|
|
while ((*pOutput = *pInput) && quoteLength--)
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pOutput++;
|
|
|
|
pInput++;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
*pOutput = 0;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2006-11-13 23:12:47 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETPNAME:
|
2009-07-12 01:55:34 +00:00
|
|
|
case CON_QSTRNCAT:
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QSTRCAT:
|
|
|
|
case CON_QSTRCPY:
|
|
|
|
case CON_QGETSYSSTR:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int32_t i = Gv_GetVarX(*insptr++), j;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (tw == CON_GETPNAME && *insptr == g_thisActorVarID)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
j = vm.playerNum;
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
|
|
|
}
|
|
|
|
else j = Gv_GetVarX(*insptr++);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
switch (tw)
|
|
|
|
{
|
|
|
|
case CON_GETPNAME:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)i>=MAXQUOTES || apStrings[i] == NULL))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", i);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (g_player[j].user_name[0])
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],g_player[j].user_name);
|
|
|
|
else Bsprintf(apStrings[i],"%d",j);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case CON_QGETSYSSTR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)i>=MAXQUOTES || apStrings[i] == NULL))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", i);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (j)
|
|
|
|
{
|
|
|
|
case STR_MAPNAME:
|
|
|
|
case STR_MAPFILENAME:
|
2014-03-16 14:37:54 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t levelNum = ud.volume_number*MAXLEVELS + ud.level_number;
|
|
|
|
const char *pName;
|
2014-03-16 14:37:54 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)levelNum >= ARRAY_SIZE(g_mapInfo)))
|
2014-03-16 14:37:54 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("out of bounds map number (vol=%d, lev=%d)\n",
|
|
|
|
ud.volume_number, ud.level_number);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
pName = j == STR_MAPNAME ? g_mapInfo[levelNum].name : g_mapInfo[levelNum].filename;
|
2016-08-27 01:40:35 +00:00
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE(pName == NULL))
|
2014-03-16 14:37:54 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("attempted access to %s of non-existent map (vol=%d, lev=%d)",
|
|
|
|
j==STR_MAPNAME ? "name" : "file name",
|
|
|
|
ud.volume_number, ud.level_number);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
Bstrcpy(apStrings[i], j==STR_MAPNAME ? g_mapInfo[levelNum].name : g_mapInfo[levelNum].filename);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2014-03-16 14:37:54 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
case STR_PLAYERNAME:
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.playerNum >= (unsigned)g_mostConcurrentPlayers))
|
2014-03-16 14:37:54 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid player ID %d\n", vm.playerNum);
|
2014-03-16 14:37:54 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],g_player[vm.playerNum].user_name);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case STR_VERSION:
|
2011-03-04 09:29:03 +00:00
|
|
|
Bsprintf(tempbuf,HEAD2 " %s",s_buildRev);
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],tempbuf);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case STR_GAMETYPE:
|
2016-08-27 01:42:01 +00:00
|
|
|
Bstrcpy(apStrings[i],g_gametypeNames[ud.coop]);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case STR_VOLUMENAME:
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)ud.volume_number >= MAXVOLUMES))
|
2014-03-16 14:37:54 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("invalid volume (%d)\n", ud.volume_number);
|
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:42:01 +00:00
|
|
|
Bstrcpy(apStrings[i],g_volumeNames[ud.volume_number]);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2015-02-08 08:03:50 +00:00
|
|
|
case STR_YOURTIME:
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],G_PrintYourTime());
|
2015-02-08 08:03:50 +00:00
|
|
|
break;
|
|
|
|
case STR_PARTIME:
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],G_PrintParTime());
|
2015-02-08 08:03:50 +00:00
|
|
|
break;
|
|
|
|
case STR_DESIGNERTIME:
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],G_PrintDesignerTime());
|
2015-02-08 08:03:50 +00:00
|
|
|
break;
|
|
|
|
case STR_BESTTIME:
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],G_PrintBestTime());
|
2015-02-08 08:03:50 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
default:
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("unknown str ID %d %d\n", i,j);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CON_QSTRCAT:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[i] == NULL || apStrings[j] == NULL)) goto nullquote;
|
|
|
|
Bstrncat(apStrings[i],apStrings[j],(MAXQUOTELEN-1)-Bstrlen(apStrings[i]));
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2009-07-12 01:55:34 +00:00
|
|
|
case CON_QSTRNCAT:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[i] == NULL || apStrings[j] == NULL)) goto nullquote;
|
|
|
|
Bstrncat(apStrings[i],apStrings[j],Gv_GetVarX(*insptr++));
|
2009-07-12 01:55:34 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QSTRCPY:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[i] == NULL || apStrings[j] == NULL)) goto nullquote;
|
2013-02-21 18:53:42 +00:00
|
|
|
if (i != j)
|
2016-08-27 01:40:35 +00:00
|
|
|
Bstrcpy(apStrings[i],apStrings[j]);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2009-07-12 01:55:34 +00:00
|
|
|
default:
|
|
|
|
nullquote:
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("null quote %d\n", apStrings[i] ? j : i);
|
2009-07-12 01:55:34 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2017-06-23 03:58:54 +00:00
|
|
|
case CON_CHANGESPRITESECT:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int32_t const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int32_t sectNum = Gv_GetVarX(*insptr++);
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
|
|
|
{
|
|
|
|
CON_ERRPRINTF("Invalid sprite: %d\n", spriteNum);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= MAXSECTORS))
|
|
|
|
{
|
|
|
|
CON_ERRPRINTF("Invalid sector: %d\n", sectNum);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sprite[spriteNum].sectnum == sectNum)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
changespritesect(spriteNum, sectNum);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CHANGESPRITESTAT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
int32_t statNum = Gv_GetVarX(*insptr++);
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sprite: %d\n", spriteNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)statNum >= MAXSTATUS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid statnum: %d\n", statNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].statnum == statNum)
|
2013-06-30 20:38:48 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
/* initialize actor data when changing to an actor statnum because there's usually
|
|
|
|
garbage left over from being handled as a hard coded object */
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].statnum > STAT_ZOMBIEACTOR && (statNum == STAT_ACTOR || statNum == STAT_ZOMBIEACTOR))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
actor_t * const pActor = &actor[spriteNum];
|
|
|
|
|
|
|
|
Bmemset(&pActor->t_data, 0, sizeof pActor->t_data);
|
2017-06-23 03:59:19 +00:00
|
|
|
pActor->lastv.x = 0;
|
|
|
|
pActor->lastv.y = 0;
|
2016-08-27 01:40:35 +00:00
|
|
|
pActor->timetosleep = 0;
|
|
|
|
pActor->cgg = 0;
|
|
|
|
pActor->movflag = 0;
|
|
|
|
pActor->tempang = 0;
|
|
|
|
pActor->dispicnum = 0;
|
|
|
|
pActor->flags = 0;
|
|
|
|
sprite[spriteNum].hitag = 0;
|
|
|
|
|
|
|
|
if (G_HaveActor(sprite[spriteNum].picnum))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
const intptr_t *actorptr = g_tile[sprite[spriteNum].picnum].execPtr;
|
2011-12-21 18:40:47 +00:00
|
|
|
// offsets
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_ACTION_ID(pActor->t_data) = actorptr[1];
|
|
|
|
AC_MOVE_ID(pActor->t_data) = actorptr[2];
|
|
|
|
AC_MOVFLAGS(&sprite[spriteNum], &actor[spriteNum]) = actorptr[3]; // ai bits (movflags)
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
}
|
2013-06-30 20:38:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
changespritestat(spriteNum, statNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-24 19:09:17 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_STARTLEVEL:
|
|
|
|
insptr++; // skip command
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
// from 'level' cheat in game.c (about line 6250)
|
2016-08-27 01:40:35 +00:00
|
|
|
int const volumeNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const levelNum = Gv_GetVarX(*insptr++);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)volumeNum >= MAXVOLUMES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid volume (%d)\n", volumeNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)levelNum >= MAXLEVELS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid level (%d)\n", levelNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
ud.m_volume_number = ud.volume_number = volumeNum;
|
|
|
|
ud.m_level_number = ud.level_number = levelNum;
|
2012-10-28 22:27:53 +00:00
|
|
|
//if (numplayers > 1 && g_netServer)
|
|
|
|
// Net_NewGame(volnume,levnume);
|
|
|
|
//else
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
|
|
|
g_player[myconnectindex].ps->gm |= MODE_EOL;
|
|
|
|
ud.display_bonus_screen = 0;
|
|
|
|
} // MODE_RESTART;
|
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-12-12 17:42:14 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MYOSX:
|
|
|
|
case CON_MYOSPALX:
|
|
|
|
case CON_MYOS:
|
|
|
|
case CON_MYOSPAL:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t values[5];
|
|
|
|
Gv_GetManyVars(5, values);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const pos = *(vec2_t *)values;
|
|
|
|
int const tilenum = values[2];
|
|
|
|
int const shade = values[3];
|
|
|
|
int const orientation = values[4];
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
switch (tw)
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
case CON_MYOS:
|
2016-02-13 21:05:57 +00:00
|
|
|
VM_DrawTile(pos.x, pos.y, tilenum, shade, orientation);
|
2015-03-24 00:40:55 +00:00
|
|
|
break;
|
|
|
|
case CON_MYOSPAL:
|
2016-02-13 21:05:57 +00:00
|
|
|
VM_DrawTilePal(pos.x, pos.y, tilenum, shade, orientation, Gv_GetVarX(*insptr++));
|
2015-03-24 00:40:55 +00:00
|
|
|
break;
|
|
|
|
case CON_MYOSX:
|
2016-02-13 21:05:57 +00:00
|
|
|
VM_DrawTileSmall(pos.x, pos.y, tilenum, shade, orientation);
|
2015-03-24 00:40:55 +00:00
|
|
|
break;
|
|
|
|
case CON_MYOSPALX:
|
2016-02-13 21:05:57 +00:00
|
|
|
VM_DrawTilePalSmall(pos.x, pos.y, tilenum, shade, orientation, Gv_GetVarX(*insptr++));
|
2015-03-24 00:40:55 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SWITCH:
|
2015-01-11 04:56:10 +00:00
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
// command format:
|
|
|
|
// variable ID to check
|
|
|
|
// script offset to 'end'
|
|
|
|
// count of case statements
|
|
|
|
// script offset to default case (null if none)
|
|
|
|
// For each case: value, ptr to code
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t const lValue = Gv_GetVarX(*insptr++), lEnd = *insptr++, lCases = *insptr++;
|
2016-01-21 19:35:19 +00:00
|
|
|
intptr_t const * const lpDefault = insptr++;
|
|
|
|
intptr_t const * const lpCases = insptr;
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t left = 0, right = lCases - 1;
|
2015-01-11 04:56:10 +00:00
|
|
|
insptr += lCases << 1;
|
|
|
|
|
|
|
|
do
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const lCheckCase = (left + right) >> 1;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
if (lpCases[lCheckCase << 1] > lValue)
|
|
|
|
right = lCheckCase - 1;
|
|
|
|
else if (lpCases[lCheckCase << 1] < lValue)
|
|
|
|
left = lCheckCase + 1;
|
|
|
|
else if (lpCases[lCheckCase << 1] == lValue)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
|
|
|
// fake a 2-d Array
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = (intptr_t *)(lpCases[(lCheckCase << 1) + 1] + &apScript[0]);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_Execute(1);
|
2015-01-11 04:56:10 +00:00
|
|
|
goto matched;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
if (right - left < 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
while (1);
|
|
|
|
|
|
|
|
if (*lpDefault)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = (intptr_t *)(*lpDefault + &apScript[0]);
|
2015-01-11 04:56:10 +00:00
|
|
|
VM_Execute(1);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
matched:
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = (intptr_t *)(lEnd + (intptr_t)&apScript[0]);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ENDSWITCH:
|
2015-03-29 02:39:49 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ENDEVENT:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
return;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DISPLAYRAND:
|
|
|
|
insptr++;
|
2011-11-05 12:13:50 +00:00
|
|
|
Gv_SetVarX(*insptr++, system_15bit_rand());
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DRAGPOINT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:41:33 +00:00
|
|
|
int const wallNum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
vec2_t n;
|
|
|
|
|
|
|
|
Gv_GetManyVars(2, (int32_t *)&n);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:41:33 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)wallNum >= (unsigned)numwalls))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:41:33 +00:00
|
|
|
CON_ERRPRINTF("Invalid wall %d\n", wallNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:41:33 +00:00
|
|
|
dragpoint(wallNum, n.x, n.y, 0);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_LDIST:
|
|
|
|
insptr++;
|
2008-08-10 13:07:07 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const out = *insptr++;
|
|
|
|
vec2_t in;
|
|
|
|
|
|
|
|
Gv_GetManyVars(2, (int32_t *) &in);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)in.x >= MAXSPRITES || (unsigned)in.y >= MAXSPRITES))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite %d %d\n", in.x, in.y);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_SetVarX(out, ldist(&sprite[in.x], &sprite[in.y]));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case CON_DIST:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const out = *insptr++;
|
|
|
|
vec2_t in;
|
2009-06-24 08:20:10 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *) &in);
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)in.x >= MAXSPRITES || (unsigned)in.y >= MAXSPRITES))
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite %d %d\n", in.x, in.y);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_SetVarX(out, dist(&sprite[in.x], &sprite[in.y]));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-10 13:07:07 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GETANGLE:
|
|
|
|
insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const out = *insptr++;
|
|
|
|
vec2_t in;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *)&in);
|
|
|
|
Gv_SetVarX(out, getangle(in.x, in.y));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case CON_GETINCANGLE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const out = *insptr++;
|
|
|
|
vec2_t in;
|
2009-06-24 08:20:10 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *)&in);
|
|
|
|
Gv_SetVarX(out, G_GetAngleDelta(in.x, in.y));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MULSCALE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const out = *insptr++;
|
|
|
|
vec3_t in;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(3, (int32_t *)&in);
|
|
|
|
Gv_SetVarX(out, mulscale(in.x, in.y, in.z));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2016-10-20 06:26:10 +00:00
|
|
|
case CON_DIVSCALE:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int const out = *insptr++;
|
|
|
|
vec3_t in;
|
|
|
|
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&in);
|
|
|
|
Gv_SetVarX(out, divscale(in.x, in.y, in.z));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_SCALEVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int const out = *insptr++;
|
|
|
|
vec3_t in;
|
|
|
|
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&in);
|
|
|
|
Gv_SetVarX(out, scale(in.x, in.y, in.z));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_INITTIMER:
|
|
|
|
insptr++;
|
2013-02-16 18:52:56 +00:00
|
|
|
G_InitTimer(Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-22 01:25:35 +00:00
|
|
|
|
2016-02-07 02:38:32 +00:00
|
|
|
case CON_NEXTSECTORNEIGHBORZ:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int32_t params[4];
|
|
|
|
Gv_GetManyVars(4, params);
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = nextsectorneighborz(params[0], params[1], params[2], params[3]);
|
2016-02-07 02:38:32 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2016-01-21 19:35:34 +00:00
|
|
|
case CON_MOVESECTOR:
|
|
|
|
insptr++;
|
|
|
|
A_MoveSector(Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_TIME:
|
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ESPAWNVAR:
|
|
|
|
case CON_EQSPAWNVAR:
|
|
|
|
case CON_QSPAWNVAR:
|
|
|
|
insptr++;
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2016-08-27 01:41:33 +00:00
|
|
|
int const tileNum = Gv_GetVarX(*insptr++);
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", vm.pUSprite->sectnum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:41:33 +00:00
|
|
|
int const spriteNum = A_Spawn(vm.spriteNum, tileNum);
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
switch (tw)
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_EQSPAWNVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum != -1)
|
|
|
|
A_AddToDeleteQueue(spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_ESPAWNVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = spriteNum;
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
case CON_QSPAWNVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum != -1)
|
|
|
|
A_AddToDeleteQueue(spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ESPAWN:
|
|
|
|
case CON_EQSPAWN:
|
|
|
|
case CON_QSPAWN:
|
|
|
|
insptr++;
|
2008-08-10 13:07:07 +00:00
|
|
|
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("invalid sector %d\n", vm.pUSprite->sectnum);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = A_Spawn(vm.spriteNum,*insptr++);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
switch (tw)
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_EQSPAWN:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum != -1)
|
|
|
|
A_AddToDeleteQueue(spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_ESPAWN:
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = spriteNum;
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
case CON_QSPAWN:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum != -1)
|
|
|
|
A_AddToDeleteQueue(spriteNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-10 13:07:07 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ESHOOT:
|
|
|
|
case CON_EZSHOOT:
|
|
|
|
case CON_ZSHOOT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2013-06-30 20:38:50 +00:00
|
|
|
// NOTE: (int16_t) cast because we want to exclude that
|
|
|
|
// SHOOT_HARDCODED_ZVEL is passed.
|
2015-03-24 00:40:55 +00:00
|
|
|
int const zvel = (tw == CON_ESHOOT) ?
|
2013-02-07 21:01:12 +00:00
|
|
|
SHOOT_HARDCODED_ZVEL : (int16_t)Gv_GetVarX(*insptr++);
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", vm.pUSprite->sectnum);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = A_ShootWithZvel(vm.spriteNum,*insptr++,zvel);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
if (tw != CON_ZSHOOT)
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = spriteNum;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-10 13:07:07 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SHOOTVAR:
|
|
|
|
case CON_ESHOOTVAR:
|
2010-05-02 23:27:30 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int j = Gv_GetVarX(*insptr++);
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= (unsigned)numsectors))
|
2010-05-02 23:27:30 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", vm.pUSprite->sectnum);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
j = A_Shoot(vm.spriteNum, j);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
if (tw == CON_ESHOOTVAR)
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = j;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_EZSHOOTVAR:
|
|
|
|
case CON_ZSHOOTVAR:
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const zvel = (int16_t)Gv_GetVarX(*insptr++);
|
|
|
|
int j = Gv_GetVarX(*insptr++);
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= (unsigned)numsectors))
|
2010-05-02 23:27:30 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", vm.pUSprite->sectnum);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
j = A_ShootWithZvel(vm.spriteNum, j, zvel);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
if (tw == CON_EZSHOOTVAR)
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = j;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CMENU:
|
2008-06-29 10:40:37 +00:00
|
|
|
insptr++;
|
2016-11-01 01:35:32 +00:00
|
|
|
Menu_Change(Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SOUNDVAR:
|
|
|
|
case CON_STOPSOUNDVAR:
|
|
|
|
case CON_SOUNDONCEVAR:
|
|
|
|
case CON_GLOBALSOUNDVAR:
|
2013-06-28 14:07:46 +00:00
|
|
|
case CON_SCREENSOUND:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const soundNum = Gv_GetVarX(*insptr++);
|
2007-03-11 00:47:32 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum>=MAXSOUNDS))
|
2010-05-02 23:27:30 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sound %d\n", soundNum);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
switch (tw)
|
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
case CON_SOUNDONCEVAR: // falls through to CON_SOUNDVAR
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!S_CheckSoundPlaying(vm.spriteNum, soundNum))
|
2015-01-11 04:56:10 +00:00
|
|
|
case CON_SOUNDVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
A_PlaySound((int16_t)soundNum, vm.spriteNum);
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
|
|
|
case CON_GLOBALSOUNDVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
A_PlaySound((int16_t)soundNum, g_player[screenpeek].ps->i);
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
|
|
|
case CON_STOPSOUNDVAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (S_CheckSoundPlaying(vm.spriteNum, soundNum))
|
|
|
|
S_StopSound((int16_t)soundNum);
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
|
|
|
case CON_SCREENSOUND:
|
2016-08-27 01:40:35 +00:00
|
|
|
A_PlaySound(soundNum, -1);
|
2015-01-11 04:56:10 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-13 01:28:50 +00:00
|
|
|
|
2015-02-22 22:14:39 +00:00
|
|
|
case CON_STARTCUTSCENE:
|
2015-02-11 05:22:07 +00:00
|
|
|
case CON_IFCUTSCENE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const nQuote = Gv_GetVarX(*insptr++);
|
2015-02-11 05:22:07 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)nQuote >= MAXQUOTES || apStrings[nQuote] == NULL))
|
2015-02-11 05:22:07 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d for anim!\n", nQuote);
|
2015-02-11 05:22:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tw == CON_IFCUTSCENE)
|
|
|
|
{
|
2016-02-13 21:06:34 +00:00
|
|
|
insptr--;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(g_animPtr == Anim_Find(apStrings[nQuote]));
|
2015-02-11 05:22:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = pPlayer->palette;
|
|
|
|
Anim_Play(apStrings[nQuote]);
|
|
|
|
P_SetGamePalette(pPlayer, tw, 2 + 16);
|
2015-02-11 05:22:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GUNIQHUDID:
|
|
|
|
insptr++;
|
2008-08-09 10:43:27 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= MAXUNIQHUDID - 1))
|
|
|
|
CON_ERRPRINTF("Invalid ID %d\n", tw);
|
|
|
|
else
|
|
|
|
guniqhudid = tw;
|
2014-10-25 03:36:34 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 10:43:27 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SAVEGAMEVAR:
|
|
|
|
case CON_READGAMEVAR:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t nValue = 0;
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
|
|
|
if (ud.config.scripthandle < 0)
|
2008-08-09 10:43:27 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 10:43:27 +00:00
|
|
|
}
|
2009-06-24 08:20:10 +00:00
|
|
|
switch (tw)
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
case CON_SAVEGAMEVAR:
|
|
|
|
nValue = Gv_GetVarX(*insptr);
|
|
|
|
SCRIPT_PutNumber(ud.config.scripthandle, "Gamevars", aGameVars[*insptr++].szLabel, nValue, FALSE, FALSE);
|
|
|
|
break;
|
|
|
|
case CON_READGAMEVAR:
|
|
|
|
SCRIPT_GetNumber(ud.config.scripthandle, "Gamevars", aGameVars[*insptr].szLabel, &nValue);
|
|
|
|
Gv_SetVarX(*insptr++, nValue);
|
|
|
|
break;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2007-02-13 01:28:50 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SHOWVIEW:
|
2012-03-31 11:22:00 +00:00
|
|
|
case CON_SHOWVIEWUNBIASED:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
vec3_t vec;
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&vec);
|
|
|
|
|
|
|
|
int32_t params[3];
|
|
|
|
Gv_GetManyVars(3, params);
|
|
|
|
|
|
|
|
vec2_t scrn[2];
|
|
|
|
Gv_GetManyVars(4, (int32_t *)scrn);
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE(scrn[0].x < 0 || scrn[0].y < 0 || scrn[1].x >= 320 || scrn[1].y >= 200))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("incorrect coordinates\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2013-06-07 14:26:32 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)params[2] >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", params[2]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
G_ShowView(vec, params[0], params[1], params[2], scrn[0].x, scrn[0].y, scrn[1].x, scrn[1].y, (tw != CON_SHOWVIEW));
|
2007-03-11 00:47:32 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2013-03-25 04:33:03 +00:00
|
|
|
case CON_ROTATESPRITEA:
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ROTATESPRITE16:
|
|
|
|
case CON_ROTATESPRITE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[8];
|
|
|
|
|
|
|
|
Gv_GetManyVars(8, params);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
vec3_t pos = *(vec3_t *)params;
|
|
|
|
int const ang = params[3];
|
|
|
|
int const tilenum = params[4];
|
|
|
|
int const shade = params[5];
|
|
|
|
int const pal = params[6];
|
|
|
|
int orientation = params[7] & (ROTATESPRITE_MAX - 1);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2013-03-25 04:33:03 +00:00
|
|
|
int32_t alpha = (tw == CON_ROTATESPRITEA) ? Gv_GetVarX(*insptr++) : 0;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
vec2_t scrn[2];
|
2016-08-27 01:40:06 +00:00
|
|
|
Gv_GetManyVars(4, (int32_t *) scrn);
|
2014-04-09 18:51:35 +00:00
|
|
|
|
2013-03-25 04:33:03 +00:00
|
|
|
if (tw != CON_ROTATESPRITE16 && !(orientation&ROTATESPRITE_FULL16))
|
2010-05-02 23:27:30 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
pos.x <<= 16;
|
|
|
|
pos.y <<= 16;
|
2010-05-02 23:27:30 +00:00
|
|
|
}
|
2010-03-01 03:04:57 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned) tilenum >= MAXTILES))
|
2011-10-30 19:46:51 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid tilenum %d\n", tilenum);
|
2011-10-30 19:46:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t blendidx = 0;
|
2012-08-19 12:57:57 +00:00
|
|
|
|
2014-04-09 18:51:35 +00:00
|
|
|
NEG_ALPHA_TO_BLEND(alpha, blendidx, orientation);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
rotatesprite_(pos.x, pos.y, pos.z, ang, tilenum, shade, pal, 2 | orientation, alpha, blendidx,
|
2015-03-24 00:40:55 +00:00
|
|
|
scrn[0].x, scrn[0].y, scrn[1].x, scrn[1].y);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GAMETEXT:
|
|
|
|
case CON_GAMETEXTZ:
|
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[11];
|
|
|
|
Gv_GetManyVars(11, params);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int const tilenum = params[0];
|
|
|
|
vec2_t const pos = { params[1], params[2] };
|
|
|
|
int const nQuote = params[3];
|
|
|
|
int const shade = params[4];
|
|
|
|
int const pal = params[5];
|
|
|
|
int const orientation = params[6] & (ROTATESPRITE_MAX - 1);
|
|
|
|
vec2_t const bound1 = *(vec2_t *)¶ms[7];
|
|
|
|
vec2_t const bound2 = *(vec2_t *)¶ms[9];
|
|
|
|
int32_t z = (tw == CON_GAMETEXTZ) ? Gv_GetVarX(*insptr++) : 65536;
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(tilenum < 0 || tilenum + 255 >= MAXTILES))
|
2011-10-30 19:46:51 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid base tilenum %d\n", tilenum);
|
2011-10-30 19:46:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)nQuote >= MAXQUOTES || apStrings[nQuote] == NULL))
|
2011-10-30 19:46:51 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", nQuote);
|
2011-10-30 19:46:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2017-06-20 09:28:42 +00:00
|
|
|
G_PrintGameText(tilenum, pos.x >> 1, pos.y, apStrings[nQuote], shade, pal, orientation, bound1.x, bound1.y, bound2.x, bound2.y, z, 0);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_DIGITALNUMBER:
|
|
|
|
case CON_DIGITALNUMBERZ:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[11];
|
|
|
|
Gv_GetManyVars(11, params);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int const tilenum = params[0];
|
|
|
|
vec2_t const pos = { params[1], params[2] };
|
|
|
|
int const q = params[3];
|
|
|
|
int const shade = params[4];
|
|
|
|
int const pal = params[5];
|
|
|
|
int const orientation = params[6] & (ROTATESPRITE_MAX - 1);
|
|
|
|
vec2_t const bound1 = *(vec2_t *)¶ms[7];
|
|
|
|
vec2_t const bound2 = *(vec2_t *)¶ms[9];
|
|
|
|
int32_t nZoom = (tw == CON_DIGITALNUMBERZ) ? Gv_GetVarX(*insptr++) : 65536;
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2012-03-25 22:01:21 +00:00
|
|
|
// NOTE: '-' not taken into account, but we have rotatesprite() bound check now anyway
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(tilenum < 0 || tilenum+9 >= MAXTILES))
|
2011-10-30 19:46:51 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid base tilenum %d\n", tilenum);
|
2011-10-30 19:46:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
G_DrawTXDigiNumZ(tilenum, pos.x, pos.y, q, shade, pal, orientation, bound1.x, bound1.y, bound2.x, bound2.y, nZoom);
|
2010-05-02 23:27:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_MINITEXT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[5];
|
|
|
|
Gv_GetManyVars(5, params);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
vec2_t const pos = { params[0], params[1] };
|
|
|
|
int const nQuote = params[2];
|
2015-03-24 00:40:55 +00:00
|
|
|
int const shade = params[3], pal = params[4];
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)nQuote >= MAXQUOTES || apStrings[nQuote] == NULL))
|
2011-10-30 19:46:51 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", nQuote);
|
2011-10-30 19:46:51 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
minitextshade(pos.x, pos.y, apStrings[nQuote], shade, pal, 2+8+16);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2013-06-01 06:55:00 +00:00
|
|
|
case CON_SCREENTEXT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[20];
|
|
|
|
Gv_GetManyVars(20, params);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int const tilenum = params[0];
|
|
|
|
vec3_t const v = *(vec3_t *)¶ms[1];
|
|
|
|
int const blockangle = params[4];
|
|
|
|
int const charangle = params[5];
|
|
|
|
int const nQuote = params[6];
|
|
|
|
int const shade = params[7];
|
|
|
|
int const pal = params[8];
|
|
|
|
int const orientation = params[9] & (ROTATESPRITE_MAX - 1);
|
|
|
|
int const alpha = params[10];
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t const spacing = *(vec2_t *) ¶ms[11];
|
|
|
|
vec2_t const between = *(vec2_t *) ¶ms[13];
|
|
|
|
int const nFlags = params[15];
|
2016-08-27 01:40:06 +00:00
|
|
|
vec2_t const scrn[2] = { *(vec2_t *)¶ms[16], *(vec2_t *)¶ms[18] };
|
2013-06-01 06:55:00 +00:00
|
|
|
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(tilenum < 0 || tilenum+255 >= MAXTILES))
|
2013-06-01 06:55:00 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("invalid base tilenum %d\n", tilenum);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)nQuote >= MAXQUOTES || apStrings[nQuote] == NULL))
|
2013-06-01 06:55:00 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", nQuote);
|
2013-06-01 06:55:00 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
G_ScreenText(tilenum, v.x, v.y, v.z, blockangle, charangle, apStrings[nQuote], shade, pal, 2 | orientation,
|
|
|
|
alpha, spacing.x, spacing.y, between.x, between.y, nFlags, scrn[0].x, scrn[0].y, scrn[1].x, scrn[1].y);
|
2013-06-01 06:55:00 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ANGOFF:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteext[vm.spriteNum].angoff=*insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETZRANGE:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
vec3_t vect;
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(3, (int32_t *)&vect);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int const sectnum = Gv_GetVarX(*insptr++);
|
|
|
|
int const ceilzvar = *insptr++;
|
|
|
|
int const ceilhitvar = *insptr++;
|
|
|
|
int const florzvar = *insptr++;
|
|
|
|
int const florhitvar = *insptr++;
|
|
|
|
int const walldist = Gv_GetVarX(*insptr++);
|
|
|
|
int const clipmask = Gv_GetVarX(*insptr++);
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectnum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectnum);
|
|
|
|
continue;
|
|
|
|
}
|
2009-01-13 12:23:18 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int32_t ceilz, ceilhit, florz, florhit;
|
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
getzrange(&vect, sectnum, &ceilz, &ceilhit, &florz, &florhit, walldist, clipmask);
|
|
|
|
Gv_SetVarX(ceilzvar, ceilz);
|
|
|
|
Gv_SetVarX(ceilhitvar, ceilhit);
|
|
|
|
Gv_SetVarX(florzvar, florz);
|
|
|
|
Gv_SetVarX(florhitvar, florhit);
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2010-09-27 21:52:04 +00:00
|
|
|
case CON_SECTSETINTERPOLATION:
|
|
|
|
case CON_SECTCLEARINTERPOLATION:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int const sectnum = Gv_GetVarX(*insptr++);
|
2010-09-27 21:52:04 +00:00
|
|
|
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectnum >= (unsigned)numsectors))
|
2010-09-27 21:52:04 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectnum);
|
2010-09-27 21:52:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tw==CON_SECTSETINTERPOLATION)
|
2011-07-01 17:15:07 +00:00
|
|
|
Sect_SetInterpolation(sectnum);
|
2010-09-27 21:52:04 +00:00
|
|
|
else
|
2011-07-01 17:15:07 +00:00
|
|
|
Sect_ClearInterpolation(sectnum);
|
2010-09-27 21:52:04 +00:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_CALCHYPOTENUSE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t returnVar = *insptr++;
|
|
|
|
vec2_t da;
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *)&da);
|
2015-05-26 00:47:54 +00:00
|
|
|
int64_t const hypsq = (int64_t)da.x*da.x + (int64_t)da.y*da.y;
|
2010-09-27 21:52:04 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, (hypsq > (int64_t) INT32_MAX)
|
|
|
|
? (int32_t)sqrt((double)hypsq)
|
|
|
|
: ksqrt((uint32_t)hypsq));
|
2010-09-27 21:52:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_LINEINTERSECT:
|
|
|
|
case CON_RAYINTERSECT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
vec3_t vec[2];
|
|
|
|
Gv_GetManyVars(6, (int32_t *)vec);
|
|
|
|
|
|
|
|
vec2_t vec2[2];
|
|
|
|
Gv_GetManyVars(4, (int32_t *)vec2);
|
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
int const intxvar = *insptr++;
|
|
|
|
int const intyvar = *insptr++;
|
|
|
|
int const intzvar = *insptr++;
|
|
|
|
int const retvar = *insptr++;
|
|
|
|
vec3_t in;
|
|
|
|
int ret = (tw == CON_LINEINTERSECT)
|
|
|
|
? lintersect(vec[0].x, vec[0].y, vec[0].z, vec[1].x, vec[1].y, vec[1].z, vec2[0].x, vec2[0].y,
|
|
|
|
vec2[1].x, vec2[1].y, &in.x, &in.y, &in.z)
|
|
|
|
: rayintersect(vec[0].x, vec[0].y, vec[0].z, vec[1].x, vec[1].y, vec[1].z, vec2[0].x, vec2[0].y,
|
|
|
|
vec2[1].x, vec2[1].y, &in.x, &in.y, &in.z);
|
2010-09-27 21:52:04 +00:00
|
|
|
|
|
|
|
Gv_SetVarX(retvar, ret);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2010-09-27 21:52:04 +00:00
|
|
|
if (ret)
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_SetVarX(intxvar, in.x);
|
|
|
|
Gv_SetVarX(intyvar, in.y);
|
|
|
|
Gv_SetVarX(intzvar, in.z);
|
2010-09-27 21:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CON_CLIPMOVE:
|
2010-10-09 22:59:17 +00:00
|
|
|
case CON_CLIPMOVENOSLIDE:
|
2010-09-27 21:52:04 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
typedef struct {
|
|
|
|
int32_t w, f, c;
|
|
|
|
} vec3dist_t;
|
2010-09-27 21:52:04 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int const xReturn = *insptr++;
|
|
|
|
int const yReturn = *insptr++;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
|
|
|
insptr -= 2;
|
|
|
|
|
|
|
|
vec3_t vec3;
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&vec3);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectReturn = *insptr++;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
|
|
|
vec2_t vec2;
|
|
|
|
Gv_GetManyVars(2, (int32_t *)&vec2);
|
|
|
|
|
|
|
|
vec3dist_t dist;
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&dist);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const clipMask = Gv_GetVarX(*insptr++);
|
|
|
|
int16_t sectNum = Gv_GetVarX(sectReturn);
|
2010-09-27 21:52:04 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2010-09-27 21:52:04 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectNum);
|
|
|
|
Gv_SetVarX(returnVar, 0);
|
2010-09-27 21:52:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar,
|
|
|
|
clipmovex(&vec3, §Num, vec2.x, vec2.y, dist.w, dist.f, dist.c, clipMask, (tw == CON_CLIPMOVENOSLIDE)));
|
|
|
|
Gv_SetVarX(sectReturn, sectNum);
|
|
|
|
Gv_SetVarX(xReturn, vec3.x);
|
|
|
|
Gv_SetVarX(yReturn, vec3.y);
|
2010-09-27 21:52:04 +00:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_HITSCAN:
|
|
|
|
insptr++;
|
2008-08-09 10:43:27 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
vec3_t vect;
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(3, (int32_t *)&vect);
|
2009-01-13 12:23:18 +00:00
|
|
|
|
2015-05-26 00:47:54 +00:00
|
|
|
int const sectnum = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
|
|
|
vec3_t v;
|
|
|
|
Gv_GetManyVars(3, (int32_t *) &v);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectReturn = *insptr++;
|
|
|
|
int const wallReturn = *insptr++;
|
|
|
|
int const spriteReturn = *insptr++;
|
|
|
|
int const xReturn = *insptr++;
|
|
|
|
int const yReturn = *insptr++;
|
|
|
|
int const zReturn = *insptr++;
|
|
|
|
int const clipType = Gv_GetVarX(*insptr++);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectnum >= (unsigned)numsectors))
|
|
|
|
{
|
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectnum);
|
|
|
|
continue;
|
2009-01-13 12:23:18 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
hitdata_t hit;
|
2016-08-27 01:40:35 +00:00
|
|
|
hitscan((const vec3_t *)&vect, sectnum, v.x, v.y, v.z, &hit, clipType);
|
|
|
|
|
|
|
|
Gv_SetVarX(sectReturn, hit.sect);
|
|
|
|
Gv_SetVarX(wallReturn, hit.wall);
|
|
|
|
Gv_SetVarX(spriteReturn, hit.sprite);
|
|
|
|
Gv_SetVarX(xReturn, hit.pos.x);
|
|
|
|
Gv_SetVarX(yReturn, hit.pos.y);
|
|
|
|
Gv_SetVarX(zReturn, hit.pos.z);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 10:43:27 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CANSEE:
|
|
|
|
insptr++;
|
2008-08-09 10:43:27 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
vec3_t vec1;
|
|
|
|
Gv_GetManyVars(3, (int32_t *) &vec1);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const firstSector = Gv_GetVarX(*insptr++);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
|
|
|
vec3_t vec2;
|
|
|
|
Gv_GetManyVars(3, (int32_t *) &vec2);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const secondSector = Gv_GetVarX(*insptr++);
|
|
|
|
int const returnVar = *insptr++;
|
2009-01-13 12:23:18 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)firstSector >= (unsigned)numsectors ||
|
|
|
|
(unsigned)secondSector >= (unsigned)numsectors))
|
2009-01-13 12:23:18 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector\n");
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, 0);
|
2009-01-13 12:23:18 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, cansee(vec1.x, vec1.y, vec1.z, firstSector, vec2.x, vec2.y, vec2.z, secondSector));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-07-25 01:09:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ROTATEPOINT:
|
|
|
|
insptr++;
|
2008-07-25 01:09:39 +00:00
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
vec2_t point[2];
|
|
|
|
Gv_GetManyVars(4, (int32_t *)point);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const angle = Gv_GetVarX(*insptr++);
|
|
|
|
int const xReturn = *insptr++;
|
|
|
|
int const yReturn = *insptr++;
|
2016-08-27 01:40:06 +00:00
|
|
|
vec2_t result;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2015-05-26 00:47:54 +00:00
|
|
|
rotatepoint(point[0], point[1], angle, &result);
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(xReturn, result.x);
|
|
|
|
Gv_SetVarX(yReturn, result.y);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-07-25 01:09:39 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_NEARTAG:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// neartag(int32_t x, int32_t y, int32_t z, short sectnum, short ang, //Starting position & angle
|
|
|
|
// short *neartagsector, //Returns near sector if sector[].tag != 0
|
|
|
|
// short *neartagwall, //Returns near wall if wall[].tag != 0
|
|
|
|
// short *neartagsprite, //Returns near sprite if sprite[].tag != 0
|
|
|
|
// int32_t *neartaghitdist, //Returns actual distance to object (scale: 1024=largest grid size)
|
|
|
|
// int32_t neartagrange, //Choose maximum distance to scan (scale: 1024=largest grid size)
|
|
|
|
// char tagsearch) //1-lotag only, 2-hitag only, 3-lotag&hitag
|
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
vec3_t point;
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&point);
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectNum = Gv_GetVarX(*insptr++);
|
|
|
|
int const nAngle = Gv_GetVarX(*insptr++);
|
|
|
|
int const sectReturn = *insptr++;
|
|
|
|
int const wallReturn = *insptr++;
|
|
|
|
int const spriteReturn = *insptr++;
|
|
|
|
int const distReturn = *insptr++;
|
|
|
|
int const tagRange = Gv_GetVarX(*insptr++);
|
|
|
|
int const tagSearch = Gv_GetVarX(*insptr++);
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
|
|
|
int16_t neartagsector, neartagwall, neartagsprite;
|
|
|
|
int32_t neartaghitdist;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
neartag(point.x, point.y, point.z, sectNum, nAngle, &neartagsector, &neartagwall, &neartagsprite,
|
|
|
|
&neartaghitdist, tagRange, tagSearch, NULL);
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(sectReturn, neartagsector);
|
|
|
|
Gv_SetVarX(wallReturn, neartagwall);
|
|
|
|
Gv_SetVarX(spriteReturn, neartagsprite);
|
|
|
|
Gv_SetVarX(distReturn, neartaghitdist);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 10:43:27 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETTIMEDATE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t values[8];
|
|
|
|
G_GetTimeDate(values);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i = 0; i < 8; i++)
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, values[i]);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MOVESPRITE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
vec3_t vect;
|
2008-08-10 13:13:24 +00:00
|
|
|
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(3, (int32_t *)&vect);
|
2009-01-13 04:40:56 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const clipType = Gv_GetVarX(*insptr++);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2015-03-24 00:40:55 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2015-03-24 00:40:55 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 11:19:27 +00:00
|
|
|
}
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, A_MoveSprite(spriteNum, &vect, clipType));
|
2015-03-24 00:40:55 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
|
|
|
|
2015-05-26 00:48:17 +00:00
|
|
|
case CON_SETSPRITE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const spriteNum = Gv_GetVarX(*insptr++);
|
|
|
|
vec3_t vect;
|
2015-05-26 00:48:17 +00:00
|
|
|
|
|
|
|
Gv_GetManyVars(3, (int32_t *)&vect);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)spriteNum >= MAXSPRITES))
|
2015-05-26 00:48:17 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", spriteNum);
|
2015-05-26 00:48:17 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
setsprite(spriteNum, &vect);
|
2015-05-26 00:48:17 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETFLORZOFSLOPE:
|
|
|
|
case CON_GETCEILZOFSLOPE:
|
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const sectNum = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:06 +00:00
|
|
|
vec2_t vect;
|
2015-03-24 00:40:55 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *)&vect);
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)sectNum >= (unsigned)numsectors))
|
2008-08-09 10:43:27 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", sectNum);
|
2008-08-09 10:43:27 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 10:43:27 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, (tw == CON_GETFLORZOFSLOPE) ? getflorzofslope(sectNum, vect.x, vect.y) :
|
|
|
|
getceilzofslope(sectNum, vect.x, vect.y));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-07-25 01:09:39 +00:00
|
|
|
}
|
2006-12-18 08:37:12 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_UPDATESECTOR:
|
2015-05-26 00:48:17 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec2_t vect = { 0, 0 };
|
2016-08-27 01:40:06 +00:00
|
|
|
Gv_GetManyVars(2, (int32_t *)&vect);
|
2015-05-26 00:48:17 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int16_t sectNum = sprite[vm.spriteNum].sectnum;
|
2015-05-26 00:48:17 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesector(vect.x, vect.y, §Num);
|
|
|
|
Gv_SetVarX(returnVar, sectNum);
|
2015-05-26 00:48:17 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_UPDATESECTORZ:
|
|
|
|
insptr++;
|
2006-12-18 08:37:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vec3_t vect = { 0, 0, 0 };
|
2016-08-27 01:40:06 +00:00
|
|
|
Gv_GetManyVars(3, (int32_t *)&vect);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int16_t sectNum = sprite[vm.spriteNum].sectnum;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesectorz(vect.x, vect.y, vect.z, §Num);
|
|
|
|
Gv_SetVarX(returnVar, sectNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-18 08:37:12 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SPAWN:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned)vm.pSprite->sectnum >= MAXSECTORS)
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
{
|
2017-06-23 03:59:06 +00:00
|
|
|
CON_ERRPRINTF("Invalid sector %d\n", vm.pUSprite->sectnum);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
A_Spawn(vm.spriteNum,*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFWASWEAPON:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL(vm.pActor->picnum == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFAI:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(AC_AI_ID(vm.pData) == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFACTION:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(AC_ACTION_ID(vm.pData) == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFACTIONCOUNT:
|
2007-02-08 04:19:39 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(AC_ACTION_COUNT(vm.pData) >= *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RESETACTIONCOUNT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_ACTION_COUNT(vm.pData) = 0;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-19 20:31:40 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DEBRIS:
|
|
|
|
insptr++;
|
2008-09-15 02:47:02 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int debrisTile = *insptr++;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned)vm.pSprite->sectnum < MAXSECTORS)
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t cnt = (*insptr) - 1; cnt >= 0; cnt--)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const tileOffset = (vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? 0 : (krand() % 3);
|
|
|
|
|
|
|
|
int const spriteNum =
|
|
|
|
A_InsertSprite(vm.pSprite->sectnum, vm.pSprite->x + (krand() & 255) - 128,
|
|
|
|
vm.pSprite->y + (krand() & 255) - 128, vm.pSprite->z - (8 << 8) - (krand() & 8191),
|
|
|
|
debrisTile + tileOffset, vm.pSprite->shade, 32 + (krand() & 15), 32 + (krand() & 15),
|
|
|
|
krand() & 2047, (krand() & 127) + 32, -(krand() & 2047), vm.spriteNum, 5);
|
|
|
|
|
|
|
|
sprite[spriteNum].yvel =
|
2016-08-27 01:42:01 +00:00
|
|
|
(vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? g_blimpSpawnItems[cnt % 14] : -1;
|
2016-08-27 01:40:35 +00:00
|
|
|
sprite[spriteNum].pal = vm.pSprite->pal;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_COUNT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_COUNT(vm.pData) = (int16_t) *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-01-05 22:30:35 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CSTATOR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->cstat |= (int16_t) *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CLIPDIST:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->clipdist = (int16_t) *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CSTAT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->cstat = (int16_t) *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SAVENN:
|
|
|
|
case CON_SAVE:
|
|
|
|
insptr++;
|
2006-11-15 01:16:55 +00:00
|
|
|
{
|
2017-06-22 22:49:22 +00:00
|
|
|
int32_t const requestedSlot = *insptr++;
|
2009-01-07 14:05:13 +00:00
|
|
|
|
2017-06-22 22:49:22 +00:00
|
|
|
if ((unsigned)requestedSlot >= MAXSAVEGAMES)
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2017-06-22 22:49:22 +00:00
|
|
|
g_requestedSaveSlot = requestedSlot;
|
|
|
|
|
|
|
|
if (tw == CON_SAVE || ud.savegame[requestedSlot][0] == 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
time_t timeStruct = time(NULL);
|
|
|
|
struct tm *pTime = localtime(&timeStruct);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2017-06-23 03:59:26 +00:00
|
|
|
strftime(ud.savegame[requestedSlot], sizeof(ud.savegame[requestedSlot]),
|
|
|
|
"%d %b %Y %I:%M%p", pTime);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QUAKE:
|
|
|
|
insptr++;
|
2013-02-11 17:16:50 +00:00
|
|
|
g_earthquakeTime = Gv_GetVarX(*insptr++);
|
2009-06-19 01:10:10 +00:00
|
|
|
A_PlaySound(EARTHQUAKE,g_player[screenpeek].ps->i);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFMOVE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(AC_MOVE_ID(vm.pData) == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RESETPLAYER:
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags = VM_ResetPlayer(vm.playerNum, vm.flags, 0);
|
2015-03-04 02:15:15 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case CON_RESETPLAYERFLAGS:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags = VM_ResetPlayer(vm.playerNum, vm.flags, Gv_GetVarX(*insptr++));
|
2015-03-04 02:15:15 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFONWATER:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(sector[vm.pSprite->sectnum].lotag == ST_1_ABOVE_WATER &&
|
2016-08-27 01:40:56 +00:00
|
|
|
klabs(vm.pSprite->z - sector[vm.pSprite->sectnum].floorz) < ZOFFSET5);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFINWATER:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(sector[vm.pSprite->sectnum].lotag == ST_2_UNDERWATER);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFCOUNT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(AC_COUNT(vm.pData) >= *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFACTOR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.pSprite->picnum == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RESETCOUNT:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
AC_COUNT(vm.pData) = 0;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDINVENTORY:
|
2012-08-10 19:11:53 +00:00
|
|
|
{
|
2010-05-02 23:27:30 +00:00
|
|
|
insptr += 2;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-04-13 04:03:55 +00:00
|
|
|
int const item = *(insptr-1);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-04-13 04:03:55 +00:00
|
|
|
switch (item)
|
|
|
|
{
|
|
|
|
case GET_STEROIDS:
|
2009-06-19 01:10:10 +00:00
|
|
|
case GET_SCUBA:
|
|
|
|
case GET_HOLODUKE:
|
2016-04-13 04:03:55 +00:00
|
|
|
case GET_JETPACK:
|
|
|
|
case GET_HEATS:
|
|
|
|
case GET_FIRSTAID:
|
|
|
|
case GET_BOOTS:
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->inven_icon = inv_to_icon[item];
|
|
|
|
pPlayer->inv_amount[item] = *insptr;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2016-04-13 04:03:55 +00:00
|
|
|
case GET_SHIELD:
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->inv_amount[GET_SHIELD] = min(pPlayer->inv_amount[GET_SHIELD] + *insptr, pPlayer->max_shield_amount);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case GET_ACCESS:
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (vm.pSprite->pal)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
|
|
|
case 0:
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->got_access |= 1;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case 21:
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->got_access |= 2;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
case 23:
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->got_access |= 4;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
default:
|
2016-04-13 04:03:55 +00:00
|
|
|
CON_ERRPRINTF("Invalid inventory ID %d\n", item);
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2012-08-10 19:11:53 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_HITRADIUSVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-24 00:40:55 +00:00
|
|
|
int32_t params[5];
|
|
|
|
Gv_GetManyVars(5, params);
|
2016-08-27 01:40:35 +00:00
|
|
|
A_RadiusDamage(vm.spriteNum, params[0], params[1], params[2], params[3], params[4]);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_HITRADIUS:
|
2016-08-27 01:40:35 +00:00
|
|
|
A_RadiusDamage(vm.spriteNum,*(insptr+1),*(insptr+2),*(insptr+3),*(insptr+4),*(insptr+5));
|
2010-05-02 23:27:30 +00:00
|
|
|
insptr += 6;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFP:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const moveFlags = *(++insptr);
|
|
|
|
int nResult = 0;
|
|
|
|
int const playerXVel = sprite[pPlayer->i].xvel;
|
2016-08-27 01:40:46 +00:00
|
|
|
int const syncBits = g_player[vm.playerNum].inputBits->bits;
|
2016-08-27 01:40:35 +00:00
|
|
|
|
|
|
|
if (((moveFlags & pducking) && pPlayer->on_ground && TEST_SYNC_KEY(syncBits, SK_CROUCH)) ||
|
|
|
|
((moveFlags & pfalling) && pPlayer->jumping_counter == 0 && !pPlayer->on_ground && pPlayer->vel.z > 2048) ||
|
|
|
|
((moveFlags & pjumping) && pPlayer->jumping_counter > 348) ||
|
|
|
|
((moveFlags & pstanding) && playerXVel >= 0 && playerXVel < 8) ||
|
|
|
|
((moveFlags & pwalking) && playerXVel >= 8 && !TEST_SYNC_KEY(syncBits, SK_RUN)) ||
|
|
|
|
((moveFlags & prunning) && playerXVel >= 8 && TEST_SYNC_KEY(syncBits, SK_RUN)) ||
|
|
|
|
((moveFlags & phigher) && pPlayer->pos.z < (vm.pSprite->z - (48 << 8))) ||
|
|
|
|
((moveFlags & pwalkingback) && playerXVel <= -8 && !TEST_SYNC_KEY(syncBits, SK_RUN)) ||
|
|
|
|
((moveFlags & prunningback) && playerXVel <= -8 && TEST_SYNC_KEY(syncBits, SK_RUN)) ||
|
|
|
|
((moveFlags & pkicking) && (pPlayer->quick_kick > 0 || (PWEAPON(vm.playerNum, pPlayer->curr_weapon, WorksLike) == KNEE_WEAPON &&
|
|
|
|
pPlayer->kickback_pic > 0))) ||
|
|
|
|
((moveFlags & pshrunk) && sprite[pPlayer->i].xrepeat < 32) ||
|
|
|
|
((moveFlags & pjetpack) && pPlayer->jetpack_on) ||
|
|
|
|
((moveFlags & ponsteroids) && pPlayer->inv_amount[GET_STEROIDS] > 0 && pPlayer->inv_amount[GET_STEROIDS] < 400) ||
|
|
|
|
((moveFlags & ponground) && pPlayer->on_ground) ||
|
|
|
|
((moveFlags & palive) && sprite[pPlayer->i].xrepeat > 32 && sprite[pPlayer->i].extra > 0 && pPlayer->timebeforeexit == 0) ||
|
|
|
|
((moveFlags & pdead) && sprite[pPlayer->i].extra <= 0))
|
|
|
|
nResult = 1;
|
|
|
|
else if ((moveFlags & pfacing))
|
|
|
|
{
|
|
|
|
nResult =
|
|
|
|
(vm.pSprite->picnum == APLAYER && (g_netServer || ud.multimode > 1))
|
|
|
|
? G_GetAngleDelta(g_player[otherp].ps->ang, getangle(pPlayer->pos.x - g_player[otherp].ps->pos.x,
|
|
|
|
pPlayer->pos.y - g_player[otherp].ps->pos.y))
|
|
|
|
: G_GetAngleDelta(pPlayer->ang, getangle(vm.pSprite->x - pPlayer->pos.x, vm.pSprite->y - pPlayer->pos.y));
|
|
|
|
|
|
|
|
nResult = (nResult > -128 && nResult < 128);
|
|
|
|
}
|
|
|
|
VM_CONDITIONAL(nResult);
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFSTRENGTH:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.pSprite->extra <= *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GUTS:
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DoGuts(vm.spriteNum,*(insptr+1),*(insptr+2));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 3;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFSPAWNEDBY:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL(vm.pActor->picnum == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_WACKPLAYER:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
P_ForceAngle(pPlayer);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_FLASH:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
sprite[vm.spriteNum].shade = -127;
|
|
|
|
pPlayer->visibility = -127;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SAVEMAPSTATE:
|
2013-05-19 19:29:26 +00:00
|
|
|
G_SaveMapState();
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_LOADMAPSTATE:
|
2013-05-19 19:29:26 +00:00
|
|
|
G_RestoreMapState();
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_CLEARMAPSTATE:
|
|
|
|
insptr++;
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const levelNum = Gv_GetVarX(*insptr++);
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)levelNum >= MAXVOLUMES*MAXLEVELS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid map number: %d\n", levelNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2013-05-19 19:29:23 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
G_FreeMapState(levelNum);
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_STOPALLSOUNDS:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (screenpeek == vm.playerNum)
|
2009-06-19 01:10:10 +00:00
|
|
|
FX_StopAllSounds();
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFGAPZL:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL(((vm.pActor->floorz - vm.pActor->ceilingz) >> 8) < *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFHITSPACE:
|
2016-08-27 01:40:46 +00:00
|
|
|
VM_CONDITIONAL(TEST_SYNC_KEY(g_player[vm.playerNum].inputBits->bits, SK_OPEN));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFOUTSIDE:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(sector[vm.pSprite->sectnum].ceilingstat&1);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFMULTIPLAYER:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL((g_netServer || g_netClient || ud.multimode > 1));
|
2010-07-22 20:29:09 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case CON_IFCLIENT:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(g_netClient != NULL);
|
2010-07-22 20:29:09 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case CON_IFSERVER:
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_CONDITIONAL(g_netServer != NULL);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-10-14 07:40:41 +00:00
|
|
|
case CON_IFPLAYBACKON:
|
|
|
|
VM_CONDITIONAL(0);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_OPERATE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sector[vm.pSprite->sectnum].lotag == 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:56 +00:00
|
|
|
int16_t foundSect, foundWall, foundSprite;
|
|
|
|
int32_t foundDist;
|
2014-01-31 21:13:00 +00:00
|
|
|
|
2016-08-27 01:40:56 +00:00
|
|
|
neartag(vm.pSprite->x,vm.pSprite->y,vm.pSprite->z-ZOFFSET5,vm.pSprite->sectnum,vm.pSprite->ang,
|
|
|
|
&foundSect,&foundWall,&foundSprite,&foundDist, 768, 4+1, NULL);
|
2012-02-20 19:54:24 +00:00
|
|
|
|
2016-08-27 01:40:56 +00:00
|
|
|
if (foundSect >= 0 && isanearoperator(sector[foundSect].lotag))
|
|
|
|
if ((sector[foundSect].lotag&0xff) == ST_23_SWINGING_DOOR || sector[foundSect].floorz == sector[foundSect].ceilingz)
|
|
|
|
if ((sector[foundSect].lotag&(16384|32768)) == 0)
|
2014-01-31 21:13:00 +00:00
|
|
|
{
|
|
|
|
int32_t j;
|
|
|
|
|
2016-08-27 01:40:56 +00:00
|
|
|
for (SPRITES_OF_SECT(foundSect, j))
|
2014-01-31 21:13:00 +00:00
|
|
|
if (sprite[j].picnum == ACTIVATOR)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (j == -1)
|
2016-08-27 01:40:56 +00:00
|
|
|
G_OperateSectors(foundSect,vm.spriteNum);
|
2014-01-31 21:13:00 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFINSPACE:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(G_CheckForSpaceCeiling(vm.pSprite->sectnum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SPRITEPAL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->picnum != APLAYER)
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->tempang = vm.pSprite->pal;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->pal = *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CACTOR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->picnum = *insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFBULLETNEAR:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(A_Dodge(vm.pSprite) == 1);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFRESPAWN:
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite)) VM_CONDITIONAL(ud.respawn_monsters)
|
|
|
|
else if (A_CheckInventorySprite(vm.pSprite)) VM_CONDITIONAL(ud.respawn_inventory)
|
2012-05-14 18:12:27 +00:00
|
|
|
else VM_CONDITIONAL(ud.respawn_items)
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFFLOORDISTL:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL((vm.pActor->floorz - vm.pSprite->z) <= ((*insptr)<<8));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFCEILINGDISTL:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL((vm.pSprite->z - vm.pActor->ceilingz) <= ((*insptr)<<8));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_PALFROM:
|
|
|
|
insptr++;
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.playerNum >= (unsigned)g_mostConcurrentPlayers))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid player ID %d\n", vm.playerNum);
|
2012-04-28 21:56:38 +00:00
|
|
|
insptr += 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
palette_t const pal = { (uint8_t) * (insptr + 1), (uint8_t) * (insptr + 2), (uint8_t) * (insptr + 3),
|
|
|
|
(uint8_t) * (insptr) };
|
|
|
|
insptr += 4;
|
2016-08-27 01:40:35 +00:00
|
|
|
P_PalFrom(pPlayer, pal.f, pal.r, pal.g, pal.b);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-07-12 01:55:34 +00:00
|
|
|
case CON_SECTOROFWALL:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, sectorofwall(Gv_GetVarX(*insptr++)));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_QSPRINTF:
|
|
|
|
insptr++;
|
2008-08-09 12:42:02 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const outputQuote = Gv_GetVarX(*insptr++);
|
|
|
|
int const inputQuote = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[inputQuote] == NULL || apStrings[outputQuote] == NULL))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("null quote %d\n", apStrings[inputQuote] ? outputQuote : inputQuote);
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
while ((*insptr & VM_INSTMASK) != CON_NULLOP)
|
2009-07-15 01:26:38 +00:00
|
|
|
Gv_GetVarX(*insptr++);
|
|
|
|
|
|
|
|
insptr++; // skip the NOP
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t arg[32];
|
|
|
|
int const quoteLen = Bstrlen(apStrings[inputQuote]);
|
|
|
|
int inputPos = 0;
|
|
|
|
char outBuf[MAXQUOTELEN];
|
|
|
|
int outBufPos = 0;
|
|
|
|
int argIdx = 0;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
while ((*insptr & VM_INSTMASK) != CON_NULLOP && argIdx < 32)
|
|
|
|
arg[argIdx++] = Gv_GetVarX(*insptr++);
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int numArgs = argIdx;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
insptr++; // skip the NOP
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
argIdx = 0;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
do
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
while (inputPos < quoteLen && outBufPos < MAXQUOTELEN && apStrings[inputQuote][inputPos] != '%')
|
|
|
|
outBuf[outBufPos++] = apStrings[inputQuote][inputPos++];
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (apStrings[inputQuote][inputPos] == '%')
|
2016-08-27 01:40:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
inputPos++;
|
|
|
|
switch (apStrings[inputQuote][inputPos])
|
2009-07-12 01:55:34 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
case 'l':
|
2016-08-27 01:40:35 +00:00
|
|
|
if (apStrings[inputQuote][inputPos+1] != 'd')
|
2009-07-12 01:55:34 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
// write the % and l
|
2016-08-27 01:40:35 +00:00
|
|
|
outBuf[outBufPos++] = apStrings[inputQuote][inputPos-1];
|
|
|
|
outBuf[outBufPos++] = apStrings[inputQuote][inputPos++];
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
inputPos++;
|
2016-08-27 01:40:06 +00:00
|
|
|
case 'd':
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (argIdx >= numArgs)
|
2016-08-27 01:40:06 +00:00
|
|
|
goto finish_qsprintf;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
char buf[16];
|
2016-08-27 01:40:35 +00:00
|
|
|
Bsprintf(buf, "%d", arg[argIdx++]);
|
2009-07-15 01:26:38 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const bufLen = Bstrlen(buf);
|
|
|
|
Bmemcpy(&outBuf[outBufPos], buf, bufLen);
|
|
|
|
outBufPos += bufLen;
|
|
|
|
inputPos++;
|
2016-08-27 01:40:06 +00:00
|
|
|
}
|
|
|
|
break;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
case 's':
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (argIdx >= numArgs)
|
2016-08-27 01:40:06 +00:00
|
|
|
goto finish_qsprintf;
|
2015-03-24 00:40:55 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const argLen = Bstrlen(apStrings[arg[argIdx]]);
|
2009-07-15 01:26:38 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&outBuf[outBufPos], apStrings[arg[argIdx]], argLen);
|
|
|
|
outBufPos += argLen;
|
|
|
|
argIdx++;
|
|
|
|
inputPos++;
|
2016-08-27 01:40:06 +00:00
|
|
|
}
|
|
|
|
break;
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
default:
|
2016-08-27 01:40:35 +00:00
|
|
|
outBuf[outBufPos++] = apStrings[inputQuote][inputPos-1];
|
2016-08-27 01:40:06 +00:00
|
|
|
break;
|
2009-07-12 01:55:34 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (inputPos < quoteLen && outBufPos < MAXQUOTELEN);
|
2016-08-27 01:40:06 +00:00
|
|
|
finish_qsprintf:
|
2016-08-27 01:40:35 +00:00
|
|
|
outBuf[outBufPos] = '\0';
|
|
|
|
Bstrncpyz(apStrings[outputQuote], outBuf, MAXQUOTELEN);
|
2016-08-27 01:40:06 +00:00
|
|
|
continue;
|
2008-08-09 12:42:02 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDLOG:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2009-06-24 08:20:10 +00:00
|
|
|
OSD_Printf(OSDTEXT_GREEN "CONLOG: L=%d\n",g_errorLineNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDLOGVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
int32_t m=1;
|
|
|
|
char szBuf[256];
|
|
|
|
int32_t lVarID = *insptr;
|
2008-08-25 20:25:49 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
if ((lVarID >= g_gameVarCount) || lVarID < 0)
|
|
|
|
{
|
|
|
|
if (*insptr==MAXGAMEVARS) // addlogvar for a constant? Har.
|
|
|
|
insptr++;
|
|
|
|
// else if (*insptr > g_gameVarCount && (*insptr < (MAXGAMEVARS<<1)+MAXGAMEVARS+1+MAXGAMEARRAYS))
|
|
|
|
else if (*insptr&(MAXGAMEVARS<<2))
|
|
|
|
{
|
|
|
|
int32_t index;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
lVarID ^= (MAXGAMEVARS<<2);
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
if (lVarID&(MAXGAMEVARS<<1))
|
|
|
|
{
|
|
|
|
m = -m;
|
|
|
|
lVarID ^= (MAXGAMEVARS<<1);
|
|
|
|
}
|
2008-04-01 03:32:36 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2008-04-27 06:54:28 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
index=Gv_GetVarX(*insptr++);
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_TRUE((unsigned)index < (unsigned)aGameArrays[lVarID].size))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2012-05-18 21:40:20 +00:00
|
|
|
OSD_Printf(OSDTEXT_GREEN "%s: L=%d %s[%d] =%d\n", keyw[g_tw], g_errorLineNum,
|
|
|
|
aGameArrays[lVarID].szLabel, index,
|
2016-10-09 00:15:18 +00:00
|
|
|
(int32_t)(m*Gv_GetArrayValue(lVarID, index)));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid array index\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (*insptr&(MAXGAMEVARS<<3))
|
2008-04-27 06:54:28 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
// FIXME FIXME FIXME
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((lVarID & (MAXGAMEVARS-1)) == g_structVarIDs + STRUCT_ACTORVAR)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
intptr_t const *oinsptr = insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
int32_t index = Gv_GetVarX(*insptr++);
|
|
|
|
insptr = oinsptr;
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)index >= MAXSPRITES-1))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid array index\n");
|
2009-06-19 01:10:10 +00:00
|
|
|
Gv_GetVarX(*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
OSD_Printf(OSDTEXT_GREEN "%s: L=%d %d %d\n",keyw[g_tw],g_errorLineNum,index,Gv_GetVar(*insptr++,index,vm.playerNum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-04-27 06:54:28 +00:00
|
|
|
}
|
2014-10-25 03:36:34 +00:00
|
|
|
else if (EDUKE32_PREDICT_TRUE(*insptr&(MAXGAMEVARS<<1)))
|
2008-04-01 03:32:36 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
m = -m;
|
|
|
|
lVarID ^= (MAXGAMEVARS<<1);
|
2008-04-01 03:32:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
// invalid varID
|
|
|
|
insptr++;
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid variable\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue; // out of switch
|
2008-04-01 03:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
2016-08-27 01:42:01 +00:00
|
|
|
Bsprintf(tempbuf,"CONLOGVAR: L=%d %s ",g_errorLineNum, aGameVars[lVarID].szLabel);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (aGameVars[lVarID].flags & GAMEVAR_READONLY)
|
2009-01-07 14:05:13 +00:00
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
Bsprintf(szBuf," (read-only)");
|
2016-08-27 01:42:01 +00:00
|
|
|
Bstrcat(tempbuf,szBuf);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (aGameVars[lVarID].flags & GAMEVAR_PERPLAYER)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Bsprintf(szBuf," (Per Player. Player=%d)",vm.playerNum);
|
2009-01-07 14:05:13 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (aGameVars[lVarID].flags & GAMEVAR_PERACTOR)
|
2008-04-27 06:54:28 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Bsprintf(szBuf," (Per Actor. Actor=%d)",vm.spriteNum);
|
2008-04-27 06:54:28 +00:00
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
else
|
|
|
|
{
|
2009-06-19 01:10:10 +00:00
|
|
|
Bsprintf(szBuf," (Global)");
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2016-08-27 01:42:01 +00:00
|
|
|
Bstrcat(tempbuf, szBuf);
|
|
|
|
Bsprintf(szBuf, " =%d\n", Gv_GetVarX(lVarID) * m);
|
|
|
|
Bstrcat(tempbuf, szBuf);
|
|
|
|
OSD_Printf(OSDTEXT_GREEN "%s", tempbuf);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETSECTOR:
|
2015-03-25 06:27:25 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
tw = *insptr++;
|
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lVar2 = *insptr++;
|
|
|
|
int const sectNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : sprite[vm.spriteNum].sectnum;
|
|
|
|
int const nValue = Gv_GetVarX(lVar2);
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetSector(sectNum, labelNum, nValue);
|
2015-03-25 06:27:25 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETSECTOR:
|
2007-02-08 04:19:39 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-03-25 06:27:25 +00:00
|
|
|
tw = *insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lVar2 = *insptr++;
|
|
|
|
int const sectNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : sprite[vm.spriteNum].sectnum;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(lVar2, VM_GetSector(sectNum, labelNum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SQRT:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// syntax sqrt <invar> <outvar>
|
2015-03-24 00:40:55 +00:00
|
|
|
int const sqrtval = ksqrt((uint32_t)Gv_GetVarX(*insptr++));
|
|
|
|
Gv_SetVarX(*insptr++, sqrtval);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-11-16 03:02:42 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDNEARACTOR:
|
|
|
|
case CON_FINDNEARSPRITE:
|
|
|
|
case CON_FINDNEARACTOR3D:
|
|
|
|
case CON_FINDNEARSPRITE3D:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// syntax findnearactorvar <type> <maxdist> <getvar>
|
|
|
|
// gets the sprite ID of the nearest actor within max dist
|
|
|
|
// that is of <type> into <getvar>
|
|
|
|
// -1 for none found
|
|
|
|
// <type> <maxdist> <varid>
|
2016-08-27 01:40:35 +00:00
|
|
|
int const findPicnum = *insptr++;
|
|
|
|
int const maxDist = *insptr++;
|
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int foundSprite = -1;
|
|
|
|
int findStatnum = MAXSTATUS - 1;
|
|
|
|
int spriteNum;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
if (tw == CON_FINDNEARACTOR || tw == CON_FINDNEARACTOR3D)
|
2016-08-27 01:40:35 +00:00
|
|
|
findStatnum = 1;
|
2012-05-14 18:12:27 +00:00
|
|
|
|
|
|
|
if (tw==CON_FINDNEARSPRITE3D || tw==CON_FINDNEARACTOR3D)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2012-05-14 18:12:27 +00:00
|
|
|
do
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum=headspritestat[findStatnum]; // all sprites
|
|
|
|
while (spriteNum>=0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum && dist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite=spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == MAXSPRITES || tw == CON_FINDNEARACTOR3D)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2012-05-14 18:12:27 +00:00
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2012-05-14 18:12:27 +00:00
|
|
|
do
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum=headspritestat[findStatnum]; // all sprites
|
|
|
|
while (spriteNum>=0)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum && ldist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite=spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2007-02-08 04:19:39 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2008-12-19 00:53:54 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == MAXSPRITES || tw == CON_FINDNEARACTOR)
|
2008-12-19 00:53:54 +00:00
|
|
|
break;
|
2008-08-24 10:19:37 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-24 06:17:09 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDNEARACTORVAR:
|
|
|
|
case CON_FINDNEARSPRITEVAR:
|
|
|
|
case CON_FINDNEARACTOR3DVAR:
|
|
|
|
case CON_FINDNEARSPRITE3DVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// syntax findnearactorvar <type> <maxdistvar> <getvar>
|
|
|
|
// gets the sprite ID of the nearest actor within max dist
|
|
|
|
// that is of <type> into <getvar>
|
|
|
|
// -1 for none found
|
|
|
|
// <type> <maxdistvarid> <varid>
|
2016-08-27 01:40:35 +00:00
|
|
|
int const findPicnum = *insptr++;
|
|
|
|
int const maxDist = Gv_GetVarX(*insptr++);
|
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int foundSprite = -1;
|
|
|
|
int findStatnum = 1;
|
|
|
|
int spriteNum;
|
2008-08-24 10:19:37 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
if (tw == CON_FINDNEARSPRITEVAR || tw == CON_FINDNEARSPRITE3DVAR)
|
2016-08-27 01:40:35 +00:00
|
|
|
findStatnum = MAXSTATUS-1;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2012-05-14 18:12:27 +00:00
|
|
|
if (tw==CON_FINDNEARACTOR3DVAR || tw==CON_FINDNEARSPRITE3DVAR)
|
2008-08-24 10:19:37 +00:00
|
|
|
{
|
2012-05-14 18:12:27 +00:00
|
|
|
do
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum=headspritestat[findStatnum]; // all sprites
|
2012-05-14 18:12:27 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
while (spriteNum >= 0)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum && dist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite=spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == MAXSPRITES || tw==CON_FINDNEARACTOR3DVAR)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2012-05-14 18:12:27 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum=headspritestat[findStatnum]; // all sprites
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
while (spriteNum >= 0)
|
2008-08-24 10:19:37 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum && ldist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2008-08-24 10:19:37 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite=spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2008-08-24 10:19:37 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2008-08-24 10:19:37 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == MAXSPRITES || tw==CON_FINDNEARACTORVAR)
|
2008-12-19 00:53:54 +00:00
|
|
|
break;
|
2008-08-24 10:19:37 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-12-19 00:53:54 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDNEARACTORZVAR:
|
|
|
|
case CON_FINDNEARSPRITEZVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// syntax findnearactorvar <type> <maxdistvar> <getvar>
|
|
|
|
// gets the sprite ID of the nearest actor within max dist
|
|
|
|
// that is of <type> into <getvar>
|
|
|
|
// -1 for none found
|
|
|
|
// <type> <maxdistvarid> <varid>
|
2016-08-27 01:40:35 +00:00
|
|
|
int const findPicnum = *insptr++;
|
|
|
|
int const maxDist = Gv_GetVarX(*insptr++);
|
|
|
|
int const maxZDist = Gv_GetVarX(*insptr++);
|
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int foundSprite = -1;
|
|
|
|
int findStatnum = MAXSTATUS - 1;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
do
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int spriteNum = headspritestat[tw == CON_FINDNEARACTORZVAR ? 1 : findStatnum]; // all sprites
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == -1)
|
2016-08-27 01:40:06 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
do
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (ldist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (klabs(sprite[vm.spriteNum].z-sprite[spriteNum].z) < maxZDist)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite = spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (spriteNum>=0);
|
|
|
|
if (tw==CON_FINDNEARACTORZVAR || spriteNum == MAXSPRITES)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2008-08-24 06:17:09 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDNEARACTORZ:
|
|
|
|
case CON_FINDNEARSPRITEZ:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
// syntax findnearactorvar <type> <maxdist> <getvar>
|
|
|
|
// gets the sprite ID of the nearest actor within max dist
|
|
|
|
// that is of <type> into <getvar>
|
|
|
|
// -1 for none found
|
|
|
|
// <type> <maxdist> <varid>
|
2016-08-27 01:40:35 +00:00
|
|
|
int const findPicnum = *insptr++;
|
|
|
|
int const maxDist = *insptr++;
|
|
|
|
int const maxZDist = *insptr++;
|
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int foundSprite = -1;
|
|
|
|
int findStatnum = MAXSTATUS - 1;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2008-08-24 03:19:40 +00:00
|
|
|
do
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int spriteNum = headspritestat[tw == CON_FINDNEARACTORZ ? 1 : findStatnum]; // all sprites
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (spriteNum == -1)
|
2016-08-27 01:40:06 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
do
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (sprite[spriteNum].picnum == findPicnum && spriteNum != vm.spriteNum)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (ldist(&sprite[vm.spriteNum], &sprite[spriteNum]) < maxDist)
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (klabs(sprite[vm.spriteNum].z-sprite[spriteNum].z) < maxZDist)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
foundSprite=spriteNum;
|
|
|
|
spriteNum = MAXSPRITES;
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteNum = nextspritestat[spriteNum];
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (spriteNum>=0);
|
2009-07-12 01:55:34 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (tw==CON_FINDNEARACTORZ || spriteNum == MAXSPRITES)
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2008-08-24 06:17:09 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
while (findStatnum--);
|
|
|
|
Gv_SetVarX(returnVar, foundSprite);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-24 06:17:09 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDPLAYER:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = A_FindPlayer(&sprite[vm.spriteNum], &tw);
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_SetVarX(*insptr++, tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_FINDOTHERPLAYER:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_returnVarID].global = P_FindOtherPlayer(vm.playerNum,&tw);
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_SetVarX(*insptr++, tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETPLAYER:
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.playerNum;
|
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lParm2 = (PlayerLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
|
|
|
|
int const nValue = Gv_GetVarX(*insptr++);
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetPlayer(playerNum, labelNum, lParm2, nValue);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETPLAYER:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.playerNum;
|
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lParm2 = (PlayerLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetPlayer(playerNum, labelNum, lParm2));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETINPUT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.playerNum;
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetPlayerInput(playerNum, labelNum));
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_SETINPUT:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const playerNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.playerNum;
|
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const iSet = Gv_GetVarX(*insptr++);
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetPlayerInput(playerNum, labelNum, iSet);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETUSERDEF:
|
|
|
|
insptr++;
|
2008-08-09 12:29:23 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetUserdef(tw));
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_SETUSERDEF:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetUserdef(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 12:29:23 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETPROJECTILE:
|
|
|
|
insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
{
|
2015-03-28 09:48:37 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:35 +00:00
|
|
|
int const labelNum = *insptr++;
|
|
|
|
Gv_SetVarX(*insptr++, VM_GetProjectile(tw, labelNum));
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_SETPROJECTILE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
2016-08-27 01:40:35 +00:00
|
|
|
int const labelNum = *insptr++;
|
|
|
|
VM_SetProjectile(tw, labelNum, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETWALL:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const wallNum = Gv_GetVarX(tw);
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetWall(wallNum, labelNum, Gv_GetVarX(*insptr++));
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_GETWALL:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const wallNum = Gv_GetVarX(tw);
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetWall(wallNum, labelNum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETACTORVAR:
|
|
|
|
case CON_GETACTORVAR:
|
2007-02-08 04:19:39 +00:00
|
|
|
insptr++;
|
2007-02-05 01:33:08 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
int const lSprite = Gv_GetVarX(*insptr++);
|
|
|
|
int const lVar1 = *insptr++;
|
|
|
|
int const lVar2 = *insptr++;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2014-10-25 03:36:34 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)lSprite >= MAXSPRITES))
|
2008-08-09 12:29:23 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid sprite ID %d\n", lSprite);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
|
|
|
if (lVar1 == MAXGAMEVARS || lVar1 & ((MAXGAMEVARS << 2) | (MAXGAMEVARS << 3)))
|
|
|
|
insptr++;
|
|
|
|
|
|
|
|
if (lVar2 == MAXGAMEVARS || lVar2 & ((MAXGAMEVARS << 2) | (MAXGAMEVARS << 3)))
|
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-09 12:29:23 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
if (tw == CON_SETACTORVAR)
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVar(lVar1, Gv_GetVarX(lVar2), lSprite, vm.playerNum);
|
2016-08-27 01:40:06 +00:00
|
|
|
else
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(lVar2, Gv_GetVar(lVar1, lSprite, vm.playerNum));
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-05 01:33:08 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETPLAYERVAR:
|
|
|
|
case CON_GETPLAYERVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:42:19 +00:00
|
|
|
int const playerNum = (*insptr++ != g_thisActorVarID) ? Gv_GetVarX(*(insptr - 1)) : vm.playerNum;
|
|
|
|
int const lVar1 = *insptr++;
|
|
|
|
int const lVar2 = *insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("invalid player ID %d\n", playerNum);
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
if (lVar1 == MAXGAMEVARS || lVar1 & ((MAXGAMEVARS << 2) | (MAXGAMEVARS << 3)))
|
|
|
|
insptr++;
|
|
|
|
|
|
|
|
if (lVar2 == MAXGAMEVARS || lVar2 & ((MAXGAMEVARS << 2) | (MAXGAMEVARS << 3)))
|
|
|
|
insptr++;
|
2008-12-13 07:23:13 +00:00
|
|
|
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
if (tw == CON_SETPLAYERVAR)
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVar(lVar1, Gv_GetVarX(lVar2), vm.spriteNum, playerNum);
|
2015-01-11 04:56:10 +00:00
|
|
|
else
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(lVar2, Gv_GetVar(lVar1, vm.spriteNum, playerNum));
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
continue;
|
2008-12-13 07:23:13 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETACTOR:
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-25 06:27:25 +00:00
|
|
|
tw = *insptr++;
|
2009-06-24 08:20:10 +00:00
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetSprite(spriteNum, labelNum, lParm2, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETACTOR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-25 06:27:25 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
|
|
|
int const lParm2 = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVarX(*insptr++) : 0;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetSprite(spriteNum, labelNum, lParm2));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETTSPR:
|
2015-03-25 06:27:25 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
tw = *insptr++;
|
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
2015-03-25 06:27:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_SetTsprite(spriteNum, labelNum, Gv_GetVarX(*insptr++));
|
2015-03-25 06:27:25 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETTSPR:
|
2009-01-18 07:32:35 +00:00
|
|
|
insptr++;
|
|
|
|
{
|
2015-03-25 06:27:25 +00:00
|
|
|
tw = *insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
int const spriteNum = (tw != g_thisActorVarID) ? Gv_GetVarX(tw) : vm.spriteNum;
|
|
|
|
int const labelNum = *insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, VM_GetTsprite(spriteNum, labelNum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2008-08-09 10:16:18 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETANGLETOTARGET:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
// vm.pActor->lastvx and lastvy are last known location of target.
|
|
|
|
Gv_SetVarX(*insptr++, getangle(vm.pActor->lastv.x-vm.pSprite->x,vm.pActor->lastv.y-vm.pSprite->y));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_ANGOFFVAR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
spriteext[vm.spriteNum].angoff = Gv_GetVarX(*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_LOCKPLAYER:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->transporter_hold = Gv_GetVarX(*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-04-01 02:50:44 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_CHECKAVAILWEAPON:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = (*insptr != g_thisActorVarID) ? Gv_GetVarX(*insptr) : vm.playerNum;
|
2015-02-11 05:22:11 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= (unsigned)g_mostConcurrentPlayers))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("Invalid player ID %d\n", tw);
|
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
P_CheckWeapon(g_player[tw].ps);
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_CHECKAVAILINVEN:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = (*insptr != g_thisActorVarID) ? Gv_GetVarX(*insptr) : vm.playerNum;
|
2015-02-11 05:22:11 +00:00
|
|
|
insptr++;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= (unsigned)g_mostConcurrentPlayers))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("Invalid player ID %d\n", tw);
|
|
|
|
continue;
|
2008-08-24 03:19:40 +00:00
|
|
|
}
|
2015-02-11 05:22:11 +00:00
|
|
|
|
|
|
|
P_SelectNextInvItem(g_player[tw].ps);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GETPLAYERANGLE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, pPlayer->ang);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_GETACTORANGLE:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, vm.pSprite->ang);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
case CON_SETPLAYERANGLE:
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->ang = Gv_GetVarX(*insptr++) & 2047;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SETACTORANGLE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pSprite->ang = Gv_GetVarX(*insptr++) & 2047;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SETVAR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[*insptr].flags & (GAMEVAR_USER_MASK | GAMEVAR_PTR_MASK)) == 0)
|
|
|
|
aGameVars[*insptr].global = *(insptr + 1);
|
2015-01-11 04:56:10 +00:00
|
|
|
else
|
|
|
|
Gv_SetVarX(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-01-02 01:56:29 +00:00
|
|
|
case CON_KLABS:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[*(insptr + 1)].flags & (GAMEVAR_USER_MASK | GAMEVAR_PTR_MASK)) == 0)
|
|
|
|
aGameVars[*(insptr + 1)].global = klabs(aGameVars[*(insptr + 1)].global);
|
2016-01-02 01:56:29 +00:00
|
|
|
else
|
|
|
|
Gv_SetVarX(*(insptr + 1), klabs(Gv_GetVarX(*(insptr + 1))));
|
|
|
|
insptr += 2;
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETARRAY:
|
|
|
|
insptr++;
|
2009-02-19 09:39:19 +00:00
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const arrayIndex = Gv_GetVarX(*insptr++);
|
|
|
|
int const newValue = Gv_GetVarX(*insptr++);
|
2009-02-19 09:39:19 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= (unsigned)g_gameArrayCount ||
|
|
|
|
(unsigned)arrayIndex >= (unsigned)aGameArrays[tw].size))
|
2009-02-19 09:39:19 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
OSD_Printf(OSD_ERROR "Gv_SetVar(): tried to set invalid array ID (%d) or index out of bounds from "
|
|
|
|
"sprite %d (%d), player %d\n",
|
|
|
|
tw, vm.spriteNum, TrackerCast(sprite[vm.spriteNum].picnum), vm.playerNum);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-02-19 09:39:19 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[tw].flags & GAMEARRAY_READONLY))
|
2012-12-13 02:33:53 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
OSD_Printf("Tried to set on read-only array `%s'", aGameArrays[tw].szLabel);
|
2012-12-13 02:33:53 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameArrays[tw].pValues[arrayIndex]=newValue;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_WRITEARRAYTOFILE:
|
|
|
|
case CON_READARRAYFROMFILE:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const arrayNum = *insptr++;
|
|
|
|
int const quoteFilename = *insptr++;
|
2009-02-19 09:39:19 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(apStrings[quoteFilename] == NULL))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("null quote %d\n", quoteFilename);
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (tw == CON_READARRAYFROMFILE)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t kFile = kopen4loadfrommod(apStrings[quoteFilename], 0);
|
2009-02-19 09:39:19 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (kFile < 0)
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t numElements = kfilelength(kFile) / sizeof(int32_t);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (numElements == 0)
|
2015-09-24 06:31:55 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Baligned_free(aGameArrays[arrayNum].pValues);
|
|
|
|
aGameArrays[arrayNum].pValues = NULL;
|
|
|
|
aGameArrays[arrayNum].size = numElements;
|
2015-09-24 06:31:55 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (numElements > 0)
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const numBytes = numElements * sizeof(int32_t);
|
2014-11-07 22:07:12 +00:00
|
|
|
#ifdef BITNESS64
|
2016-08-27 01:40:35 +00:00
|
|
|
int32_t *pArray = (int32_t *)Xcalloc(numElements, sizeof(int32_t));
|
|
|
|
kread(kFile, pArray, numBytes);
|
2014-11-07 22:07:12 +00:00
|
|
|
#endif
|
2016-08-27 01:40:35 +00:00
|
|
|
Baligned_free(aGameArrays[arrayNum].pValues);
|
|
|
|
aGameArrays[arrayNum].pValues = (intptr_t *)Xaligned_alloc(ACTOR_VAR_ALIGNMENT, numElements * GAR_ELTSZ);
|
|
|
|
aGameArrays[arrayNum].size = numElements;
|
2014-11-07 22:07:12 +00:00
|
|
|
#ifdef BITNESS64
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i = 0; i < numElements; i++)
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameArrays[arrayNum].pValues[i] = pArray[i]; // int32_t --> int64_t
|
2016-08-27 01:40:06 +00:00
|
|
|
Bfree(pArray);
|
2014-11-07 22:07:12 +00:00
|
|
|
#else
|
2016-08-27 01:40:35 +00:00
|
|
|
kread(kFile, aGameArrays[arrayNum].pValues, numBytes);
|
2014-11-07 22:07:12 +00:00
|
|
|
#endif
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2010-03-18 09:10:43 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
kclose(kFile);
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
2010-03-18 09:10:43 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
char temp[BMAX_PATH];
|
2010-03-18 09:10:43 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(G_ModDirSnprintf(temp, sizeof(temp), "%s", apStrings[quoteFilename])))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("file name too long\n");
|
|
|
|
continue;
|
|
|
|
}
|
2014-10-25 03:36:34 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
FILE *const fil = fopen(temp, "wb");
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(fil == NULL))
|
|
|
|
{
|
|
|
|
CON_ERRPRINTF("couldn't open file \"%s\"\n", temp);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const arraySize = aGameArrays[arrayNum].size;
|
2017-01-01 13:23:29 +00:00
|
|
|
int32_t * const pArray = (int32_t *)Xmalloc(sizeof(int32_t) * arraySize);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t k = 0; k < arraySize; k++)
|
2016-10-09 00:15:18 +00:00
|
|
|
pArray[k] = Gv_GetArrayValue(arrayNum, k);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
fwrite(pArray, 1, sizeof(int32_t) * arraySize, fil);
|
2016-08-27 01:40:06 +00:00
|
|
|
Bfree(pArray);
|
2015-02-11 05:22:11 +00:00
|
|
|
fclose(fil);
|
2010-03-18 09:10:43 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case CON_GETARRAYSIZE:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, (aGameArrays[tw].flags & GAMEARRAY_VARSIZE) ? Gv_GetVarX(aGameArrays[tw].size)
|
|
|
|
: aGameArrays[tw].size);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_RESIZEARRAY:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
|
|
|
|
int const newSize = Gv_GetVarX(*insptr++);
|
|
|
|
int const oldSize = aGameArrays[tw].size;
|
2010-03-18 09:10:43 +00:00
|
|
|
|
2015-09-24 06:31:55 +00:00
|
|
|
if (newSize >= 0 && newSize != oldSize)
|
2009-02-19 09:39:19 +00:00
|
|
|
{
|
2015-05-25 18:58:31 +00:00
|
|
|
// OSD_Printf(OSDTEXT_GREEN "CON_RESIZEARRAY: resizing array %s from %d to %d\n",
|
|
|
|
// aGameArrays[j].szLabel, aGameArrays[j].size, newSize);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:42:19 +00:00
|
|
|
intptr_t * const pArray = oldSize != 0 ? (intptr_t *)Xmalloc(GAR_ELTSZ * oldSize) : NULL;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2015-09-24 06:31:55 +00:00
|
|
|
if (oldSize != 0)
|
2016-08-27 01:42:19 +00:00
|
|
|
Bmemcpy(pArray, aGameArrays[tw].pValues, GAR_ELTSZ * oldSize);
|
2016-08-27 01:40:06 +00:00
|
|
|
|
|
|
|
Baligned_free(aGameArrays[tw].pValues);
|
2015-05-25 18:58:31 +00:00
|
|
|
|
2016-08-27 01:40:06 +00:00
|
|
|
aGameArrays[tw].pValues = newSize != 0 ? (intptr_t *)Xaligned_alloc(ACTOR_VAR_ALIGNMENT, GAR_ELTSZ * newSize) : NULL;
|
2015-05-25 18:58:31 +00:00
|
|
|
aGameArrays[tw].size = newSize;
|
|
|
|
|
2015-09-24 06:31:55 +00:00
|
|
|
if (oldSize != 0)
|
2016-08-27 01:42:19 +00:00
|
|
|
Bmemcpy(aGameArrays[tw].pValues, pArray, GAR_ELTSZ * min(oldSize, newSize));
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2015-05-25 18:58:31 +00:00
|
|
|
if (newSize > oldSize)
|
2016-08-27 01:42:19 +00:00
|
|
|
Bmemset(&aGameArrays[tw].pValues[oldSize], 0, GAR_ELTSZ * (newSize - oldSize));
|
|
|
|
|
|
|
|
Bfree(pArray);
|
2009-02-19 09:39:19 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-02-19 09:39:19 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_COPY:
|
|
|
|
insptr++;
|
2008-04-05 04:18:48 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const srcArray = *insptr++;
|
|
|
|
int srcArrayIndex = Gv_GetVarX(*insptr++); //, vm.spriteNum, vm.playerNum);
|
|
|
|
int const destArray = *insptr++;
|
|
|
|
int destArrayIndex = Gv_GetVarX(*insptr++);
|
|
|
|
int numElements = Gv_GetVarX(*insptr++);
|
2012-12-13 02:33:53 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 0;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)srcArray>=(unsigned)g_gameArrayCount))
|
2012-12-13 02:33:53 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid array %d!", srcArray);
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 1;
|
2012-12-13 02:33:53 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)destArray>=(unsigned)g_gameArrayCount))
|
2012-12-13 02:33:53 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Invalid array %d!", destArray);
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 1;
|
2012-12-13 02:33:53 +00:00
|
|
|
}
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[destArray].flags & GAMEARRAY_READONLY))
|
2012-12-13 02:33:53 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Array %d is read-only!", destArray);
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 1;
|
2012-12-13 02:33:53 +00:00
|
|
|
}
|
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(tw)) continue; // dirty replacement for VMFLAG_ERROR
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const srcArraySize = (aGameArrays[srcArray].flags & GAMEARRAY_VARSIZE)
|
|
|
|
? Gv_GetVarX(aGameArrays[srcArray].size)
|
|
|
|
: aGameArrays[srcArray].size;
|
|
|
|
|
|
|
|
int const destArraySize = (aGameArrays[destArray].flags & GAMEARRAY_VARSIZE)
|
|
|
|
? Gv_GetVarX(aGameArrays[srcArray].size)
|
|
|
|
: aGameArrays[destArray].size;
|
2012-12-13 02:33:53 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(srcArrayIndex > srcArraySize || destArrayIndex > destArraySize))
|
2015-03-24 00:40:55 +00:00
|
|
|
continue;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((srcArrayIndex + numElements) > srcArraySize)
|
|
|
|
numElements = srcArraySize - srcArrayIndex;
|
2016-08-27 01:40:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((destArrayIndex + numElements) > destArraySize)
|
|
|
|
numElements = destArraySize - destArrayIndex;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2013-05-24 13:54:34 +00:00
|
|
|
// Switch depending on the source array type.
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (aGameArrays[srcArray].flags & GAMEARRAY_TYPE_MASK)
|
2012-12-13 02:33:53 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
case 0:
|
|
|
|
// CON array to CON array.
|
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[srcArray].flags & GAMEARRAY_STRIDE2))
|
|
|
|
{
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((int32_t *)aGameArrays[srcArray].pValues)[srcArrayIndex += 2];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Bmemcpy(aGameArrays[destArray].pValues+destArrayIndex, aGameArrays[srcArray].pValues+srcArrayIndex, numElements*GAR_ELTSZ);
|
2015-03-25 21:30:25 +00:00
|
|
|
break;
|
2016-08-27 01:40:35 +00:00
|
|
|
case GAMEARRAY_OFINT:
|
|
|
|
// From int32-sized array. Note that the CON array element
|
|
|
|
// type is intptr_t, so it is different-sized on 64-bit
|
|
|
|
// archs, but same-sized on 32-bit ones.
|
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[srcArray].flags & GAMEARRAY_STRIDE2))
|
|
|
|
{
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((int32_t *)aGameArrays[srcArray].pValues)[srcArrayIndex += 2];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((int32_t *)aGameArrays[srcArray].pValues)[srcArrayIndex++];
|
|
|
|
}
|
2015-03-25 21:30:25 +00:00
|
|
|
break;
|
2016-08-27 01:40:35 +00:00
|
|
|
case GAMEARRAY_OFSHORT:
|
|
|
|
// From int16_t array. Always different-sized.
|
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[srcArray].flags & GAMEARRAY_STRIDE2))
|
|
|
|
{
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((int16_t *)aGameArrays[srcArray].pValues)[srcArrayIndex += 2];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((int16_t *)aGameArrays[srcArray].pValues)[srcArrayIndex++];
|
|
|
|
}
|
2015-03-25 21:30:25 +00:00
|
|
|
break;
|
2016-08-27 01:40:35 +00:00
|
|
|
case GAMEARRAY_OFCHAR:
|
|
|
|
// From char array. Always different-sized.
|
|
|
|
if (EDUKE32_PREDICT_FALSE(aGameArrays[srcArray].flags & GAMEARRAY_STRIDE2))
|
|
|
|
{
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((uint8_t *)aGameArrays[srcArray].pValues)[srcArrayIndex += 2];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (; numElements>0; --numElements)
|
|
|
|
{
|
|
|
|
(aGameArrays[destArray].pValues)[destArrayIndex++] =
|
|
|
|
((uint8_t *)aGameArrays[srcArray].pValues)[srcArrayIndex++];
|
|
|
|
}
|
2015-03-25 21:30:25 +00:00
|
|
|
break;
|
2012-12-13 02:33:53 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-04-05 04:18:48 +00:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RANDVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_SetVarX(*insptr, mulscale16(krand(), *(insptr + 1) + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-02-19 09:39:19 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DISPLAYRANDVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_SetVarX(*insptr, mulscale15(system_15bit_rand(), *(insptr + 1) + 1));
|
2008-08-09 10:16:18 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2016-05-13 22:15:37 +00:00
|
|
|
case CON_CLAMP:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
tw = *insptr++;
|
|
|
|
int const min = Gv_GetVarX(*insptr++);
|
|
|
|
Gv_SetVarX(tw, clamp2(Gv_GetVarX(tw), min, Gv_GetVarX(*insptr++)));
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2017-06-24 09:20:54 +00:00
|
|
|
case CON_GETCLOSESTCOL:
|
|
|
|
insptr++;
|
|
|
|
{
|
|
|
|
tw = *insptr++;
|
|
|
|
int32_t const rgb = Gv_GetVarX(*insptr++);
|
|
|
|
Gv_SetVarX(tw, getclosestcol_lim(rgb & 0xFF, (rgb >> 8) & 0xFF, (rgb >> 16) & 0xFF, Gv_GetVarX(*insptr++)));
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_INV:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[*(insptr + 1)].flags & (GAMEVAR_USER_MASK | GAMEVAR_PTR_MASK)) == 0)
|
|
|
|
aGameVars[*(insptr + 1)].global = -aGameVars[*(insptr + 1)].global;
|
2015-01-11 04:56:10 +00:00
|
|
|
else
|
|
|
|
Gv_SetVarX(*(insptr + 1), -Gv_GetVarX(*(insptr + 1)));
|
2008-08-09 10:16:18 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-12-19 20:31:40 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MULVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_MulVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DIVVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(*(insptr + 1) == 0))
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("divide by zero!\n");
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_DivVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MODVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(*(insptr + 1) == 0))
|
2009-01-18 07:32:35 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("mod by zero!\n");
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_ModVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ANDVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_AndVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ORVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_OrVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_XORVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
Gv_XorVar(*insptr, *(insptr + 1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SETVARVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
int const nValue = Gv_GetVarX(*insptr++);
|
2015-02-11 05:22:11 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[tw].flags & (GAMEVAR_USER_MASK | GAMEVAR_PTR_MASK)) == 0)
|
|
|
|
aGameVars[tw].global = nValue;
|
2015-02-11 05:22:11 +00:00
|
|
|
else
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(tw, nValue);
|
2015-02-11 05:22:11 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_RANDVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, mulscale16(krand(), Gv_GetVarX(*insptr++) + 1));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DISPLAYRANDVARVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, mulscale15(system_15bit_rand(), Gv_GetVarX(*insptr++) + 1));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GMAXAMMO:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= MAX_WEAPONS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
CON_ERRPRINTF("Invalid weapon ID %d\n", tw);
|
|
|
|
insptr++;
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(*insptr++, pPlayer->max_ammo_amount[tw]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SMAXAMMO:
|
2008-08-09 12:29:23 +00:00
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= MAX_WEAPONS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
CON_ERRPRINTF("Invalid weapon ID %d\n", tw);
|
|
|
|
insptr++;
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->max_ammo_amount[tw] = Gv_GetVarX(*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-05-10 01:29:37 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MULVARVAR:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_MulVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-08-11 10:38:46 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_DIVVARVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:06 +00:00
|
|
|
tw = *insptr++;
|
2008-08-16 11:20:08 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
int const nValue = Gv_GetVarX(*insptr++);
|
|
|
|
|
|
|
|
if (EDUKE32_PREDICT_FALSE(!nValue))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("divide by zero!\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_DivVar(tw, nValue);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_MODVARVAR:
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
|
|
|
|
int const nValue = Gv_GetVarX(*insptr++);
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(!nValue))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("mod by zero!\n");
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_ModVar(tw, nValue);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ANDVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_AndVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_XORVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_XorVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ORVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_OrVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SUBVAR:
|
|
|
|
insptr++;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
Gv_SubVar(*insptr, *(insptr+1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SUBVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SubVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDVAR:
|
|
|
|
insptr++;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
Gv_AddVar(*insptr, *(insptr+1));
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-13 23:12:47 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SHIFTVARL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[*insptr].flags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK)) == 0)
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[*insptr].global <<= *(insptr+1);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
insptr += 2;
|
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
Gv_SetVarX(*insptr, Gv_GetVarX(*insptr) << *(insptr+1));
|
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-13 23:12:47 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SHIFTVARR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((aGameVars[*insptr].flags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK)) == 0)
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[*insptr].global >>= *(insptr+1);
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
insptr += 2;
|
|
|
|
continue;
|
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
Gv_SetVarX(*insptr, Gv_GetVarX(*insptr) >> *(insptr+1));
|
|
|
|
insptr += 2;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-13 23:12:47 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_SHIFTVARVARL:
|
|
|
|
insptr++;
|
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, Gv_GetVarX(tw) << Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case CON_SHIFTVARVARR:
|
|
|
|
insptr++;
|
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, Gv_GetVarX(tw) >> Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SIN:
|
|
|
|
insptr++;
|
2015-12-23 04:06:24 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, sintable[Gv_GetVarX(*insptr++)&2047]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-13 23:12:47 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_COS:
|
|
|
|
insptr++;
|
2015-12-23 04:06:24 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_SetVarX(tw, sintable[(Gv_GetVarX(*insptr++)+512)&2047]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ADDVARVAR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = *insptr++;
|
|
|
|
Gv_AddVar(tw, Gv_GetVarX(*insptr++));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SPGETLOTAG:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_lotagVarID].global = vm.pSprite->lotag;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SPGETHITAG:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_hitagVarID].global = vm.pSprite->hitag;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-09-07 12:36:20 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SECTGETLOTAG:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_lotagVarID].global = sector[vm.pSprite->sectnum].lotag;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 02:01:48 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SECTGETHITAG:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_hitagVarID].global = sector[vm.pSprite->sectnum].hitag;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETTEXTUREFLOOR:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_textureVarID].global = sector[vm.pSprite->sectnum].floorpicnum;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_STARTTRACK:
|
|
|
|
case CON_STARTTRACKVAR:
|
|
|
|
insptr++;
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const levelNum = (tw == CON_STARTTRACK) ? *(insptr++) : Gv_GetVarX(*(insptr++));
|
2013-02-16 18:53:18 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(G_StartTrack(levelNum)))
|
2013-02-16 18:53:18 +00:00
|
|
|
CON_ERRPRINTF("invalid level %d or null music for volume %d level %d\n",
|
2016-08-27 01:40:35 +00:00
|
|
|
levelNum, ud.volume_number, levelNum);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2015-01-17 00:28:49 +00:00
|
|
|
case CON_SETMUSICPOSITION:
|
|
|
|
insptr++;
|
|
|
|
S_SetMusicPosition(Gv_GetVarX(*insptr++));
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case CON_GETMUSICPOSITION:
|
|
|
|
insptr++;
|
|
|
|
Gv_SetVarX(*insptr++, S_GetMusicPosition());
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_ACTIVATECHEAT:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = Gv_GetVarX(*(insptr++));
|
|
|
|
if (EDUKE32_PREDICT_FALSE(numplayers != 1 || !(g_player[myconnectindex].ps->gm & MODE_GAME)))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
CON_ERRPRINTF("not in a single-player game.\n");
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-02-11 05:22:11 +00:00
|
|
|
osdcmd_cheatsinfo_stat.cheatnum = tw;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_SETGAMEPALETTE:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
P_SetGamePalette(pPlayer, Gv_GetVarX(*(insptr++)), 2+16);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-01-18 07:32:35 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_GETTEXTURECEILING:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
aGameVars[g_textureVarID].global = sector[vm.pSprite->sectnum].ceilingpicnum;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARVARAND:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw &= Gv_GetVarX(*insptr++);
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFVARVAROR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw |= Gv_GetVarX(*insptr++);
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFVARVARXOR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw ^= Gv_GetVarX(*insptr++);
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFVARVAREITHER:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (Gv_GetVarX(*insptr++) || tw);
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_IFVARVARBOTH:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (Gv_GetVarX(*insptr++) && tw);
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARVARN:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw != Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFVARVARE:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw == Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFVARVARG:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw > Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_IFVARVARGE:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw >= Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARVARL:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw < Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_IFVARVARLE:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
tw = (tw <= Gv_GetVarX(*insptr++));
|
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARN:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw != *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_WHILEVARN:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
intptr_t const *const savedinsptr = insptr + 2;
|
2009-06-24 08:20:10 +00:00
|
|
|
do
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
insptr = savedinsptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = (Gv_GetVarX(*(insptr - 1)) != *insptr);
|
2015-01-11 04:56:10 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
while (tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-06-19 01:10:10 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_WHILEVARL:
|
|
|
|
{
|
|
|
|
intptr_t const *const savedinsptr = insptr + 2;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
insptr = savedinsptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = (Gv_GetVarX(*(insptr - 1)) < *insptr);
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
} while (tw);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_WHILEVARVARN:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
intptr_t const *const savedinsptr = insptr + 2;
|
2009-06-24 08:20:10 +00:00
|
|
|
do
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2015-02-11 05:22:11 +00:00
|
|
|
insptr = savedinsptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = Gv_GetVarX(*(insptr - 1));
|
|
|
|
tw = (tw != Gv_GetVarX(*insptr++));
|
2009-06-24 08:20:10 +00:00
|
|
|
insptr--;
|
2015-01-11 04:56:10 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
2006-11-16 03:02:42 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
while (tw);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2006-04-18 03:11:38 +00:00
|
|
|
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
case CON_WHILEVARVARL:
|
|
|
|
{
|
|
|
|
intptr_t const *const savedinsptr = insptr + 2;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
insptr = savedinsptr;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = Gv_GetVarX(*(insptr - 1));
|
|
|
|
tw = (tw < Gv_GetVarX(*insptr++));
|
Adds the following keywords from M32script into CON: shiftvarvarl, shiftvarvarr, ifvarvarle, ifvarvarge, ifvarvarboth, whilevarl, and whilevarvarl.
This also adds the shorthand versions of some commands, like "set" for "setvarvar", "add" for "addvarvar", "ife" for "ifvarvare", etc. There are about 30 of these. Because some of these names may already be used in some projects as variable names, this revision also includes a somewhat large change in variable naming rules: gamevars may now have the same names as CON keywords, with the caveat that the masked keyword is no longer accessible. This results in a warning at compile time but should ensure nobody's project ever stops compiling due to the introduction of new keywords.
git-svn-id: https://svn.eduke32.com/eduke32@5499 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-02 01:56:20 +00:00
|
|
|
insptr--;
|
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
} while (tw);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-02-02 00:21:24 +00:00
|
|
|
case CON_FOR: // special-purpose iteration
|
|
|
|
insptr++;
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int const returnVar = *insptr++;
|
|
|
|
int const iterType = *insptr++;
|
|
|
|
int const nIndex = iterType <= ITER_DRAWNSPRITES ? 0 : Gv_GetVarX(*insptr++);
|
|
|
|
intptr_t const *const pEnd = insptr + *insptr;
|
|
|
|
intptr_t const *const pNext = ++insptr;
|
2016-02-02 00:21:24 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (iterType)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
|
|
|
case ITER_ALLSPRITES:
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=0; jj<MAXSPRITES; ++jj)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
|
|
|
if (sprite[jj].statnum == MAXSTATUS)
|
|
|
|
continue;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_ALLSECTORS:
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=0; jj<numsectors; ++jj)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_ALLWALLS:
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=0; jj<numwalls; ++jj)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_ACTIVELIGHTS:
|
|
|
|
#ifdef POLYMER
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=0; jj<PR_MAXLIGHTS; ++jj)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
|
|
|
if (!prlights[jj].flags.active)
|
|
|
|
continue;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ITER_DRAWNSPRITES:
|
|
|
|
{
|
|
|
|
/*
|
2016-06-21 00:33:58 +00:00
|
|
|
uspritetype lastSpriteBackup;
|
|
|
|
uspritetype *const lastSpritePtr = (uspritetype *) &sprite[MAXSPRITES-1];
|
2016-02-02 00:21:24 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
// Back up sprite MAXSPRITES-1.
|
|
|
|
/*
|
2016-06-21 00:33:58 +00:00
|
|
|
Bmemcpy(&lastSpriteBackup, lastSpritePtr, sizeof(uspritetype));
|
2016-02-02 00:21:24 +00:00
|
|
|
*/
|
|
|
|
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t ii=0; ii<spritesortcnt; ii++)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
|
|
|
/*
|
2016-06-21 00:33:58 +00:00
|
|
|
Bmemcpy(lastSpritePtr, &tsprite[ii], sizeof(uspritetype));
|
2016-02-02 00:21:24 +00:00
|
|
|
*/
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, ii);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
|
|
|
|
// Copy over potentially altered tsprite.
|
|
|
|
/*
|
2016-06-21 00:33:58 +00:00
|
|
|
Bmemcpy(&tsprite[ii], lastSpritePtr, sizeof(uspritetype));
|
2016-02-02 00:21:24 +00:00
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
// Restore sprite MAXSPRITES-1.
|
|
|
|
/*
|
2016-06-21 00:33:58 +00:00
|
|
|
Bmemcpy(lastSpritePtr, &lastSpriteBackup, sizeof(uspritetype));
|
2016-02-02 00:21:24 +00:00
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case ITER_SPRITESOFSECTOR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned)nIndex >= MAXSECTORS) goto badindex;
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=headspritesect[nIndex]; jj>=0; jj=nextspritesect[jj])
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_SPRITESOFSTATUS:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned) nIndex >= MAXSTATUS) goto badindex;
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=headspritestat[nIndex]; jj>=0; jj=nextspritestat[jj])
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_WALLSOFSECTOR:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned) nIndex >= MAXSECTORS) goto badindex;
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=sector[nIndex].wallptr, endwall=jj+sector[nIndex].wallnum-1;
|
2016-02-02 00:21:24 +00:00
|
|
|
jj<=endwall; jj++)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_LOOPOFWALL:
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned) nIndex >= (unsigned)numwalls) goto badindex;
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int jj = nIndex;
|
2016-02-02 00:21:24 +00:00
|
|
|
do
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
jj = wall[jj].point2;
|
2016-08-27 01:40:35 +00:00
|
|
|
} while (jj != nIndex);
|
2016-02-02 00:21:24 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ITER_RANGE:
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t jj=0; jj<nIndex; jj++)
|
2016-02-02 00:21:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(returnVar, jj);
|
|
|
|
insptr = pNext;
|
2016-02-02 00:21:24 +00:00
|
|
|
VM_Execute(0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("Unknown iteration type %d!", iterType);
|
2016-02-02 00:21:24 +00:00
|
|
|
continue;
|
|
|
|
badindex:
|
|
|
|
OSD_Printf(OSD_ERROR "Line %d, %s %s: index %d out of range!\n", g_errorLineNum, keyw[g_tw],
|
2016-08-27 01:40:35 +00:00
|
|
|
iter_tokens[iterType].token, nIndex);
|
2016-02-02 00:21:24 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = pEnd;
|
2016-02-02 00:21:24 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARAND:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw & *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVAROR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw | *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARXOR:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw ^ *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVAREITHER:
|
2006-04-24 00:49:44 +00:00
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw || *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2016-01-08 01:33:39 +00:00
|
|
|
case CON_IFVARBOTH:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw && *insptr);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARG:
|
2008-07-16 09:27:08 +00:00
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw > *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2016-01-08 01:33:39 +00:00
|
|
|
case CON_IFVARGE:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw >= *insptr);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFVARL:
|
|
|
|
insptr++;
|
2015-01-11 04:56:10 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw < *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2016-01-08 01:33:39 +00:00
|
|
|
case CON_IFVARLE:
|
|
|
|
insptr++;
|
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
VM_CONDITIONAL(tw <= *insptr);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFPHEALTHL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(sprite[pPlayer->i].extra < *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2007-06-12 19:47:34 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFPINVENTORY:
|
|
|
|
insptr++;
|
2012-08-10 19:11:53 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
switch (*insptr++)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
case GET_STEROIDS: tw = (pPlayer->inv_amount[GET_STEROIDS] != *insptr); break;
|
|
|
|
case GET_SHIELD: tw = (pPlayer->inv_amount[GET_SHIELD] != pPlayer->max_shield_amount); break;
|
|
|
|
case GET_SCUBA: tw = (pPlayer->inv_amount[GET_SCUBA] != *insptr); break;
|
|
|
|
case GET_HOLODUKE: tw = (pPlayer->inv_amount[GET_HOLODUKE] != *insptr); break;
|
|
|
|
case GET_JETPACK: tw = (pPlayer->inv_amount[GET_JETPACK] != *insptr); break;
|
2009-06-19 01:10:10 +00:00
|
|
|
case GET_ACCESS:
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (vm.pSprite->pal)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
case 0: tw = (pPlayer->got_access & 1); break;
|
|
|
|
case 21: tw = (pPlayer->got_access & 2); break;
|
|
|
|
case 23: tw = (pPlayer->got_access & 4); break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
break;
|
2016-08-27 01:40:35 +00:00
|
|
|
case GET_HEATS: tw = (pPlayer->inv_amount[GET_HEATS] != *insptr); break;
|
|
|
|
case GET_FIRSTAID: tw = (pPlayer->inv_amount[GET_FIRSTAID] != *insptr); break;
|
|
|
|
case GET_BOOTS: tw = (pPlayer->inv_amount[GET_BOOTS] != *insptr); break;
|
2015-02-11 05:22:11 +00:00
|
|
|
default: tw = 0; CON_ERRPRINTF("invalid inventory ID: %d\n", (int32_t) * (insptr - 1));
|
2007-06-12 19:47:34 +00:00
|
|
|
}
|
2007-08-25 01:05:00 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_PSTOMP:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pPlayer->knee_incs == 0 && sprite[pPlayer->i].xrepeat >= 40)
|
2016-08-27 01:41:04 +00:00
|
|
|
if (cansee(vm.pSprite->x, vm.pSprite->y, vm.pSprite->z - ZOFFSET6, vm.pSprite->sectnum, pPlayer->pos.x,
|
2016-08-27 01:40:35 +00:00
|
|
|
pPlayer->pos.y, pPlayer->pos.z + ZOFFSET2, sprite[pPlayer->i].sectnum))
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:42:01 +00:00
|
|
|
int32_t numPlayers = g_mostConcurrentPlayers - 1;
|
2012-08-10 19:11:53 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
for (; numPlayers >= 0; --numPlayers)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (g_player[numPlayers].ps->actorsqu == vm.spriteNum)
|
2015-01-11 04:56:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-08-10 19:11:53 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (numPlayers == -1)
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pPlayer->weapon_pos == 0)
|
|
|
|
pPlayer->weapon_pos = -1;
|
|
|
|
|
|
|
|
pPlayer->actorsqu = vm.spriteNum;
|
|
|
|
pPlayer->knee_incs = 1;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
}
|
|
|
|
continue;
|
2006-04-18 03:11:38 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFAWAYFROMWALL:
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int16_t otherSectnum = vm.pSprite->sectnum;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 0;
|
2006-11-15 01:16:55 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
#define IFAWAYDIST 108
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesector(vm.pSprite->x + IFAWAYDIST, vm.pSprite->y + IFAWAYDIST, &otherSectnum);
|
|
|
|
if (otherSectnum == vm.pSprite->sectnum)
|
2009-06-24 08:20:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesector(vm.pSprite->x - IFAWAYDIST, vm.pSprite->y - IFAWAYDIST, &otherSectnum);
|
|
|
|
if (otherSectnum == vm.pSprite->sectnum)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesector(vm.pSprite->x + IFAWAYDIST, vm.pSprite->y - IFAWAYDIST, &otherSectnum);
|
|
|
|
if (otherSectnum == vm.pSprite->sectnum)
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
updatesector(vm.pSprite->x - IFAWAYDIST, vm.pSprite->y + IFAWAYDIST, &otherSectnum);
|
|
|
|
if (otherSectnum == vm.pSprite->sectnum)
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = 1;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-07 02:37:50 +00:00
|
|
|
|
2015-02-11 05:22:11 +00:00
|
|
|
VM_CONDITIONAL(tw);
|
2016-02-07 02:37:50 +00:00
|
|
|
|
|
|
|
#undef IFAWAYDIST
|
|
|
|
|
2009-06-24 08:20:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_QUOTE:
|
|
|
|
insptr++;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)(*insptr) >= MAXQUOTES) || apStrings[*insptr] == NULL)
|
2012-02-24 19:51:54 +00:00
|
|
|
{
|
2012-09-05 17:25:47 +00:00
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", (int32_t)(*insptr));
|
2012-02-24 19:51:54 +00:00
|
|
|
insptr++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.playerNum >= MAXPLAYERS))
|
2009-06-19 01:10:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
CON_ERRPRINTF("bad player for quote %d: (%d)\n", (int32_t)*insptr,vm.playerNum);
|
2009-06-19 01:10:10 +00:00
|
|
|
insptr++;
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
P_DoQuote(*(insptr++) | MAXQUOTES, pPlayer);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_USERQUOTE:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
2012-02-24 19:51:54 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= MAXQUOTES || apStrings[tw] == NULL))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", tw);
|
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2015-02-11 05:22:11 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
G_AddUserQuote(apStrings[tw]);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2012-03-05 07:24:04 +00:00
|
|
|
case CON_ECHO:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
2012-03-05 07:24:04 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= MAXQUOTES || apStrings[tw] == NULL))
|
2015-02-11 05:22:11 +00:00
|
|
|
{
|
|
|
|
CON_ERRPRINTF("invalid quote ID %d\n", tw);
|
|
|
|
continue;
|
2012-03-05 07:24:04 +00:00
|
|
|
}
|
2015-02-11 05:22:11 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
OSD_Printf("%s\n", apStrings[tw]);
|
2012-03-05 07:24:04 +00:00
|
|
|
continue;
|
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFINOUTERSPACE:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(G_CheckForSpaceFloor(vm.pSprite->sectnum));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_IFNOTMOVING:
|
2017-06-23 03:59:19 +00:00
|
|
|
VM_CONDITIONAL((vm.pActor->movflag&49152) > 16384);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_RESPAWNHITAG:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (DYNAMICTILEMAP(vm.pSprite->picnum))
|
|
|
|
{
|
|
|
|
case FEM1__STATIC:
|
|
|
|
case FEM2__STATIC:
|
|
|
|
case FEM3__STATIC:
|
|
|
|
case FEM4__STATIC:
|
|
|
|
case FEM5__STATIC:
|
|
|
|
case FEM6__STATIC:
|
|
|
|
case FEM7__STATIC:
|
|
|
|
case FEM8__STATIC:
|
|
|
|
case FEM9__STATIC:
|
|
|
|
case FEM10__STATIC:
|
|
|
|
case PODFEM1__STATIC:
|
|
|
|
case NAKED1__STATIC:
|
|
|
|
case STATUE__STATIC:
|
|
|
|
if (vm.pSprite->yvel)
|
|
|
|
G_OperateRespawns(vm.pSprite->yvel);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// if (vm.pSprite->hitag >= 0)
|
|
|
|
G_OperateRespawns(vm.pSprite->hitag);
|
|
|
|
break;
|
2009-06-19 01:10:10 +00:00
|
|
|
}
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFSPRITEPAL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(vm.pSprite->pal == *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFANGDIFFL:
|
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = klabs(G_GetAngleDelta(pPlayer->ang, vm.pSprite->ang));
|
2015-02-11 05:22:11 +00:00
|
|
|
VM_CONDITIONAL(tw <= *insptr);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2006-08-28 19:18:05 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_IFNOSOUNDS:
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_CONDITIONAL(!A_CheckAnySoundPlaying(vm.spriteNum));
|
2015-02-11 05:22:11 +00:00
|
|
|
continue;
|
2006-08-28 19:18:05 +00:00
|
|
|
|
2009-06-19 01:10:10 +00:00
|
|
|
case CON_SPRITEFLAGS:
|
|
|
|
insptr++;
|
2017-06-23 03:59:19 +00:00
|
|
|
vm.pActor->flags = Gv_GetVarX(*insptr++);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GETTICKS:
|
|
|
|
insptr++;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
Gv_SetVarX(*insptr++, getticks());
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
case CON_GETCURRADDRESS:
|
|
|
|
insptr++;
|
2015-02-11 05:22:11 +00:00
|
|
|
tw = *insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
Gv_SetVarX(tw, (intptr_t)(insptr - apScript));
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
2012-03-11 17:38:27 +00:00
|
|
|
case CON_JUMP: // XXX XXX XXX
|
2011-07-29 22:07:28 +00:00
|
|
|
insptr++;
|
2016-08-27 01:40:35 +00:00
|
|
|
tw = Gv_GetVarX(*insptr++);
|
|
|
|
insptr = (intptr_t *)(tw + apScript);
|
2009-07-12 23:41:16 +00:00
|
|
|
continue;
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
default:
|
2016-01-07 03:30:07 +00:00
|
|
|
VM_ScriptInfo(insptr, 64);
|
2009-06-19 01:10:10 +00:00
|
|
|
|
|
|
|
G_GameExit("An error has occurred in the EDuke32 virtual machine.\n\n"
|
2009-06-24 08:20:10 +00:00
|
|
|
"If you are an end user, please e-mail the file eduke32.log\n"
|
|
|
|
"along with links to any mods you're using to terminx@gmail.com.\n\n"
|
|
|
|
"If you are a mod developer, please attach all of your CON files\n"
|
|
|
|
"along with instructions on how to reproduce this error.\n\n"
|
|
|
|
"Thank you!");
|
2009-06-19 01:10:10 +00:00
|
|
|
break;
|
2009-01-18 07:32:35 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-11 17:38:27 +00:00
|
|
|
// NORECURSE
|
2016-08-27 01:40:35 +00:00
|
|
|
void A_LoadActor(int32_t spriteNum)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.spriteNum = spriteNum; // Sprite ID
|
|
|
|
vm.pSprite = &sprite[spriteNum]; // Pointer to sprite structure
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (g_tile[vm.pSprite->picnum].loadPtr == NULL)
|
2012-06-10 18:56:24 +00:00
|
|
|
return;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.pData = &actor[spriteNum].t_data[0]; // Sprite's 'extra' data
|
|
|
|
vm.playerNum = -1; // Player ID
|
|
|
|
vm.playerDist = -1; // Distance
|
|
|
|
vm.pPlayer = g_player[0].ps;
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.flags &= ~(VM_RETURN | VM_KILL | VM_NOEXECUTE);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if ((unsigned)vm.pSprite->sectnum >= MAXSECTORS)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DeleteSprite(vm.spriteNum);
|
2006-04-13 20:47:06 +00:00
|
|
|
return;
|
|
|
|
}
|
2007-02-08 04:19:39 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = g_tile[vm.pSprite->picnum].loadPtr;
|
Patch from Hendricks266 and whatever changes happened to be in my tree. I hope they work ;)
"The most noticeable change is the addition of the "includedefault" CON and DEF command, which will attempt to include eduke.con (or nam.con, or ww2gi.con), then game.con, or duke3d.def, or nam.def, or ww2gi.def. This is useful for TCs like my add-ons, where for my pseudo-mutators I currently say "include EDUKE.CON", but I also have to juggle this terrible order of paths, so that I can have an EDUKE.CON file in my HRP which says "include GAME.CON" to allow the mainline game to actually run, but also allow DukePlus to load its EDUKE.CON file (since it uses that and not an -x switch), and also allow any custom EDUKE.CON files in the root to be used."
git-svn-id: https://svn.eduke32.com/eduke32@1909 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-19 00:11:52 +00:00
|
|
|
VM_Execute(1);
|
2012-03-11 17:38:27 +00:00
|
|
|
insptr = NULL;
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.flags & VM_KILL)
|
|
|
|
A_DeleteSprite(vm.spriteNum);
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2013-02-21 18:54:07 +00:00
|
|
|
#endif
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
void VM_UpdateAnim(int spriteNum, int32_t *pData)
|
|
|
|
{
|
|
|
|
#if !defined LUNATIC
|
2016-09-06 02:15:23 +00:00
|
|
|
size_t const actionofs = AC_ACTION_ID(pData);
|
|
|
|
intptr_t const *actionptr = (actionofs != 0 && actionofs + (ACTION_PARAM_COUNT-1) < (unsigned) g_scriptSize) ? &apScript[actionofs] : NULL;
|
2016-08-27 01:41:50 +00:00
|
|
|
|
|
|
|
if (actionptr != NULL)
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
#if !defined LUNATIC
|
2016-09-06 02:15:23 +00:00
|
|
|
int const action_frames = actionptr[ACTION_NUMFRAMES];
|
|
|
|
int const action_incval = actionptr[ACTION_INCVAL];
|
|
|
|
int const action_delay = actionptr[ACTION_DELAY];
|
2016-08-27 01:41:50 +00:00
|
|
|
#else
|
|
|
|
int const action_frames = actor[spriteNum].ac.numframes;
|
|
|
|
int const action_incval = actor[spriteNum].ac.incval;
|
|
|
|
int const action_delay = actor[spriteNum].ac.delay;
|
|
|
|
#endif
|
|
|
|
uint16_t *actionticsptr = &AC_ACTIONTICS(&sprite[spriteNum], &actor[spriteNum]);
|
|
|
|
*actionticsptr += TICSPERFRAME;
|
|
|
|
|
|
|
|
if (*actionticsptr > action_delay)
|
|
|
|
{
|
|
|
|
*actionticsptr = 0;
|
|
|
|
AC_ACTION_COUNT(pData)++;
|
|
|
|
AC_CURFRAME(pData) += action_incval;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (klabs(AC_CURFRAME(pData)) >= klabs(action_frames * action_incval))
|
|
|
|
AC_CURFRAME(pData) = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-11 17:38:27 +00:00
|
|
|
// NORECURSE
|
2016-09-06 04:25:32 +00:00
|
|
|
void A_Execute(int spriteNum, int playerNum, int playerDist)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vmstate_t tempvm = {
|
2017-06-23 03:59:19 +00:00
|
|
|
spriteNum, playerNum, playerDist, 0, &sprite[spriteNum], &actor[spriteNum].t_data[0], g_player[playerNum].ps, &actor[spriteNum]
|
2016-08-27 01:40:35 +00:00
|
|
|
};
|
2014-11-22 12:29:25 +00:00
|
|
|
vm = tempvm;
|
|
|
|
|
2012-07-20 21:57:44 +00:00
|
|
|
#ifdef LUNATIC
|
2012-11-30 18:57:59 +00:00
|
|
|
int32_t killit=0;
|
2012-07-20 21:57:44 +00:00
|
|
|
#endif
|
2010-05-02 23:27:30 +00:00
|
|
|
|
2012-10-14 22:16:07 +00:00
|
|
|
/*
|
2016-08-27 01:40:35 +00:00
|
|
|
if (g_netClient && A_CheckSpriteFlags(spriteNum, SFLAG_NULL))
|
2009-12-14 20:14:12 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DeleteSprite(spriteNum);
|
2009-12-14 20:14:12 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-10-14 22:16:07 +00:00
|
|
|
*/
|
2007-03-22 18:28:41 +00:00
|
|
|
|
2010-01-16 23:08:17 +00:00
|
|
|
if (g_netServer || g_netClient)
|
2009-12-05 09:22:43 +00:00
|
|
|
randomseed = ticrandomseed;
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE((unsigned)vm.pSprite->sectnum >= MAXSECTORS))
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite))
|
|
|
|
vm.pPlayer->actors_killed++;
|
2014-11-22 12:29:25 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
A_DeleteSprite(vm.spriteNum);
|
2006-04-13 20:47:06 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:41:50 +00:00
|
|
|
VM_UpdateAnim(vm.spriteNum, vm.pData);
|
2006-04-13 20:47:06 +00:00
|
|
|
|
2012-06-10 18:56:15 +00:00
|
|
|
#ifdef LUNATIC
|
2016-08-27 01:40:35 +00:00
|
|
|
int const picnum = vm.pSprite->picnum;
|
2012-07-20 21:57:44 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
if (L_IsInitialized(&g_ElState) && El_HaveActor(picnum))
|
|
|
|
{
|
|
|
|
double t = gethiticks();
|
2013-07-13 21:04:45 +00:00
|
|
|
|
2016-08-27 01:41:33 +00:00
|
|
|
killit = (El_CallActor(&g_ElState, picnum, spriteNum, playerNum, playerDist)==1);
|
2012-12-29 15:21:32 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
t = gethiticks()-t;
|
|
|
|
g_actorTotalMs[picnum] += t;
|
|
|
|
g_actorMinMs[picnum] = min(g_actorMinMs[picnum], t);
|
|
|
|
g_actorMaxMs[picnum] = max(g_actorMaxMs[picnum], t);
|
|
|
|
g_actorCalls[picnum]++;
|
2013-03-13 10:48:19 +00:00
|
|
|
}
|
2013-02-03 12:48:17 +00:00
|
|
|
#else
|
2016-08-27 01:40:35 +00:00
|
|
|
insptr = 4 + (g_tile[vm.pSprite->picnum].execPtr);
|
2013-02-03 12:48:17 +00:00
|
|
|
VM_Execute(1);
|
|
|
|
insptr = NULL;
|
2012-07-20 21:57:44 +00:00
|
|
|
#endif
|
|
|
|
|
2012-11-30 18:57:59 +00:00
|
|
|
#ifdef LUNATIC
|
2013-07-13 21:04:45 +00:00
|
|
|
if (killit)
|
|
|
|
#else
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.flags & VM_KILL)
|
2012-11-30 18:57:59 +00:00
|
|
|
#endif
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_DeleteSprite(spriteNum, playerNum);
|
2008-08-24 19:09:17 +00:00
|
|
|
return;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
|
|
|
|
2010-05-02 23:27:30 +00:00
|
|
|
VM_Move();
|
2008-12-17 01:59:36 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->statnum != STAT_ACTOR)
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->statnum == STAT_STANDABLE)
|
2006-04-13 20:47:06 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
switch (DYNAMICTILEMAP(vm.pSprite->picnum))
|
2014-11-22 12:29:25 +00:00
|
|
|
{
|
|
|
|
case RUBBERCAN__STATIC:
|
|
|
|
case EXPLODINGBARREL__STATIC:
|
|
|
|
case WOODENHORSE__STATIC:
|
|
|
|
case HORSEONSIDE__STATIC:
|
|
|
|
case CANWITHSOMETHING__STATIC:
|
|
|
|
case FIREBARREL__STATIC:
|
|
|
|
case NUKEBARREL__STATIC:
|
|
|
|
case NUKEBARRELDENTED__STATIC:
|
|
|
|
case NUKEBARRELLEAKED__STATIC:
|
|
|
|
case TRIPBOMB__STATIC:
|
|
|
|
case EGG__STATIC:
|
2017-06-23 03:59:19 +00:00
|
|
|
if (vm.pActor->timetosleep > 1)
|
|
|
|
vm.pActor->timetosleep--;
|
|
|
|
else if (vm.pActor->timetosleep == 1)
|
2016-08-27 01:40:35 +00:00
|
|
|
changespritestat(vm.spriteNum, STAT_ZOMBIEACTOR);
|
2015-01-11 04:56:10 +00:00
|
|
|
default: break;
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2008-08-24 19:09:17 +00:00
|
|
|
return;
|
2014-11-22 12:29:25 +00:00
|
|
|
}
|
2008-08-24 19:09:17 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckEnemySprite(vm.pSprite))
|
2008-08-24 19:09:17 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (vm.pSprite->xrepeat > 60 || (ud.respawn_monsters == 1 && vm.pSprite->extra <= 0))
|
2014-11-22 12:29:25 +00:00
|
|
|
return;
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (EDUKE32_PREDICT_FALSE(ud.respawn_items == 1 && (vm.pSprite->cstat & 32768)))
|
2014-11-22 12:29:25 +00:00
|
|
|
return;
|
2008-08-24 19:09:17 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (A_CheckSpriteFlags(vm.spriteNum, SFLAG_USEACTIVATOR) && sector[vm.pSprite->sectnum].lotag & 16384)
|
|
|
|
changespritestat(vm.spriteNum, STAT_ZOMBIEACTOR);
|
2017-06-23 03:59:19 +00:00
|
|
|
else if (vm.pActor->timetosleep > 1)
|
|
|
|
vm.pActor->timetosleep--;
|
|
|
|
else if (vm.pActor->timetosleep == 1)
|
2014-10-25 03:29:21 +00:00
|
|
|
{
|
2014-10-25 03:36:34 +00:00
|
|
|
// hack for 1.3D fire sprites
|
2016-08-27 01:40:35 +00:00
|
|
|
if (EDUKE32_PREDICT_FALSE(g_scriptVersion == 13 && (vm.pSprite->picnum == FIRE || vm.pSprite->picnum == FIRE2)))
|
2014-10-25 03:29:21 +00:00
|
|
|
return;
|
2016-08-27 01:40:35 +00:00
|
|
|
changespritestat(vm.spriteNum, STAT_ZOMBIEACTOR);
|
2014-10-25 03:29:21 +00:00
|
|
|
}
|
2006-04-13 20:47:06 +00:00
|
|
|
}
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2013-05-19 19:29:26 +00:00
|
|
|
void G_SaveMapState(void)
|
2008-07-16 09:27:08 +00:00
|
|
|
{
|
2016-08-27 01:42:01 +00:00
|
|
|
int const levelNum = ud.volume_number * MAXLEVELS + ud.level_number;
|
|
|
|
map_t *const pMapInfo = &g_mapInfo[levelNum];
|
2013-05-19 19:29:26 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pMapInfo->savedstate == NULL)
|
2015-01-16 06:30:42 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
pMapInfo->savedstate = (mapstate_t *) Xaligned_alloc(16, sizeof(mapstate_t));
|
|
|
|
Bmemset(pMapInfo->savedstate, 0, sizeof(mapstate_t));
|
2015-01-16 06:30:42 +00:00
|
|
|
}
|
2016-06-05 04:46:28 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
mapstate_t *save = pMapInfo->savedstate;
|
2013-05-19 19:29:26 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
if (save == NULL)
|
|
|
|
return;
|
2011-08-03 17:22:46 +00:00
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
save->numwalls = numwalls;
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->wall[0],&wall[0],sizeof(walltype)*MAXWALLS);
|
2016-11-09 22:51:42 +00:00
|
|
|
save->numsectors = numsectors;
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->sector[0],§or[0],sizeof(sectortype)*MAXSECTORS);
|
|
|
|
Bmemcpy(&save->sprite[0],&sprite[0],sizeof(spritetype)*MAXSPRITES);
|
|
|
|
|
|
|
|
// If we're in EVENT_ANIMATESPRITES, we'll be saving pointer values to disk :-/
|
2013-02-07 21:00:52 +00:00
|
|
|
#if !defined LUNATIC
|
2015-01-11 04:56:10 +00:00
|
|
|
if (g_currentEventExec == EVENT_ANIMATESPRITES)
|
|
|
|
initprintf("Line %d: savemapstate called from EVENT_ANIMATESPRITES. WHY?\n", g_errorLineNum);
|
2013-02-07 21:00:52 +00:00
|
|
|
#endif
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->spriteext[0],&spriteext[0],sizeof(spriteext_t)*MAXSPRITES);
|
|
|
|
|
|
|
|
save->numsprites = Numsprites;
|
|
|
|
save->tailspritefree = tailspritefree;
|
|
|
|
Bmemcpy(&save->headspritesect[0],&headspritesect[0],sizeof(headspritesect));
|
|
|
|
Bmemcpy(&save->prevspritesect[0],&prevspritesect[0],sizeof(prevspritesect));
|
|
|
|
Bmemcpy(&save->nextspritesect[0],&nextspritesect[0],sizeof(nextspritesect));
|
|
|
|
Bmemcpy(&save->headspritestat[0],&headspritestat[0],sizeof(headspritestat));
|
|
|
|
Bmemcpy(&save->prevspritestat[0],&prevspritestat[0],sizeof(prevspritestat));
|
|
|
|
Bmemcpy(&save->nextspritestat[0],&nextspritestat[0],sizeof(nextspritestat));
|
2012-03-11 17:37:08 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2016-11-09 22:51:42 +00:00
|
|
|
save->numyaxbunches = numyaxbunches;
|
2013-04-09 17:35:11 +00:00
|
|
|
# if !defined NEW_MAP_FORMAT
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(save->yax_bunchnum, yax_bunchnum, sizeof(yax_bunchnum));
|
|
|
|
Bmemcpy(save->yax_nextwall, yax_nextwall, sizeof(yax_nextwall));
|
2013-04-09 17:35:11 +00:00
|
|
|
# endif
|
2012-03-11 17:37:08 +00:00
|
|
|
#endif
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->actor[0],&actor[0],sizeof(actor_t)*MAXSPRITES);
|
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_cyclerCnt = g_cyclerCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&save->g_cyclers[0],&g_cyclers[0],sizeof(g_cyclers));
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->g_playerSpawnPoints[0],&g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_animWallCnt = g_animWallCnt;
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->SpriteDeletionQueue[0],&SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_spriteDeleteQueuePos = g_spriteDeleteQueuePos;
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->animwall[0],&animwall[0],sizeof(animwall));
|
2016-01-21 19:35:30 +00:00
|
|
|
Bmemcpy(&save->origins[0],&g_origins[0],sizeof(g_origins));
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->g_mirrorWall[0],&g_mirrorWall[0],sizeof(g_mirrorWall));
|
|
|
|
Bmemcpy(&save->g_mirrorSector[0],&g_mirrorSector[0],sizeof(g_mirrorSector));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_mirrorCount = g_mirrorCount;
|
2015-01-11 04:56:10 +00:00
|
|
|
Bmemcpy(&save->show2dsector[0],&show2dsector[0],sizeof(show2dsector));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_cloudCnt = g_cloudCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&save->g_cloudSect[0],&g_cloudSect[0],sizeof(g_cloudSect));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_cloudX = g_cloudX;
|
|
|
|
save->g_cloudY = g_cloudY;
|
|
|
|
save->pskyidx = g_pskyidx;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&save->g_animateGoal[0],&g_animateGoal[0],sizeof(g_animateGoal));
|
|
|
|
Bmemcpy(&save->g_animateVel[0],&g_animateVel[0],sizeof(g_animateVel));
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_animateCnt = g_animateCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&save->g_animateSect[0],&g_animateSect[0],sizeof(g_animateSect));
|
2015-01-11 04:56:10 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
G_Util_PtrToIdx(g_animatePtr, g_animateCnt, sector, P2I_FWD);
|
|
|
|
Bmemcpy(&save->g_animatePtr[0],&g_animatePtr[0],sizeof(g_animatePtr));
|
|
|
|
G_Util_PtrToIdx(g_animatePtr, g_animateCnt, sector, P2I_BACK);
|
2011-07-29 22:07:49 +00:00
|
|
|
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:42:01 +00:00
|
|
|
EDUKE32_STATIC_ASSERT(sizeof(save->g_animatePtr) == sizeof(g_animatePtr));
|
2015-01-11 04:56:10 +00:00
|
|
|
}
|
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
save->g_playerSpawnCnt = g_playerSpawnCnt;
|
|
|
|
save->g_earthquakeTime = g_earthquakeTime;
|
|
|
|
save->lockclock = lockclock;
|
|
|
|
save->randomseed = randomseed;
|
|
|
|
save->g_globalRandom = g_globalRandom;
|
2013-10-28 21:26:32 +00:00
|
|
|
|
2013-01-20 21:17:06 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i=g_gameVarCount-1; i>=0; i--)
|
2015-01-11 04:56:10 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (aGameVars[i].flags & GAMEVAR_NORESET) continue;
|
|
|
|
if (aGameVars[i].flags & GAMEVAR_PERPLAYER)
|
2008-07-18 02:46:24 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
if (!save->vars[i])
|
2015-01-16 06:30:42 +00:00
|
|
|
save->vars[i] = (intptr_t *)Xaligned_alloc(16, MAXPLAYERS * sizeof(intptr_t));
|
2016-08-27 01:40:06 +00:00
|
|
|
Bmemcpy(&save->vars[i][0],&aGameVars[i].pValues[0],sizeof(intptr_t) * MAXPLAYERS);
|
2008-07-18 02:46:24 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (aGameVars[i].flags & GAMEVAR_PERACTOR)
|
2013-10-27 21:12:22 +00:00
|
|
|
{
|
2015-01-11 04:56:10 +00:00
|
|
|
if (!save->vars[i])
|
2015-01-16 06:30:42 +00:00
|
|
|
save->vars[i] = (intptr_t *)Xaligned_alloc(16, MAXSPRITES * sizeof(intptr_t));
|
2016-08-27 01:40:06 +00:00
|
|
|
Bmemcpy(&save->vars[i][0],&aGameVars[i].pValues[0],sizeof(intptr_t) * MAXSPRITES);
|
2013-10-27 21:12:22 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else save->vars[i] = (intptr_t *)aGameVars[i].global;
|
2015-01-11 04:56:10 +00:00
|
|
|
}
|
2016-08-27 01:41:50 +00:00
|
|
|
|
|
|
|
for (bssize_t i=g_gameArrayCount-1; i>=0; i--)
|
|
|
|
{
|
|
|
|
if ((aGameArrays[i].flags & GAMEARRAY_RESTORE) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int size;
|
|
|
|
|
|
|
|
switch (aGameArrays[i].flags & (GAMEARRAY_OFCHAR | GAMEARRAY_OFSHORT | GAMEARRAY_OFINT))
|
|
|
|
{
|
|
|
|
case GAMEARRAY_OFCHAR: size = sizeof(uint8_t); break;
|
|
|
|
case GAMEARRAY_OFSHORT: size = sizeof(uint16_t); break;
|
|
|
|
case GAMEARRAY_OFINT: size = sizeof(uint32_t); break;
|
|
|
|
default: size = sizeof(uintptr_t); break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!save->arrays[i])
|
|
|
|
save->arrays[i] = (intptr_t *)Xaligned_alloc(16, aGameArrays[i].size * size);
|
|
|
|
|
|
|
|
Bmemcpy(&save->arrays[i][0], &aGameArrays[i].pValues[0], aGameArrays[i].size * size);
|
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
#else
|
|
|
|
int32_t slen;
|
2016-08-27 01:40:35 +00:00
|
|
|
const char *svcode = El_SerializeGamevars(&slen, levelNum);
|
2015-01-11 04:56:10 +00:00
|
|
|
|
|
|
|
if (slen < 0)
|
|
|
|
{
|
|
|
|
El_OnError("ERROR: savemapstate: serialization failed!");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *savecode = Xstrdup(svcode);
|
|
|
|
Bfree(save->savecode);
|
|
|
|
save->savecode = savecode;
|
2008-07-16 09:27:08 +00:00
|
|
|
}
|
2015-01-11 04:56:10 +00:00
|
|
|
#endif
|
|
|
|
ototalclock = totalclock;
|
2008-07-16 09:27:08 +00:00
|
|
|
}
|
|
|
|
|
2013-05-19 19:29:26 +00:00
|
|
|
void G_RestoreMapState(void)
|
2008-07-16 09:27:08 +00:00
|
|
|
{
|
2016-08-27 01:42:01 +00:00
|
|
|
int const levelNum = ud.volume_number * MAXLEVELS + ud.level_number;
|
|
|
|
mapstate_t *pSavedState = g_mapInfo[levelNum].savedstate;
|
2013-05-19 19:29:26 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSavedState != NULL)
|
2008-07-16 09:27:08 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
int playerHealth[MAXPLAYERS];
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
for (bssize_t i=0; i<g_mostConcurrentPlayers; i++)
|
2016-08-27 01:40:35 +00:00
|
|
|
playerHealth[i] = sprite[g_player[i].ps->i].extra;
|
2008-07-18 03:22:20 +00:00
|
|
|
|
2008-07-16 09:27:08 +00:00
|
|
|
pub = NUMPAGES;
|
|
|
|
pus = NUMPAGES;
|
2008-11-20 14:06:36 +00:00
|
|
|
G_UpdateScreenArea();
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
numwalls = pSavedState->numwalls;
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&wall[0],&pSavedState->wall[0],sizeof(walltype)*MAXWALLS);
|
2016-11-09 22:51:42 +00:00
|
|
|
numsectors = pSavedState->numsectors;
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(§or[0],&pSavedState->sector[0],sizeof(sectortype)*MAXSECTORS);
|
|
|
|
Bmemcpy(&sprite[0],&pSavedState->sprite[0],sizeof(spritetype)*MAXSPRITES);
|
|
|
|
Bmemcpy(&spriteext[0],&pSavedState->spriteext[0],sizeof(spriteext_t)*MAXSPRITES);
|
2013-02-01 13:05:13 +00:00
|
|
|
|
|
|
|
// If we're restoring from EVENT_ANIMATESPRITES, all spriteext[].tspr
|
|
|
|
// will be overwritten, so NULL them.
|
2013-02-07 21:00:52 +00:00
|
|
|
#if !defined LUNATIC
|
2011-08-03 17:22:46 +00:00
|
|
|
if (g_currentEventExec == EVENT_ANIMATESPRITES)
|
2013-02-01 13:05:13 +00:00
|
|
|
{
|
2011-08-03 17:22:46 +00:00
|
|
|
initprintf("Line %d: loadmapstate called from EVENT_ANIMATESPRITES. WHY?\n",g_errorLineNum);
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i=0; i<MAXSPRITES; i++)
|
2011-08-03 17:22:46 +00:00
|
|
|
spriteext[i].tspr = NULL;
|
2013-02-01 13:05:13 +00:00
|
|
|
}
|
2013-02-07 21:00:52 +00:00
|
|
|
#endif
|
2016-08-27 01:40:35 +00:00
|
|
|
Numsprites = pSavedState->numsprites;
|
|
|
|
tailspritefree = pSavedState->tailspritefree;
|
|
|
|
Bmemcpy(&headspritesect[0],&pSavedState->headspritesect[0],sizeof(headspritesect));
|
|
|
|
Bmemcpy(&prevspritesect[0],&pSavedState->prevspritesect[0],sizeof(prevspritesect));
|
|
|
|
Bmemcpy(&nextspritesect[0],&pSavedState->nextspritesect[0],sizeof(nextspritesect));
|
|
|
|
Bmemcpy(&headspritestat[0],&pSavedState->headspritestat[0],sizeof(headspritestat));
|
|
|
|
Bmemcpy(&prevspritestat[0],&pSavedState->prevspritestat[0],sizeof(prevspritestat));
|
|
|
|
Bmemcpy(&nextspritestat[0],&pSavedState->nextspritestat[0],sizeof(nextspritestat));
|
2012-03-11 17:37:08 +00:00
|
|
|
#ifdef YAX_ENABLE
|
2016-11-09 22:51:42 +00:00
|
|
|
numyaxbunches = pSavedState->numyaxbunches;
|
2013-04-09 17:35:11 +00:00
|
|
|
# if !defined NEW_MAP_FORMAT
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(yax_bunchnum, pSavedState->yax_bunchnum, sizeof(yax_bunchnum));
|
|
|
|
Bmemcpy(yax_nextwall, pSavedState->yax_nextwall, sizeof(yax_nextwall));
|
2013-04-09 17:35:11 +00:00
|
|
|
# endif
|
2012-03-11 17:37:08 +00:00
|
|
|
#endif
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&actor[0],&pSavedState->actor[0],sizeof(actor_t)*MAXSPRITES);
|
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
g_cyclerCnt = pSavedState->g_cyclerCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&g_cyclers[0],&pSavedState->g_cyclers[0],sizeof(g_cyclers));
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&g_playerSpawnPoints[0],&pSavedState->g_playerSpawnPoints[0],sizeof(g_playerSpawnPoints));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_animWallCnt = pSavedState->g_animWallCnt;
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&SpriteDeletionQueue[0],&pSavedState->SpriteDeletionQueue[0],sizeof(SpriteDeletionQueue));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_spriteDeleteQueuePos = pSavedState->g_spriteDeleteQueuePos;
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&animwall[0],&pSavedState->animwall[0],sizeof(animwall));
|
|
|
|
Bmemcpy(&g_origins[0],&pSavedState->origins[0],sizeof(g_origins));
|
|
|
|
Bmemcpy(&g_mirrorWall[0],&pSavedState->g_mirrorWall[0],sizeof(g_mirrorWall));
|
|
|
|
Bmemcpy(&g_mirrorSector[0],&pSavedState->g_mirrorSector[0],sizeof(g_mirrorSector));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_mirrorCount = pSavedState->g_mirrorCount;
|
2016-08-27 01:40:35 +00:00
|
|
|
Bmemcpy(&show2dsector[0],&pSavedState->show2dsector[0],sizeof(show2dsector));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_cloudCnt = pSavedState->g_cloudCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&g_cloudSect[0],&pSavedState->g_cloudSect[0],sizeof(g_cloudSect));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_cloudX = pSavedState->g_cloudX;
|
|
|
|
g_cloudY = pSavedState->g_cloudY;
|
|
|
|
g_pskyidx = pSavedState->pskyidx;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&g_animateGoal[0],&pSavedState->g_animateGoal[0],sizeof(g_animateGoal));
|
|
|
|
Bmemcpy(&g_animateVel[0],&pSavedState->g_animateVel[0],sizeof(g_animateVel));
|
2016-11-09 22:51:42 +00:00
|
|
|
g_animateCnt = pSavedState->g_animateCnt;
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&g_animateSect[0],&pSavedState->g_animateSect[0],sizeof(g_animateSect));
|
2016-08-27 01:40:35 +00:00
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
Bmemcpy(&g_animatePtr[0],&pSavedState->g_animatePtr[0],sizeof(g_animatePtr));
|
|
|
|
G_Util_PtrToIdx(g_animatePtr, g_animateCnt, sector, P2I_BACK);
|
2011-07-29 22:07:49 +00:00
|
|
|
|
2016-11-09 22:51:42 +00:00
|
|
|
g_playerSpawnCnt = pSavedState->g_playerSpawnCnt;
|
|
|
|
g_earthquakeTime = pSavedState->g_earthquakeTime;
|
|
|
|
lockclock = pSavedState->lockclock;
|
|
|
|
randomseed = pSavedState->randomseed;
|
|
|
|
g_globalRandom = pSavedState->g_globalRandom;
|
|
|
|
|
2013-01-19 18:29:00 +00:00
|
|
|
#if !defined LUNATIC
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t i=g_gameVarCount-1; i>=0; i--)
|
2008-07-18 02:46:24 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (aGameVars[i].flags & GAMEVAR_NORESET) continue;
|
|
|
|
if (aGameVars[i].flags & GAMEVAR_PERPLAYER)
|
2009-12-05 09:22:43 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!pSavedState->vars[i]) continue;
|
|
|
|
Bmemcpy(&aGameVars[i].pValues[0],&pSavedState->vars[i][0],sizeof(intptr_t) * MAXPLAYERS);
|
2009-12-05 09:22:43 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else if (aGameVars[i].flags & GAMEVAR_PERACTOR)
|
2009-12-05 09:22:43 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
if (!pSavedState->vars[i]) continue;
|
|
|
|
Bmemcpy(&aGameVars[i].pValues[0],&pSavedState->vars[i][0],sizeof(intptr_t) * MAXSPRITES);
|
2009-12-05 09:22:43 +00:00
|
|
|
}
|
2016-08-27 01:40:35 +00:00
|
|
|
else aGameVars[i].global = (intptr_t)pSavedState->vars[i];
|
2008-07-18 02:46:24 +00:00
|
|
|
}
|
|
|
|
|
2008-11-20 14:06:36 +00:00
|
|
|
Gv_RefreshPointers();
|
2016-08-27 01:41:50 +00:00
|
|
|
|
|
|
|
for (bssize_t i=g_gameArrayCount-1; i>=0; i--)
|
|
|
|
{
|
|
|
|
if ((aGameArrays[i].flags & GAMEARRAY_RESTORE) == 0 || !pSavedState->arrays[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int size;
|
|
|
|
|
|
|
|
switch (aGameArrays[i].flags & (GAMEARRAY_OFCHAR | GAMEARRAY_OFSHORT | GAMEARRAY_OFINT))
|
|
|
|
{
|
|
|
|
case GAMEARRAY_OFCHAR: size = sizeof(uint8_t); break;
|
|
|
|
case GAMEARRAY_OFSHORT: size = sizeof(uint16_t); break;
|
|
|
|
case GAMEARRAY_OFINT: size = sizeof(uint32_t); break;
|
|
|
|
default: size = sizeof(uintptr_t); break;
|
|
|
|
}
|
|
|
|
|
|
|
|
Bmemcpy(&aGameArrays[i].pValues[0], &pSavedState->arrays[i][0], aGameArrays[i].size * size);
|
|
|
|
}
|
2013-10-27 21:12:20 +00:00
|
|
|
#else
|
2016-08-27 01:40:35 +00:00
|
|
|
if (pSavedState->savecode)
|
2013-10-27 21:12:22 +00:00
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
El_RestoreGamevars(pSavedState->savecode);
|
2013-10-27 21:12:22 +00:00
|
|
|
}
|
2013-01-01 15:24:18 +00:00
|
|
|
#endif
|
2013-10-25 21:57:09 +00:00
|
|
|
// Update g_player[].ps->i (sprite indices of players) to be consistent
|
|
|
|
// with just loaded sprites.
|
|
|
|
// Otherwise, crashes may ensue: e.g. WGR2 SVN r391, map spiderden:
|
|
|
|
// - walk forward (to door leading to other level "Shadowpine Forest")
|
|
|
|
// - in new level, walk backward to get back to the Spider Den
|
|
|
|
// - walk backward to the door leading to Shadowpine Forest --> crash.
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t SPRITES_OF(STAT_PLAYER, i))
|
2013-10-25 21:57:09 +00:00
|
|
|
{
|
2013-12-28 17:04:27 +00:00
|
|
|
int32_t snum = P_Get(i);
|
2013-10-25 21:57:09 +00:00
|
|
|
Bassert((unsigned)snum < MAXPLAYERS);
|
|
|
|
g_player[snum].ps->i = i;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:42:01 +00:00
|
|
|
for (bssize_t i=0; i<g_mostConcurrentPlayers; i++)
|
2016-08-27 01:40:35 +00:00
|
|
|
sprite[g_player[i].ps->i].extra = playerHealth[i];
|
2008-07-18 03:22:20 +00:00
|
|
|
|
2008-07-16 09:27:08 +00:00
|
|
|
if (g_player[myconnectindex].ps->over_shoulder_on != 0)
|
|
|
|
{
|
2013-01-19 18:28:32 +00:00
|
|
|
CAMERADIST = 0;
|
|
|
|
CAMERACLOCK = 0;
|
2008-07-16 09:27:08 +00:00
|
|
|
g_player[myconnectindex].ps->over_shoulder_on = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
screenpeek = myconnectindex;
|
|
|
|
|
2012-01-05 20:48:37 +00:00
|
|
|
if (ud.lockout)
|
2008-07-16 09:27:08 +00:00
|
|
|
{
|
2016-08-27 01:42:01 +00:00
|
|
|
for (bssize_t x=g_animWallCnt-1; x>=0; x--)
|
2012-01-28 14:38:23 +00:00
|
|
|
switch (DYNAMICTILEMAP(wall[animwall[x].wallnum].picnum))
|
2008-07-16 09:27:08 +00:00
|
|
|
{
|
|
|
|
case FEMPIC1__STATIC:
|
|
|
|
wall[animwall[x].wallnum].picnum = BLANKSCREEN;
|
|
|
|
break;
|
|
|
|
case FEMPIC2__STATIC:
|
|
|
|
case FEMPIC3__STATIC:
|
|
|
|
wall[animwall[x].wallnum].picnum = SCREENBREAK6;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-01-05 20:48:37 +00:00
|
|
|
#if 0
|
|
|
|
else
|
|
|
|
{
|
2016-08-27 01:41:21 +00:00
|
|
|
for (bssize_t x=g_numAnimWalls-1; x>=0; x--)
|
2012-01-05 20:48:37 +00:00
|
|
|
if (wall[animwall[x].wallnum].extra >= 0)
|
|
|
|
wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra;
|
|
|
|
}
|
|
|
|
#endif
|
2012-03-11 17:37:08 +00:00
|
|
|
#ifdef YAX_ENABLE
|
|
|
|
sv_postyaxload();
|
|
|
|
#endif
|
2011-07-29 22:07:28 +00:00
|
|
|
G_ResetInterpolations();
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2008-11-20 14:06:36 +00:00
|
|
|
Net_ResetPrediction();
|
2008-07-16 09:27:08 +00:00
|
|
|
|
2011-02-25 21:50:19 +00:00
|
|
|
G_ClearFIFO();
|
2013-07-04 19:38:46 +00:00
|
|
|
G_ResetTimers(0);
|
2008-07-16 09:27:08 +00:00
|
|
|
}
|
|
|
|
}
|
2012-12-03 18:24:25 +00:00
|
|
|
|
|
|
|
#ifdef LUNATIC
|
|
|
|
void VM_FallSprite(int32_t i)
|
|
|
|
{
|
2013-02-07 21:00:52 +00:00
|
|
|
VM_Fall(i, &sprite[i]);
|
2012-12-03 18:24:25 +00:00
|
|
|
}
|
|
|
|
|
2015-03-04 02:15:15 +00:00
|
|
|
int32_t VM_ResetPlayer2(int32_t snum, int32_t flags)
|
2012-12-03 18:24:25 +00:00
|
|
|
{
|
2015-03-04 02:15:15 +00:00
|
|
|
return VM_ResetPlayer(snum, 0, flags);
|
2012-12-03 18:24:25 +00:00
|
|
|
}
|
2013-04-05 17:52:59 +00:00
|
|
|
|
|
|
|
int32_t VM_CheckSquished2(int32_t i, int32_t snum)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
vm.spriteNum = i;
|
|
|
|
vm.pSprite = &sprite[i];
|
|
|
|
vm.playerNum = snum;
|
|
|
|
vm.pPlayer = g_player[snum].ps;
|
2013-04-05 17:52:59 +00:00
|
|
|
|
|
|
|
return VM_CheckSquished();
|
|
|
|
}
|
2012-12-03 18:24:25 +00:00
|
|
|
#endif
|
2016-02-13 21:05:57 +00:00
|
|
|
|
|
|
|
// MYOS* CON commands.
|
2016-08-27 01:40:35 +00:00
|
|
|
LUNATIC_EXTERN void VM_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum, int32_t shade,
|
|
|
|
int32_t orientation, int32_t p)
|
2016-02-13 21:05:57 +00:00
|
|
|
{
|
|
|
|
orientation &= (ROTATESPRITE_MAX-1);
|
|
|
|
|
2016-10-09 00:15:18 +00:00
|
|
|
int const rotAngle = (orientation&4) ? 1024 : 0;
|
2016-02-13 21:05:57 +00:00
|
|
|
|
|
|
|
if (!(orientation&ROTATESPRITE_FULL16))
|
|
|
|
{
|
|
|
|
x<<=16;
|
|
|
|
y<<=16;
|
|
|
|
}
|
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
rotatesprite_win(x, y, zoom, rotAngle, tilenum, shade, p, 2|orientation);
|
2016-02-13 21:05:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined LUNATIC
|
|
|
|
void VM_DrawTile(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
DukePlayer_t *pPlayer = g_player[screenpeek].ps;
|
|
|
|
int32_t tilePal = pPlayer->cursectnum >= 0 ? sector[pPlayer->cursectnum].floorpal : 0;
|
2016-02-13 21:05:57 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, tilePal);
|
2016-02-13 21:05:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void VM_DrawTilePal(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
|
|
|
|
{
|
|
|
|
VM_DrawTileGeneric(x, y, 65536, tilenum, shade, orientation, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
void VM_DrawTileSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation)
|
|
|
|
{
|
2016-08-27 01:40:35 +00:00
|
|
|
DukePlayer_t *const pPlayer = g_player[screenpeek].ps;
|
|
|
|
int32_t tilePal = pPlayer->cursectnum >= 0 ? sector[pPlayer->cursectnum].floorpal : 0;
|
2016-02-13 21:05:57 +00:00
|
|
|
|
2016-08-27 01:40:35 +00:00
|
|
|
VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, tilePal);
|
2016-02-13 21:05:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void VM_DrawTilePalSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation, int32_t p)
|
|
|
|
{
|
|
|
|
VM_DrawTileGeneric(x, y, 32768, tilenum, shade, orientation, p);
|
|
|
|
}
|
|
|
|
#endif
|