2006-02-24 04:48:15 +00:00
|
|
|
/*
|
|
|
|
** p_acs.cpp
|
|
|
|
** General BEHAVIOR management and ACS execution environment
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
2007-02-24 17:56:43 +00:00
|
|
|
** Copyright 1998-2007 Randy Heit
|
2006-02-24 04:48:15 +00:00
|
|
|
** All rights reserved.
|
|
|
|
**
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
** are met:
|
|
|
|
**
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
**
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
** This code at one time made lots of little-endian assumptions.
|
|
|
|
** I think it should be better now, but I have no real way to test it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "templates.h"
|
|
|
|
#include "doomdef.h"
|
|
|
|
#include "p_local.h"
|
|
|
|
#include "p_spec.h"
|
|
|
|
#include "g_level.h"
|
|
|
|
#include "s_sound.h"
|
|
|
|
#include "p_acs.h"
|
|
|
|
#include "p_saveg.h"
|
|
|
|
#include "p_lnspec.h"
|
|
|
|
#include "m_random.h"
|
|
|
|
#include "doomstat.h"
|
|
|
|
#include "c_console.h"
|
|
|
|
#include "c_dispatch.h"
|
|
|
|
#include "s_sndseq.h"
|
|
|
|
#include "i_system.h"
|
|
|
|
#include "i_movie.h"
|
|
|
|
#include "sbar.h"
|
|
|
|
#include "vectors.h"
|
|
|
|
#include "m_swap.h"
|
|
|
|
#include "a_sharedglobal.h"
|
|
|
|
#include "a_doomglobal.h"
|
|
|
|
#include "a_strifeglobal.h"
|
|
|
|
#include "v_video.h"
|
|
|
|
#include "w_wad.h"
|
|
|
|
#include "r_sky.h"
|
|
|
|
#include "gstrings.h"
|
2006-05-17 01:38:07 +00:00
|
|
|
#include "gi.h"
|
|
|
|
#include "sc_man.h"
|
2007-02-24 12:09:36 +00:00
|
|
|
#include "c_bind.h"
|
2007-04-22 09:06:29 +00:00
|
|
|
#include "info.h"
|
2007-12-26 16:06:03 +00:00
|
|
|
#include "r_translate.h"
|
2008-03-19 09:53:23 +00:00
|
|
|
#include "sbarinfo.h"
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
extern FILE *Logfile;
|
|
|
|
|
|
|
|
FRandom pr_acs ("ACS");
|
|
|
|
|
2007-04-22 09:06:29 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// I imagine this much stack space is probably overkill, but it could
|
|
|
|
// potentially get used with recursive functions.
|
|
|
|
#define STACK_SIZE 4096
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
#define CLAMPCOLOR(c) (EColorRange)((unsigned)(c) >= NUM_TEXT_COLORS ? CR_UNTRANSLATED : (c))
|
|
|
|
#define HUDMSG_LOG (0x80000000)
|
|
|
|
#define HUDMSG_COLORSTRING (0x40000000)
|
2008-05-18 15:48:03 +00:00
|
|
|
#define LANGREGIONMASK MAKE_ID(0,0,0xff,0xff)
|
2006-09-01 01:08:27 +00:00
|
|
|
|
|
|
|
// Flags for ReplaceTextures
|
|
|
|
#define NOT_BOTTOM 1
|
|
|
|
#define NOT_MIDDLE 2
|
|
|
|
#define NOT_TOP 4
|
|
|
|
#define NOT_FLOOR 8
|
|
|
|
#define NOT_CEILING 16
|
|
|
|
|
|
|
|
// Flags for SectorDamage
|
|
|
|
|
|
|
|
#define DAMAGE_PLAYERS 1
|
|
|
|
#define DAMAGE_NONPLAYERS 2
|
|
|
|
#define DAMAGE_IN_AIR 4
|
|
|
|
#define DAMAGE_SUBCLASSES_PROTECT 8
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
struct CallReturn
|
|
|
|
{
|
|
|
|
ScriptFunction *ReturnFunction;
|
|
|
|
FBehavior *ReturnModule;
|
2006-04-12 01:50:09 +00:00
|
|
|
SDWORD *ReturnLocals;
|
|
|
|
int ReturnAddress;
|
|
|
|
int bDiscardResult;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static DLevelScript *P_GetScriptGoing (AActor *who, line_t *where, int num, const ScriptPtr *code, FBehavior *module,
|
2008-03-12 02:56:11 +00:00
|
|
|
bool lineSide, int arg0, int arg1, int arg2, int always);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
struct FBehavior::ArrayInfo
|
|
|
|
{
|
|
|
|
DWORD ArraySize;
|
|
|
|
SDWORD *Elements;
|
|
|
|
};
|
|
|
|
|
|
|
|
TArray<FBehavior *> FBehavior::StaticModules;
|
|
|
|
|
|
|
|
//---- Inventory functions --------------------------------------//
|
|
|
|
//
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// DoClearInv
|
|
|
|
//
|
|
|
|
// Clears the inventory of a single actor.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void DoClearInv (AActor *actor)
|
|
|
|
{
|
|
|
|
AInventory *inv = actor->Inventory;
|
|
|
|
|
|
|
|
while (inv != NULL)
|
|
|
|
{
|
|
|
|
AInventory *next = inv->Inventory;
|
|
|
|
if (!(inv->ItemFlags & IF_UNDROPPABLE))
|
|
|
|
{
|
2007-10-05 08:04:38 +00:00
|
|
|
// Fix for undroppable weapons. Is this ok?
|
|
|
|
if (inv->IsKindOf(RUNTIME_CLASS(AAmmo)))
|
|
|
|
{
|
|
|
|
AAmmo *ammo = static_cast<AAmmo*>(inv);
|
|
|
|
ammo->Amount = 0;
|
|
|
|
}
|
2008-05-18 15:48:03 +00:00
|
|
|
else
|
2007-10-05 08:04:38 +00:00
|
|
|
inv->Destroy ();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else if (inv->GetClass() == RUNTIME_CLASS(AHexenArmor))
|
|
|
|
{
|
|
|
|
AHexenArmor *harmor = static_cast<AHexenArmor *> (inv);
|
|
|
|
harmor->Slots[3] = harmor->Slots[2] = harmor->Slots[1] = harmor->Slots[0] = 0;
|
|
|
|
}
|
|
|
|
inv = next;
|
|
|
|
}
|
|
|
|
if (actor->player != NULL)
|
|
|
|
{
|
|
|
|
actor->player->ReadyWeapon = NULL;
|
|
|
|
actor->player->PendingWeapon = WP_NOCHANGE;
|
|
|
|
actor->player->psprites[ps_weapon].state = NULL;
|
|
|
|
actor->player->psprites[ps_flash].state = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ClearInventory
|
|
|
|
//
|
|
|
|
// Clears the inventory for one or more actors.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void ClearInventory (AActor *activator)
|
|
|
|
{
|
|
|
|
if (activator == NULL)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < MAXPLAYERS; ++i)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
DoClearInv (players[i].mo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DoClearInv (activator);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// DoGiveInv
|
|
|
|
//
|
|
|
|
// Gives an item to a single actor.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
static void DoGiveInv (AActor *actor, const PClass *info, int amount)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AWeapon *savedPendingWeap = actor->player != NULL
|
|
|
|
? actor->player->PendingWeapon : NULL;
|
|
|
|
bool hadweap = actor->player != NULL ? actor->player->ReadyWeapon != NULL : true;
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
AInventory *item = static_cast<AInventory *>(Spawn (info, 0,0,0, NO_REPLACE));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// This shouldn't count for the item statistics!
|
2008-05-18 15:48:03 +00:00
|
|
|
if (item->flags & MF_COUNTITEM)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
level.total_items--;
|
|
|
|
item->flags &= ~MF_COUNTITEM;
|
|
|
|
}
|
|
|
|
if (info->IsDescendantOf (RUNTIME_CLASS(ABasicArmorPickup)))
|
|
|
|
{
|
|
|
|
if (static_cast<ABasicArmorPickup*>(item)->SaveAmount != 0)
|
|
|
|
{
|
|
|
|
static_cast<ABasicArmorPickup*>(item)->SaveAmount *= amount;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
static_cast<ABasicArmorPickup*>(item)->SaveAmount *= amount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (info->IsDescendantOf (RUNTIME_CLASS(ABasicArmorBonus)))
|
|
|
|
{
|
|
|
|
static_cast<ABasicArmorBonus*>(item)->SaveAmount *= amount;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
item->Amount = amount;
|
|
|
|
}
|
|
|
|
if (!item->TryPickup (actor))
|
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
}
|
|
|
|
// If the item was a weapon, don't bring it up automatically
|
|
|
|
// unless the player was not already using a weapon.
|
|
|
|
if (savedPendingWeap != NULL && hadweap)
|
|
|
|
{
|
|
|
|
actor->player->PendingWeapon = savedPendingWeap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// GiveInventory
|
|
|
|
//
|
|
|
|
// Gives an item to one or more actors.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void GiveInventory (AActor *activator, const char *type, int amount)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (amount <= 0 || type == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-05-10 02:40:43 +00:00
|
|
|
if (stricmp (type, "Armor") == 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
type = "BasicArmorPickup";
|
|
|
|
}
|
2006-05-10 02:40:43 +00:00
|
|
|
info = PClass::FindClass (type);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (info == NULL)
|
|
|
|
{
|
|
|
|
Printf ("ACS: I don't know what %s is.\n", type);
|
|
|
|
}
|
|
|
|
else if (!info->IsDescendantOf (RUNTIME_CLASS(AInventory)))
|
|
|
|
{
|
|
|
|
Printf ("ACS: %s is not an inventory item.\n", type);
|
|
|
|
}
|
|
|
|
else if (activator == NULL)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < MAXPLAYERS; ++i)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
DoGiveInv (players[i].mo, info, amount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DoGiveInv (activator, info, amount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// DoTakeInv
|
|
|
|
//
|
|
|
|
// Takes an item from a single actor.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
static void DoTakeInv (AActor *actor, const PClass *info, int amount)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AInventory *item = actor->FindInventory (info);
|
|
|
|
if (item != NULL)
|
|
|
|
{
|
|
|
|
item->Amount -= amount;
|
|
|
|
if (item->Amount <= 0)
|
|
|
|
{
|
2008-05-18 15:48:03 +00:00
|
|
|
// If it's not ammo or an internal armor, destroy it.
|
|
|
|
// Ammo needs to stick around, even when it's zero for the benefit
|
|
|
|
// of the weapons that use it and to maintain the maximum ammo
|
2007-01-12 15:24:10 +00:00
|
|
|
// amounts a backpack might have given.
|
|
|
|
// Armor shouldn't be removed because they only work properly when
|
|
|
|
// they are the last items in the inventory.
|
2007-03-07 02:24:24 +00:00
|
|
|
if (item->ItemFlags & IF_KEEPDEPLETED)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2007-03-07 02:24:24 +00:00
|
|
|
item->Amount = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-03-07 02:24:24 +00:00
|
|
|
item->Destroy ();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// TakeInventory
|
|
|
|
//
|
|
|
|
// Takes an item from one or more actors.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void TakeInventory (AActor *activator, const char *type, int amount)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (strcmp (type, "Armor") == 0)
|
|
|
|
{
|
|
|
|
type = "BasicArmor";
|
|
|
|
}
|
|
|
|
if (amount <= 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-05-10 02:40:43 +00:00
|
|
|
info = PClass::FindClass (type);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (info == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (activator == NULL)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < MAXPLAYERS; ++i)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
DoTakeInv (players[i].mo, info, amount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DoTakeInv (activator, info, amount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-25 08:44:13 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// DoUseInv
|
|
|
|
//
|
|
|
|
// Makes a single actor use an inventory item
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static bool DoUseInv (AActor *actor, const PClass *info)
|
|
|
|
{
|
|
|
|
AInventory *item = actor->FindInventory (info);
|
|
|
|
if (item != NULL)
|
|
|
|
{
|
|
|
|
return actor->UseInventory(item);
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// UseInventory
|
|
|
|
//
|
|
|
|
// makes one or more actors use an inventory item.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static int UseInventory (AActor *activator, const char *type)
|
|
|
|
{
|
|
|
|
const PClass *info;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
info = PClass::FindClass (type);
|
|
|
|
if (info == NULL)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (activator == NULL)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < MAXPLAYERS; ++i)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
ret += DoUseInv (players[i].mo, info);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret = DoUseInv (activator, info);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// CheckInventory
|
|
|
|
//
|
|
|
|
// Returns how much of a particular item an actor has.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static int CheckInventory (AActor *activator, const char *type)
|
|
|
|
{
|
|
|
|
if (activator == NULL || type == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
if (stricmp (type, "Armor") == 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
type = "BasicArmor";
|
|
|
|
}
|
2006-05-10 02:40:43 +00:00
|
|
|
else if (stricmp (type, "Health") == 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return activator->health;
|
|
|
|
}
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info = PClass::FindClass (type);
|
2006-02-24 04:48:15 +00:00
|
|
|
AInventory *item = activator->FindInventory (info);
|
|
|
|
return item ? item->Amount : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
//---- Plane watchers ----//
|
|
|
|
|
|
|
|
class DPlaneWatcher : public DThinker
|
|
|
|
{
|
|
|
|
DECLARE_CLASS (DPlaneWatcher, DThinker)
|
|
|
|
HAS_OBJECT_POINTERS
|
|
|
|
public:
|
|
|
|
DPlaneWatcher (AActor *it, line_t *line, int lineSide, bool ceiling,
|
|
|
|
int tag, int height, int special,
|
|
|
|
int arg0, int arg1, int arg2, int arg3, int arg4);
|
|
|
|
void Tick ();
|
|
|
|
void Serialize (FArchive &arc);
|
|
|
|
private:
|
|
|
|
sector_t *Sector;
|
|
|
|
fixed_t WatchD, LastD;
|
|
|
|
int Special, Arg0, Arg1, Arg2, Arg3, Arg4;
|
2008-03-12 02:56:11 +00:00
|
|
|
TObjPtr<AActor> Activator;
|
2006-02-24 04:48:15 +00:00
|
|
|
line_t *Line;
|
|
|
|
bool LineSide;
|
|
|
|
bool bCeiling;
|
|
|
|
|
|
|
|
DPlaneWatcher() {}
|
|
|
|
};
|
|
|
|
|
|
|
|
IMPLEMENT_POINTY_CLASS (DPlaneWatcher)
|
|
|
|
DECLARE_POINTER (Activator)
|
|
|
|
END_POINTERS
|
|
|
|
|
|
|
|
DPlaneWatcher::DPlaneWatcher (AActor *it, line_t *line, int lineSide, bool ceiling,
|
|
|
|
int tag, int height, int special,
|
|
|
|
int arg0, int arg1, int arg2, int arg3, int arg4)
|
|
|
|
: Special (special), Arg0 (arg0), Arg1 (arg1), Arg2 (arg2), Arg3 (arg3), Arg4 (arg4),
|
|
|
|
Activator (it), Line (line), LineSide (!!lineSide), bCeiling (ceiling)
|
|
|
|
{
|
|
|
|
int secnum;
|
|
|
|
|
|
|
|
secnum = P_FindSectorFromTag (tag, -1);
|
|
|
|
if (secnum >= 0)
|
|
|
|
{
|
|
|
|
secplane_t plane;
|
|
|
|
|
|
|
|
Sector = §ors[secnum];
|
|
|
|
if (bCeiling)
|
|
|
|
{
|
|
|
|
plane = Sector->ceilingplane;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
plane = Sector->floorplane;
|
|
|
|
}
|
|
|
|
LastD = plane.d;
|
|
|
|
plane.ChangeHeight (height << FRACBITS);
|
|
|
|
WatchD = plane.d;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Sector = NULL;
|
|
|
|
WatchD = LastD = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DPlaneWatcher::Serialize (FArchive &arc)
|
|
|
|
{
|
|
|
|
Super::Serialize (arc);
|
|
|
|
|
|
|
|
arc << Special << Arg0 << Arg1 << Arg2 << Arg3 << Arg4
|
|
|
|
<< Sector << bCeiling << WatchD << LastD << Activator
|
|
|
|
<< Line << LineSide << bCeiling;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DPlaneWatcher::Tick ()
|
|
|
|
{
|
|
|
|
if (Sector == NULL)
|
|
|
|
{
|
|
|
|
Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fixed_t newd;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (bCeiling)
|
|
|
|
{
|
|
|
|
newd = Sector->ceilingplane.d;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newd = Sector->floorplane.d;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((LastD < WatchD && newd >= WatchD) ||
|
|
|
|
(LastD > WatchD && newd <= WatchD))
|
|
|
|
{
|
|
|
|
LineSpecials[Special] (Line, Activator, LineSide, Arg0, Arg1, Arg2, Arg3, Arg4);
|
|
|
|
Destroy ();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//---- ACS lump manager ----//
|
|
|
|
|
2006-05-17 01:38:07 +00:00
|
|
|
// Load user-specified default modules. This must be called after the level's
|
|
|
|
// own behavior is loaded (if it has one).
|
|
|
|
void FBehavior::StaticLoadDefaultModules ()
|
|
|
|
{
|
|
|
|
// When playing Strife, STRFHELP is always loaded.
|
|
|
|
if (gameinfo.gametype == GAME_Strife)
|
|
|
|
{
|
|
|
|
StaticLoadModule (Wads.CheckNumForName ("STRFHELP", ns_acslibrary));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan each LOADACS lump and load the specified modules in order
|
|
|
|
int lump, lastlump = 0;
|
|
|
|
|
|
|
|
while ((lump = Wads.FindLump ("LOADACS", &lastlump)) != -1)
|
|
|
|
{
|
2008-04-03 03:19:21 +00:00
|
|
|
FScanner sc(lump);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
while (sc.GetString())
|
2006-05-17 01:38:07 +00:00
|
|
|
{
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
int acslump = Wads.CheckNumForName (sc.String, ns_acslibrary);
|
2006-05-17 01:38:07 +00:00
|
|
|
if (acslump >= 0)
|
|
|
|
{
|
|
|
|
StaticLoadModule (acslump);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
Printf ("Could not find autoloaded ACS library %s\n", sc.String);
|
2006-05-17 01:38:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-14 15:56:56 +00:00
|
|
|
FBehavior *FBehavior::StaticLoadModule (int lumpnum, FileReader * fr, int len)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
for (unsigned int i = 0; i < StaticModules.Size(); ++i)
|
|
|
|
{
|
|
|
|
if (StaticModules[i]->LumpNum == lumpnum)
|
|
|
|
{
|
|
|
|
return StaticModules[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-14 15:56:56 +00:00
|
|
|
return new FBehavior (lumpnum, fr, len);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool FBehavior::StaticCheckAllGood ()
|
|
|
|
{
|
|
|
|
for (unsigned int i = 0; i < StaticModules.Size(); ++i)
|
|
|
|
{
|
|
|
|
if (!StaticModules[i]->IsGood())
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::StaticUnloadModules ()
|
|
|
|
{
|
|
|
|
for (unsigned int i = StaticModules.Size(); i-- > 0; )
|
|
|
|
{
|
|
|
|
delete StaticModules[i];
|
|
|
|
}
|
|
|
|
StaticModules.Clear ();
|
|
|
|
}
|
|
|
|
|
|
|
|
FBehavior *FBehavior::StaticGetModule (int lib)
|
|
|
|
{
|
|
|
|
if ((size_t)lib >= StaticModules.Size())
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return StaticModules[lib];
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::StaticSerializeModuleStates (FArchive &arc)
|
|
|
|
{
|
|
|
|
DWORD modnum;
|
|
|
|
|
|
|
|
modnum = StaticModules.Size();
|
|
|
|
arc << modnum;
|
|
|
|
|
|
|
|
if (modnum != StaticModules.Size())
|
|
|
|
{
|
|
|
|
I_Error ("Level was saved with a different number of ACS modules.");
|
|
|
|
}
|
|
|
|
|
|
|
|
for (modnum = 0; modnum < StaticModules.Size(); ++modnum)
|
|
|
|
{
|
|
|
|
FBehavior *module = StaticModules[modnum];
|
|
|
|
|
|
|
|
if (arc.IsStoring())
|
|
|
|
{
|
|
|
|
arc.WriteString (module->ModuleName);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *modname = NULL;
|
|
|
|
arc << modname;
|
|
|
|
if (stricmp (modname, module->ModuleName) != 0)
|
|
|
|
{
|
|
|
|
delete[] modname;
|
|
|
|
I_Error ("Level was saved with a different set of ACS modules.");
|
|
|
|
}
|
|
|
|
delete[] modname;
|
|
|
|
}
|
|
|
|
module->SerializeVars (arc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::SerializeVars (FArchive &arc)
|
|
|
|
{
|
|
|
|
SerializeVarSet (arc, MapVarStore, NUM_MAPVARS);
|
|
|
|
for (int i = 0; i < NumArrays; ++i)
|
|
|
|
{
|
|
|
|
SerializeVarSet (arc, ArrayStore[i].Elements, ArrayStore[i].ArraySize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::SerializeVarSet (FArchive &arc, SDWORD *vars, int max)
|
|
|
|
{
|
|
|
|
SDWORD arcval;
|
|
|
|
SDWORD first, last;
|
|
|
|
|
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
// Find first non-zero variable
|
|
|
|
for (first = 0; first < max; ++first)
|
|
|
|
{
|
|
|
|
if (vars[first] != 0)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find last non-zero variable
|
|
|
|
for (last = max - 1; last >= first; --last)
|
|
|
|
{
|
|
|
|
if (vars[last] != 0)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (last < first)
|
|
|
|
{ // no non-zero variables
|
|
|
|
arcval = 0;
|
|
|
|
arc << arcval;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
arcval = last - first + 1;
|
|
|
|
arc << arcval;
|
|
|
|
arcval = first;
|
|
|
|
arc << arcval;
|
|
|
|
|
|
|
|
while (first <= last)
|
|
|
|
{
|
|
|
|
arc << vars[first];
|
|
|
|
++first;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SDWORD truelast;
|
|
|
|
|
|
|
|
arc << last;
|
|
|
|
if (last == 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
arc << first;
|
|
|
|
last += first;
|
|
|
|
truelast = last;
|
|
|
|
|
|
|
|
if (last > max)
|
|
|
|
{
|
|
|
|
last = max;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset (vars, 0, max*sizeof(*vars));
|
|
|
|
|
|
|
|
while (first < last)
|
|
|
|
{
|
|
|
|
arc << vars[first];
|
|
|
|
++first;
|
|
|
|
}
|
|
|
|
while (first < truelast)
|
|
|
|
{
|
|
|
|
arc << arcval;
|
|
|
|
++first;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-14 15:56:56 +00:00
|
|
|
FBehavior::FBehavior (int lumpnum, FileReader * fr, int len)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
BYTE *object;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
NumScripts = 0;
|
|
|
|
NumFunctions = 0;
|
|
|
|
NumArrays = 0;
|
|
|
|
NumTotalArrays = 0;
|
|
|
|
Scripts = NULL;
|
|
|
|
Functions = NULL;
|
|
|
|
Arrays = NULL;
|
|
|
|
ArrayStore = NULL;
|
|
|
|
Chunks = NULL;
|
2007-10-29 20:27:40 +00:00
|
|
|
Data = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
Format = ACS_Unknown;
|
|
|
|
LumpNum = lumpnum;
|
|
|
|
memset (MapVarStore, 0, sizeof(MapVarStore));
|
|
|
|
ModuleName[0] = 0;
|
|
|
|
|
2007-10-29 20:27:40 +00:00
|
|
|
|
|
|
|
// Now that everything is set up, record this module as being among the loaded modules.
|
|
|
|
// We need to do this before resolving any imports, because an import might (indirectly)
|
|
|
|
// need to resolve exports in this module. The only things that can be exported are
|
|
|
|
// functions and map variables, which must already be present if they're exported, so
|
|
|
|
// this is okay.
|
|
|
|
|
|
|
|
// This must be done first for 2 reasons:
|
|
|
|
// 1. If not, corrupt modules cause memory leaks
|
|
|
|
// 2. Corrupt modules won't be reported when a level is being loaded if this function quits before
|
|
|
|
// adding it to the list.
|
|
|
|
LibraryID = StaticModules.Push (this) << 16;
|
|
|
|
|
2006-06-14 15:56:56 +00:00
|
|
|
if (fr == NULL) len = Wads.LumpLength (lumpnum);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2007-10-29 20:27:40 +00:00
|
|
|
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// Any behaviors smaller than 32 bytes cannot possibly contain anything useful.
|
|
|
|
// (16 bytes for a completely empty behavior + 12 bytes for one script header
|
|
|
|
// + 4 bytes for PCD_TERMINATE for an old-style object. A new-style object
|
|
|
|
// has 24 bytes if it is completely empty. An empty SPTR chunk adds 8 bytes.)
|
|
|
|
if (len < 32)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-09-14 00:02:31 +00:00
|
|
|
object = new BYTE[len];
|
2006-06-14 15:56:56 +00:00
|
|
|
if (fr == NULL)
|
|
|
|
{
|
|
|
|
Wads.ReadLump (lumpnum, object);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fr->Read (object, len);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (object[0] != 'A' || object[1] != 'C' || object[2] != 'S')
|
|
|
|
{
|
2007-11-08 09:22:06 +00:00
|
|
|
delete[] object;
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (object[3])
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
Format = ACS_Old;
|
|
|
|
break;
|
|
|
|
case 'E':
|
|
|
|
Format = ACS_Enhanced;
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
Format = ACS_LittleEnhanced;
|
|
|
|
break;
|
|
|
|
default:
|
2007-11-08 09:22:06 +00:00
|
|
|
delete[] object;
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-06-14 15:56:56 +00:00
|
|
|
if (fr == NULL)
|
|
|
|
{
|
|
|
|
Wads.GetLumpName (ModuleName, lumpnum);
|
|
|
|
ModuleName[8] = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
strcpy(ModuleName, "BEHAVIOR");
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
Data = object;
|
|
|
|
DataSize = len;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (Format == ACS_Old)
|
|
|
|
{
|
|
|
|
DWORD dirofs = LittleLong(((DWORD *)object)[1]);
|
|
|
|
DWORD pretag = ((DWORD *)(object + dirofs))[-1];
|
|
|
|
|
|
|
|
Chunks = object + len;
|
|
|
|
// Check for redesigned ACSE/ACSe
|
|
|
|
if (dirofs >= 6*4 &&
|
|
|
|
(pretag == MAKE_ID('A','C','S','e') ||
|
|
|
|
pretag == MAKE_ID('A','C','S','E')))
|
|
|
|
{
|
|
|
|
Format = (pretag == MAKE_ID('A','C','S','e')) ? ACS_LittleEnhanced : ACS_Enhanced;
|
|
|
|
Chunks = object + LittleLong(((DWORD *)(object + dirofs))[-2]);
|
|
|
|
// Forget about the compatibility cruft at the end of the lump
|
|
|
|
DataSize = LittleLong(((DWORD *)object)[1]) - 8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Chunks = object + LittleLong(((DWORD *)object)[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
LoadScriptsDirectory ();
|
|
|
|
|
|
|
|
if (Format == ACS_Old)
|
|
|
|
{
|
|
|
|
StringTable = ((DWORD *)Data)[1];
|
|
|
|
StringTable += ((DWORD *)(Data + StringTable))[0] * 12 + 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
UnencryptStrings ();
|
2006-08-03 03:45:58 +00:00
|
|
|
BYTE *strings = FindChunk (MAKE_ID('S','T','R','L'));
|
|
|
|
if (strings != NULL)
|
|
|
|
{
|
|
|
|
StringTable = strings - Data + 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
StringTable = 0;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (Format == ACS_Old)
|
|
|
|
{
|
|
|
|
// Do initialization for old-style behavior lumps
|
|
|
|
for (i = 0; i < NUM_MAPVARS; ++i)
|
|
|
|
{
|
|
|
|
MapVars[i] = &MapVarStore[i];
|
|
|
|
}
|
2007-10-29 20:27:40 +00:00
|
|
|
//LibraryID = StaticModules.Push (this) << 16;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DWORD *chunk;
|
|
|
|
|
|
|
|
Functions = FindChunk (MAKE_ID('F','U','N','C'));
|
|
|
|
if (Functions != NULL)
|
|
|
|
{
|
|
|
|
NumFunctions = LittleLong(((DWORD *)Functions)[1]) / 8;
|
|
|
|
Functions += 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize this object's map variables
|
|
|
|
memset (MapVarStore, 0, sizeof(MapVarStore));
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('M','I','N','I'));
|
|
|
|
while (chunk != NULL)
|
|
|
|
{
|
|
|
|
int numvars = LittleLong(chunk[1])/4 - 1;
|
|
|
|
int firstvar = LittleLong(chunk[2]);
|
|
|
|
for (i = 0; i < numvars; ++i)
|
|
|
|
{
|
|
|
|
MapVarStore[i+firstvar] = LittleLong(chunk[3+i]);
|
|
|
|
}
|
|
|
|
chunk = (DWORD *)NextChunk ((BYTE *)chunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize this object's map variable pointers to defaults. They can be changed
|
|
|
|
// later once the imported modules are loaded.
|
|
|
|
for (i = 0; i < NUM_MAPVARS; ++i)
|
|
|
|
{
|
|
|
|
MapVars[i] = &MapVarStore[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create arrays for this module
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('A','R','A','Y'));
|
|
|
|
if (chunk != NULL)
|
|
|
|
{
|
|
|
|
NumArrays = LittleLong(chunk[1])/8;
|
|
|
|
ArrayStore = new ArrayInfo[NumArrays];
|
|
|
|
memset (ArrayStore, 0, sizeof(*Arrays)*NumArrays);
|
|
|
|
for (i = 0; i < NumArrays; ++i)
|
|
|
|
{
|
|
|
|
MapVarStore[LittleLong(chunk[2+i*2])] = i;
|
|
|
|
ArrayStore[i].ArraySize = LittleLong(chunk[3+i*2]);
|
|
|
|
ArrayStore[i].Elements = new SDWORD[ArrayStore[i].ArraySize];
|
|
|
|
memset(ArrayStore[i].Elements, 0, ArrayStore[i].ArraySize*sizeof(DWORD));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize arrays for this module
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('A','I','N','I'));
|
|
|
|
while (chunk != NULL)
|
|
|
|
{
|
|
|
|
int arraynum = MapVarStore[LittleLong(chunk[2])];
|
|
|
|
if ((unsigned)arraynum < (unsigned)NumArrays)
|
|
|
|
{
|
|
|
|
int initsize = MIN<int> (ArrayStore[arraynum].ArraySize, (LittleLong(chunk[1])-4)/4);
|
|
|
|
SDWORD *elems = ArrayStore[arraynum].Elements;
|
|
|
|
for (i = 0; i < initsize; ++i)
|
|
|
|
{
|
|
|
|
elems[i] = LittleLong(chunk[3+i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
chunk = (DWORD *)NextChunk((BYTE *)chunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start setting up array pointers
|
|
|
|
NumTotalArrays = NumArrays;
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('A','I','M','P'));
|
|
|
|
if (chunk != NULL)
|
|
|
|
{
|
|
|
|
NumTotalArrays += LittleLong(chunk[2]);
|
|
|
|
}
|
|
|
|
if (NumTotalArrays != 0)
|
|
|
|
{
|
|
|
|
Arrays = new ArrayInfo *[NumTotalArrays];
|
|
|
|
for (i = 0; i < NumArrays; ++i)
|
|
|
|
{
|
|
|
|
Arrays[i] = &ArrayStore[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tag the library ID to any map variables that are initialized with strings
|
|
|
|
if (LibraryID != 0)
|
|
|
|
{
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('M','S','T','R'));
|
|
|
|
if (chunk != NULL)
|
|
|
|
{
|
|
|
|
for (DWORD i = 0; i < chunk[1]/4; ++i)
|
|
|
|
{
|
|
|
|
MapVarStore[chunk[i+2]] |= LibraryID;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
chunk = (DWORD *)FindChunk (MAKE_ID('A','S','T','R'));
|
|
|
|
if (chunk != NULL)
|
|
|
|
{
|
|
|
|
for (DWORD i = 0; i < chunk[1]/4; ++i)
|
|
|
|
{
|
|
|
|
int arraynum = MapVarStore[LittleLong(chunk[i+2])];
|
|
|
|
if ((unsigned)arraynum < (unsigned)NumArrays)
|
|
|
|
{
|
|
|
|
SDWORD *elems = ArrayStore[arraynum].Elements;
|
|
|
|
for (int j = ArrayStore[arraynum].ArraySize; j > 0; --j, ++elems)
|
|
|
|
{
|
|
|
|
*elems |= LibraryID;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (NULL != (chunk = (DWORD *)FindChunk (MAKE_ID('L','O','A','D'))))
|
|
|
|
{
|
|
|
|
const char *const parse = (char *)&chunk[2];
|
|
|
|
DWORD i;
|
|
|
|
|
|
|
|
for (i = 0; i < chunk[1]; )
|
|
|
|
{
|
|
|
|
if (parse[i])
|
|
|
|
{
|
|
|
|
FBehavior *module = NULL;
|
|
|
|
int lump = Wads.CheckNumForName (&parse[i], ns_acslibrary);
|
|
|
|
if (lump < 0)
|
|
|
|
{
|
|
|
|
Printf ("Could not find ACS library %s.\n", &parse[i]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
module = StaticLoadModule (lump);
|
|
|
|
}
|
2007-10-29 20:27:40 +00:00
|
|
|
if (module != NULL) Imports.Push (module);
|
2006-02-24 04:48:15 +00:00
|
|
|
do ; while (parse[++i]);
|
|
|
|
}
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Go through each imported module in order and resolve all imported functions
|
|
|
|
// and map variables.
|
|
|
|
for (i = 0; i < Imports.Size(); ++i)
|
|
|
|
{
|
|
|
|
FBehavior *lib = Imports[i];
|
|
|
|
int j;
|
|
|
|
|
|
|
|
if (lib == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// Resolve functions
|
|
|
|
chunk = (DWORD *)FindChunk(MAKE_ID('F','N','A','M'));
|
|
|
|
for (j = 0; j < NumFunctions; ++j)
|
|
|
|
{
|
|
|
|
ScriptFunction *func = &((ScriptFunction *)Functions)[j];
|
|
|
|
if (func->Address == 0 && func->ImportNum == 0)
|
|
|
|
{
|
|
|
|
int libfunc = lib->FindFunctionName ((char *)(chunk + 2) + chunk[3+j]);
|
|
|
|
if (libfunc >= 0)
|
|
|
|
{
|
|
|
|
ScriptFunction *realfunc = &((ScriptFunction *)lib->Functions)[libfunc];
|
|
|
|
// Make sure that the library really defines this function. It might simply
|
|
|
|
// be importing it itself.
|
|
|
|
if (realfunc->Address != 0 && realfunc->ImportNum == 0)
|
|
|
|
{
|
|
|
|
func->Address = libfunc;
|
|
|
|
func->ImportNum = i+1;
|
|
|
|
if (realfunc->ArgCount != func->ArgCount)
|
|
|
|
{
|
|
|
|
Printf ("Function %s in %s has %d arguments. %s expects it to have %d.\n",
|
|
|
|
(char *)(chunk + 2) + chunk[3+j], lib->ModuleName, realfunc->ArgCount,
|
|
|
|
ModuleName, func->ArgCount);
|
|
|
|
Format = ACS_Unknown;
|
|
|
|
}
|
|
|
|
// The next two properties do not effect code compatibility, so it is
|
|
|
|
// okay for them to be different in the imported module than they are
|
|
|
|
// in this one, as long as we make sure to use the real values.
|
|
|
|
func->LocalCount = realfunc->LocalCount;
|
|
|
|
func->HasReturnValue = realfunc->HasReturnValue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve map variables
|
|
|
|
chunk = (DWORD *)FindChunk(MAKE_ID('M','I','M','P'));
|
|
|
|
if (chunk != NULL)
|
|
|
|
{
|
|
|
|
char *parse = (char *)&chunk[2];
|
|
|
|
for (DWORD j = 0; j < chunk[1]; )
|
|
|
|
{
|
|
|
|
DWORD varNum = LittleLong(*(DWORD *)&parse[j]);
|
|
|
|
j += 4;
|
|
|
|
int impNum = lib->FindMapVarName (&parse[j]);
|
|
|
|
if (impNum >= 0)
|
|
|
|
{
|
|
|
|
MapVars[varNum] = &lib->MapVarStore[impNum];
|
|
|
|
}
|
|
|
|
do ; while (parse[++j]);
|
|
|
|
++j;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Resolve arrays
|
|
|
|
if (NumTotalArrays > NumArrays)
|
|
|
|
{
|
|
|
|
chunk = (DWORD *)FindChunk(MAKE_ID('A','I','M','P'));
|
|
|
|
char *parse = (char *)&chunk[3];
|
|
|
|
for (DWORD j = 0; j < LittleLong(chunk[2]); ++j)
|
|
|
|
{
|
|
|
|
DWORD varNum = LittleLong(*(DWORD *)parse);
|
|
|
|
parse += 4;
|
|
|
|
DWORD expectedSize = LittleLong(*(DWORD *)parse);
|
|
|
|
parse += 4;
|
|
|
|
int impNum = lib->FindMapArray (parse);
|
|
|
|
if (impNum >= 0)
|
|
|
|
{
|
|
|
|
Arrays[NumArrays + j] = &lib->ArrayStore[impNum];
|
|
|
|
MapVarStore[varNum] = NumArrays + j;
|
|
|
|
if (lib->ArrayStore[impNum].ArraySize != expectedSize)
|
|
|
|
{
|
|
|
|
Format = ACS_Unknown;
|
2006-09-14 00:02:31 +00:00
|
|
|
Printf ("The array %s in %s has %u elements, but %s expects it to only have %u.\n",
|
2006-02-24 04:48:15 +00:00
|
|
|
parse, lib->ModuleName, lib->ArrayStore[impNum].ArraySize,
|
|
|
|
ModuleName, expectedSize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
do ; while (*++parse);
|
|
|
|
++parse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DPrintf ("Loaded %d scripts, %d functions\n", NumScripts, NumFunctions);
|
|
|
|
}
|
|
|
|
|
|
|
|
FBehavior::~FBehavior ()
|
|
|
|
{
|
|
|
|
if (Scripts != NULL)
|
|
|
|
{
|
|
|
|
delete[] Scripts;
|
|
|
|
Scripts = NULL;
|
|
|
|
}
|
|
|
|
if (Arrays != NULL)
|
|
|
|
{
|
|
|
|
delete[] Arrays;
|
|
|
|
Arrays = NULL;
|
|
|
|
}
|
|
|
|
if (ArrayStore != NULL)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < NumArrays; ++i)
|
|
|
|
{
|
|
|
|
if (ArrayStore[i].Elements != NULL)
|
|
|
|
{
|
|
|
|
delete[] ArrayStore[i].Elements;
|
|
|
|
ArrayStore[i].Elements = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
delete[] ArrayStore;
|
|
|
|
ArrayStore = NULL;
|
|
|
|
}
|
|
|
|
if (Data != NULL)
|
|
|
|
{
|
|
|
|
delete[] Data;
|
|
|
|
Data = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::LoadScriptsDirectory ()
|
|
|
|
{
|
|
|
|
union
|
|
|
|
{
|
|
|
|
BYTE *b;
|
|
|
|
DWORD *dw;
|
|
|
|
WORD *w;
|
|
|
|
ScriptPtr2 *po; // Old
|
|
|
|
ScriptPtr1 *pi; // Intermediate
|
|
|
|
ScriptPtr3 *pe; // LittleEnhanced
|
|
|
|
} scripts;
|
|
|
|
int i, max;
|
|
|
|
|
|
|
|
NumScripts = 0;
|
|
|
|
Scripts = NULL;
|
|
|
|
|
|
|
|
// Load the main script directory
|
|
|
|
switch (Format)
|
|
|
|
{
|
|
|
|
case ACS_Old:
|
|
|
|
scripts.dw = (DWORD *)(Data + ((DWORD *)Data)[1]);
|
|
|
|
NumScripts = scripts.dw[0];
|
|
|
|
if (NumScripts != 0)
|
|
|
|
{
|
|
|
|
scripts.dw++;
|
|
|
|
|
|
|
|
Scripts = new ScriptPtr[NumScripts];
|
|
|
|
|
|
|
|
for (i = 0; i < NumScripts; ++i)
|
|
|
|
{
|
|
|
|
ScriptPtr2 *ptr1 = &scripts.po[i];
|
|
|
|
ScriptPtr *ptr2 = &Scripts[i];
|
|
|
|
|
|
|
|
ptr2->Number = LittleLong(ptr1->Number) % 1000;
|
|
|
|
ptr2->Type = LittleLong(ptr1->Number) / 1000;
|
|
|
|
ptr2->ArgCount = LittleLong(ptr1->ArgCount);
|
|
|
|
ptr2->Address = LittleLong(ptr1->Address);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ACS_Enhanced:
|
|
|
|
case ACS_LittleEnhanced:
|
|
|
|
scripts.b = FindChunk (MAKE_ID('S','P','T','R'));
|
|
|
|
if (scripts.b == NULL)
|
|
|
|
{
|
|
|
|
// There are no scripts!
|
|
|
|
}
|
|
|
|
else if (*(DWORD *)Data != MAKE_ID('A','C','S',0))
|
|
|
|
{
|
|
|
|
NumScripts = scripts.dw[1] / 12;
|
|
|
|
Scripts = new ScriptPtr[NumScripts];
|
|
|
|
scripts.dw += 2;
|
|
|
|
|
|
|
|
for (i = 0; i < NumScripts; ++i)
|
|
|
|
{
|
|
|
|
ScriptPtr1 *ptr1 = &scripts.pi[i];
|
|
|
|
ScriptPtr *ptr2 = &Scripts[i];
|
|
|
|
|
|
|
|
ptr2->Number = LittleShort(ptr1->Number);
|
|
|
|
ptr2->Type = LittleShort(ptr1->Type);
|
|
|
|
ptr2->ArgCount = LittleLong(ptr1->ArgCount);
|
|
|
|
ptr2->Address = LittleLong(ptr1->Address);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NumScripts = scripts.dw[1] / 8;
|
|
|
|
Scripts = new ScriptPtr[NumScripts];
|
|
|
|
scripts.dw += 2;
|
|
|
|
|
|
|
|
for (i = 0; i < NumScripts; ++i)
|
|
|
|
{
|
|
|
|
ScriptPtr3 *ptr1 = &scripts.pe[i];
|
|
|
|
ScriptPtr *ptr2 = &Scripts[i];
|
|
|
|
|
|
|
|
ptr2->Number = LittleShort(ptr1->Number);
|
|
|
|
ptr2->Type = ptr1->Type;
|
|
|
|
ptr2->ArgCount = ptr1->ArgCount;
|
|
|
|
ptr2->Address = LittleLong(ptr1->Address);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (i = 0; i < NumScripts; ++i)
|
|
|
|
{
|
|
|
|
Scripts[i].Flags = 0;
|
|
|
|
Scripts[i].VarCount = LOCAL_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sort scripts, so we can use a binary search to find them
|
|
|
|
if (NumScripts > 1)
|
|
|
|
{
|
|
|
|
qsort (Scripts, NumScripts, sizeof(ScriptPtr), SortScripts);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Format == ACS_Old)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Load script flags
|
|
|
|
scripts.b = FindChunk (MAKE_ID('S','F','L','G'));
|
|
|
|
if (scripts.dw != NULL)
|
|
|
|
{
|
|
|
|
max = scripts.dw[1];
|
|
|
|
scripts.dw += 2;
|
|
|
|
for (i = max; i > 0; --i, scripts.w += 2)
|
|
|
|
{
|
|
|
|
ScriptPtr *ptr = const_cast<ScriptPtr *>(FindScript (LittleShort(scripts.w[0])));
|
|
|
|
if (ptr != NULL)
|
|
|
|
{
|
|
|
|
ptr->Flags = LittleShort(scripts.w[1]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Load script var counts
|
|
|
|
scripts.b = FindChunk (MAKE_ID('S','V','C','T'));
|
|
|
|
if (scripts.dw != NULL)
|
|
|
|
{
|
|
|
|
max = scripts.dw[1];
|
|
|
|
scripts.dw += 2;
|
|
|
|
for (i = max; i > 0; --i, scripts.w += 2)
|
|
|
|
{
|
|
|
|
ScriptPtr *ptr = const_cast<ScriptPtr *>(FindScript (LittleShort(scripts.w[0])));
|
|
|
|
if (ptr != NULL)
|
|
|
|
{
|
|
|
|
ptr->VarCount = LittleShort(scripts.w[1]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int STACK_ARGS FBehavior::SortScripts (const void *a, const void *b)
|
|
|
|
{
|
|
|
|
ScriptPtr *ptr1 = (ScriptPtr *)a;
|
|
|
|
ScriptPtr *ptr2 = (ScriptPtr *)b;
|
|
|
|
return ptr1->Number - ptr2->Number;
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::UnencryptStrings ()
|
|
|
|
{
|
|
|
|
DWORD *prevchunk = NULL;
|
|
|
|
DWORD *chunk = (DWORD *)FindChunk(MAKE_ID('S','T','R','E'));
|
|
|
|
while (chunk != NULL)
|
|
|
|
{
|
|
|
|
for (DWORD strnum = 0; strnum < chunk[3]; ++strnum)
|
|
|
|
{
|
|
|
|
int ofs = chunk[5+strnum];
|
|
|
|
BYTE *data = (BYTE *)chunk + ofs + 8, last;
|
|
|
|
int p = (BYTE)(ofs*157135);
|
|
|
|
int i = 0;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
last = (data[i] ^= (BYTE)(p+(i>>1)));
|
|
|
|
++i;
|
|
|
|
} while (last != 0);
|
|
|
|
}
|
|
|
|
prevchunk = chunk;
|
|
|
|
chunk = (DWORD *)NextChunk ((BYTE *)chunk);
|
|
|
|
*prevchunk = MAKE_ID('S','T','R','L');
|
|
|
|
}
|
|
|
|
if (prevchunk != NULL)
|
|
|
|
{
|
|
|
|
*prevchunk = MAKE_ID('S','T','R','L');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool FBehavior::IsGood ()
|
|
|
|
{
|
|
|
|
bool bad;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
// Check that the data format was understood
|
|
|
|
if (Format == ACS_Unknown)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that all functions are resolved
|
|
|
|
bad = false;
|
|
|
|
for (i = 0; i < NumFunctions; ++i)
|
|
|
|
{
|
|
|
|
ScriptFunction *funcdef = (ScriptFunction *)Functions + i;
|
|
|
|
if (funcdef->Address == 0 && funcdef->ImportNum == 0)
|
|
|
|
{
|
|
|
|
DWORD *chunk = (DWORD *)FindChunk (MAKE_ID('F','N','A','M'));
|
|
|
|
Printf ("Could not find ACS function %s for use in %s.\n",
|
|
|
|
(char *)(chunk + 2) + chunk[3+i], ModuleName);
|
|
|
|
bad = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that all imported modules were loaded
|
|
|
|
for (i = Imports.Size() - 1; i >= 0; --i)
|
|
|
|
{
|
|
|
|
if (Imports[i] == NULL)
|
|
|
|
{
|
|
|
|
Printf ("Not all the libraries used by %s could be found.\n", ModuleName);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return !bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
const ScriptPtr *FBehavior::FindScript (int script) const
|
|
|
|
{
|
|
|
|
const ScriptPtr *ptr = BinarySearch<ScriptPtr, WORD>
|
|
|
|
((ScriptPtr *)Scripts, NumScripts, &ScriptPtr::Number, (WORD)script);
|
|
|
|
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
const ScriptPtr *FBehavior::StaticFindScript (int script, FBehavior *&module)
|
|
|
|
{
|
|
|
|
for (DWORD i = 0; i < StaticModules.Size(); ++i)
|
|
|
|
{
|
|
|
|
const ScriptPtr *code = StaticModules[i]->FindScript (script);
|
|
|
|
if (code != NULL)
|
|
|
|
{
|
|
|
|
module = StaticModules[i];
|
|
|
|
return code;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ScriptFunction *FBehavior::GetFunction (int funcnum, FBehavior *&module) const
|
|
|
|
{
|
|
|
|
if ((unsigned)funcnum >= (unsigned)NumFunctions)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ScriptFunction *funcdef = (ScriptFunction *)Functions + funcnum;
|
|
|
|
if (funcdef->ImportNum)
|
|
|
|
{
|
|
|
|
return Imports[funcdef->ImportNum - 1]->GetFunction (funcdef->Address, module);
|
|
|
|
}
|
|
|
|
// Should I just un-const this function instead of using a const_cast?
|
|
|
|
module = const_cast<FBehavior *>(this);
|
|
|
|
return funcdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
int FBehavior::FindFunctionName (const char *funcname) const
|
|
|
|
{
|
|
|
|
return FindStringInChunk ((DWORD *)FindChunk (MAKE_ID('F','N','A','M')), funcname);
|
|
|
|
}
|
|
|
|
|
|
|
|
int FBehavior::FindMapVarName (const char *varname) const
|
|
|
|
{
|
|
|
|
return FindStringInChunk ((DWORD *)FindChunk (MAKE_ID('M','E','X','P')), varname);
|
|
|
|
}
|
|
|
|
|
|
|
|
int FBehavior::FindMapArray (const char *arrayname) const
|
|
|
|
{
|
|
|
|
int var = FindMapVarName (arrayname);
|
|
|
|
if (var >= 0)
|
|
|
|
{
|
|
|
|
return MapVarStore[var];
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int FBehavior::FindStringInChunk (DWORD *names, const char *varname) const
|
|
|
|
{
|
|
|
|
if (names != NULL)
|
|
|
|
{
|
|
|
|
DWORD i;
|
|
|
|
|
|
|
|
for (i = 0; i < names[2]; ++i)
|
|
|
|
{
|
|
|
|
if (stricmp (varname, (char *)(names + 2) + names[3+i]) == 0)
|
|
|
|
{
|
|
|
|
return (int)i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int FBehavior::GetArrayVal (int arraynum, int index) const
|
|
|
|
{
|
|
|
|
if ((unsigned)arraynum >= (unsigned)NumTotalArrays)
|
|
|
|
return 0;
|
|
|
|
const ArrayInfo *array = Arrays[arraynum];
|
|
|
|
if ((unsigned)index >= (unsigned)array->ArraySize)
|
|
|
|
return 0;
|
|
|
|
return array->Elements[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::SetArrayVal (int arraynum, int index, int value)
|
|
|
|
{
|
|
|
|
if ((unsigned)arraynum >= (unsigned)NumTotalArrays)
|
|
|
|
return;
|
|
|
|
const ArrayInfo *array = Arrays[arraynum];
|
|
|
|
if ((unsigned)index >= (unsigned)array->ArraySize)
|
|
|
|
return;
|
|
|
|
array->Elements[index] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
BYTE *FBehavior::FindChunk (DWORD id) const
|
|
|
|
{
|
|
|
|
BYTE *chunk = Chunks;
|
|
|
|
|
|
|
|
while (chunk != NULL && chunk < Data + DataSize)
|
|
|
|
{
|
|
|
|
if (((DWORD *)chunk)[0] == id)
|
|
|
|
{
|
|
|
|
return chunk;
|
|
|
|
}
|
|
|
|
chunk += ((DWORD *)chunk)[1] + 8;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
BYTE *FBehavior::NextChunk (BYTE *chunk) const
|
|
|
|
{
|
|
|
|
DWORD id = *(DWORD *)chunk;
|
|
|
|
chunk += ((DWORD *)chunk)[1] + 8;
|
|
|
|
while (chunk != NULL && chunk < Data + DataSize)
|
|
|
|
{
|
|
|
|
if (((DWORD *)chunk)[0] == id)
|
|
|
|
{
|
|
|
|
return chunk;
|
|
|
|
}
|
|
|
|
chunk += ((DWORD *)chunk)[1] + 8;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *FBehavior::StaticLookupString (DWORD index)
|
|
|
|
{
|
|
|
|
DWORD lib = index >> 16;
|
|
|
|
if (lib >= (DWORD)StaticModules.Size())
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return StaticModules[lib]->LookupString (index & 0xffff);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *FBehavior::LookupString (DWORD index) const
|
|
|
|
{
|
2006-08-03 03:45:58 +00:00
|
|
|
if (StringTable == 0)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (Format == ACS_Old)
|
|
|
|
{
|
|
|
|
DWORD *list = (DWORD *)(Data + StringTable);
|
|
|
|
|
|
|
|
if (index >= list[0])
|
|
|
|
return NULL; // Out of range for this list;
|
|
|
|
return (const char *)(Data + list[1+index]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DWORD *list = (DWORD *)(Data + StringTable);
|
|
|
|
|
|
|
|
if (index >= list[1])
|
|
|
|
return NULL; // Out of range for this list
|
|
|
|
return (const char *)(Data + StringTable + list[3+index]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::StaticStartTypedScripts (WORD type, AActor *activator, bool always, int arg1, bool runNow)
|
|
|
|
{
|
2008-02-05 23:32:49 +00:00
|
|
|
DPrintf("Starting all scripts of type %d\n", type);
|
2006-02-24 04:48:15 +00:00
|
|
|
for (unsigned int i = 0; i < StaticModules.Size(); ++i)
|
|
|
|
{
|
|
|
|
StaticModules[i]->StartTypedScripts (type, activator, always, arg1, runNow);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FBehavior::StartTypedScripts (WORD type, AActor *activator, bool always, int arg1, bool runNow)
|
|
|
|
{
|
|
|
|
const ScriptPtr *ptr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < NumScripts; ++i)
|
|
|
|
{
|
|
|
|
ptr = &Scripts[i];
|
|
|
|
if (ptr->Type == type)
|
|
|
|
{
|
|
|
|
DLevelScript *runningScript = P_GetScriptGoing (activator, NULL, ptr->Number,
|
2008-03-12 02:56:11 +00:00
|
|
|
ptr, this, 0, arg1, 0, 0, always);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (runNow)
|
|
|
|
{
|
|
|
|
runningScript->RunScript ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Added some hackery at the start of MouseRead_Win32() that prevents it from
yanking the mouse around if they keys haven't been read yet to combat the
same situation that causes the keyboard to return DIERR_NOTACQUIRED in
KeyRead(): The window is sort of in focus and sort of not. User.dll
considers it to be focused and it's drawn as such, but another focused
window is on top of it, and DirectInput doesn't see it as focused.
- Fixed: KeyRead() should handle DIERR_NOTACQUIRED errors the same way it
handles DIERR_INPUTLOST errors. This can happen if our window had the
focus stolen away from it before we tried to acquire the keyboard in
DI_Init2(). Strangely, MouseRead_DI() already did this.
- When a stack overflow occurs, report.txt now only includes the first and
last 16KB of the stack to make it more manageable.
- Limited StreamEditBinary() to the first 64KB of the file to keep it from
taking too long on large dumps.
- And now I know why gathering crash information in the same process that
crashed can be bad: Stack overflows. You get one spare page to play with
when the stack overflows. MiniDumpWriteDump() needs more than that and
causes an access violation when it runs out of leftover stack, silently
terminating the application. Windows XP x64 offers SetThreadStackGuarantee()
to increase this, but that isn't available on anything older, including
32-bit XP. To get around this, a new thread is created to write the mini
dump when the stack overflows.
- Changed A_Burnination() to be closer to Strife's.
- Fixed: When playing back demos, DoAddBot() can be called without an
associated call to SpawnBot(). So if the bot can't spawn, botnum can
go negative, which will cause problems later in DCajunMaster::Main()
when it sees that wanted_botnum (0) is higher than botnum (-1).
- Fixed: Stopping demo recording in multiplayer games should not abruptly
drop the recorder out of the game without notifying the other players.
In fact, there's no reason why it should drop them out of multiplayer at
all.
- Fixed: Earthquakes were unreliable in multiplayer games because
P_PredictPlayer() did not preserve the player's xviewshift.
- Fixed: PlayerIsGone() needs to stop any scripts that belong to the player
who left, in addition to executing disconnect scripts.
- Fixed: APlayerPawn::AddInventory() should also check for a NULL player->mo
in case the player left but somebody still has a reference to their actor.
- Fixed: DDrawFB::PaintToWindow() should simulate proper unlocking behavior
and set Buffer to NULL.
- Improved feedback for network game initialization with the console ticker.
- Moved i_net.cpp and i_net.h out of sdl/ and win32/ and into the main source
directory. They are identical, so keeping two copies of them is bad.
- Fixed: (At least with Creative's driver's,) EAX settings are global and not
per-application. So if you play a multiplayer ZDoom game on one computer
(or even another EAX-using application), ZDoom needs to restore the
environment when it regains focus.
- Maybe fixed: (See http://forum.zdoom.org/potato.php?t=10689) Apparently,
PacketGet can receive ECONNRESET from nodes that aren't in the game. It
should be safe to just ignore these packets.
- Fixed: PlayerIsGone() should set the gone player's camera to NULL in case
the player who left was player 0. This is because if a remaining player
receives a "recoverable" error, they will become player 0. Once that happens,
they game will try to update sounds through their camera and crash in
FMODSoundRenderer::UpdateListener() because the zones array is now NULL.
G_NewInit() should also clear all the player structures.
SVN r233 (trunk)
2006-06-30 02:13:26 +00:00
|
|
|
// FBehavior :: StaticStopMyScripts
|
|
|
|
//
|
|
|
|
// Stops any scripts started by the specified actor. Used by the net code
|
|
|
|
// when a player disconnects. Should this be used in general whenever an
|
|
|
|
// actor is destroyed?
|
|
|
|
|
|
|
|
void FBehavior::StaticStopMyScripts (AActor *actor)
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller != NULL)
|
|
|
|
{
|
|
|
|
controller->StopScriptsFor (actor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//---- The ACS Interpreter ----//
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
IMPLEMENT_POINTY_CLASS (DACSThinker)
|
|
|
|
DECLARE_POINTER(LastScript)
|
|
|
|
DECLARE_POINTER(Scripts)
|
|
|
|
END_POINTERS
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-03-13 03:14:33 +00:00
|
|
|
TObjPtr<DACSThinker> DACSThinker::ActiveThinker;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
DACSThinker::DACSThinker ()
|
|
|
|
{
|
|
|
|
if (ActiveThinker)
|
|
|
|
{
|
|
|
|
I_Error ("Only one ACSThinker is allowed to exist at a time.\nCheck your code.");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ActiveThinker = this;
|
|
|
|
Scripts = NULL;
|
|
|
|
LastScript = NULL;
|
|
|
|
for (int i = 0; i < 1000; i++)
|
|
|
|
RunningScripts[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DACSThinker::~DACSThinker ()
|
|
|
|
{
|
|
|
|
Scripts = NULL;
|
|
|
|
ActiveThinker = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DACSThinker::Serialize (FArchive &arc)
|
|
|
|
{
|
|
|
|
Super::Serialize (arc);
|
|
|
|
arc << Scripts << LastScript;
|
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
WORD i;
|
|
|
|
for (i = 0; i < 1000; i++)
|
|
|
|
{
|
|
|
|
if (RunningScripts[i])
|
|
|
|
arc << RunningScripts[i] << i;
|
|
|
|
}
|
|
|
|
DLevelScript *nil = NULL;
|
|
|
|
arc << nil;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
WORD scriptnum;
|
|
|
|
DLevelScript *script = NULL;
|
|
|
|
arc << script;
|
|
|
|
while (script)
|
|
|
|
{
|
|
|
|
arc << scriptnum;
|
|
|
|
RunningScripts[scriptnum] = script;
|
|
|
|
arc << script;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DACSThinker::Tick ()
|
|
|
|
{
|
|
|
|
DLevelScript *script = Scripts;
|
|
|
|
|
|
|
|
while (script)
|
|
|
|
{
|
|
|
|
DLevelScript *next = script->next;
|
|
|
|
script->RunScript ();
|
|
|
|
script = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
- Added some hackery at the start of MouseRead_Win32() that prevents it from
yanking the mouse around if they keys haven't been read yet to combat the
same situation that causes the keyboard to return DIERR_NOTACQUIRED in
KeyRead(): The window is sort of in focus and sort of not. User.dll
considers it to be focused and it's drawn as such, but another focused
window is on top of it, and DirectInput doesn't see it as focused.
- Fixed: KeyRead() should handle DIERR_NOTACQUIRED errors the same way it
handles DIERR_INPUTLOST errors. This can happen if our window had the
focus stolen away from it before we tried to acquire the keyboard in
DI_Init2(). Strangely, MouseRead_DI() already did this.
- When a stack overflow occurs, report.txt now only includes the first and
last 16KB of the stack to make it more manageable.
- Limited StreamEditBinary() to the first 64KB of the file to keep it from
taking too long on large dumps.
- And now I know why gathering crash information in the same process that
crashed can be bad: Stack overflows. You get one spare page to play with
when the stack overflows. MiniDumpWriteDump() needs more than that and
causes an access violation when it runs out of leftover stack, silently
terminating the application. Windows XP x64 offers SetThreadStackGuarantee()
to increase this, but that isn't available on anything older, including
32-bit XP. To get around this, a new thread is created to write the mini
dump when the stack overflows.
- Changed A_Burnination() to be closer to Strife's.
- Fixed: When playing back demos, DoAddBot() can be called without an
associated call to SpawnBot(). So if the bot can't spawn, botnum can
go negative, which will cause problems later in DCajunMaster::Main()
when it sees that wanted_botnum (0) is higher than botnum (-1).
- Fixed: Stopping demo recording in multiplayer games should not abruptly
drop the recorder out of the game without notifying the other players.
In fact, there's no reason why it should drop them out of multiplayer at
all.
- Fixed: Earthquakes were unreliable in multiplayer games because
P_PredictPlayer() did not preserve the player's xviewshift.
- Fixed: PlayerIsGone() needs to stop any scripts that belong to the player
who left, in addition to executing disconnect scripts.
- Fixed: APlayerPawn::AddInventory() should also check for a NULL player->mo
in case the player left but somebody still has a reference to their actor.
- Fixed: DDrawFB::PaintToWindow() should simulate proper unlocking behavior
and set Buffer to NULL.
- Improved feedback for network game initialization with the console ticker.
- Moved i_net.cpp and i_net.h out of sdl/ and win32/ and into the main source
directory. They are identical, so keeping two copies of them is bad.
- Fixed: (At least with Creative's driver's,) EAX settings are global and not
per-application. So if you play a multiplayer ZDoom game on one computer
(or even another EAX-using application), ZDoom needs to restore the
environment when it regains focus.
- Maybe fixed: (See http://forum.zdoom.org/potato.php?t=10689) Apparently,
PacketGet can receive ECONNRESET from nodes that aren't in the game. It
should be safe to just ignore these packets.
- Fixed: PlayerIsGone() should set the gone player's camera to NULL in case
the player who left was player 0. This is because if a remaining player
receives a "recoverable" error, they will become player 0. Once that happens,
they game will try to update sounds through their camera and crash in
FMODSoundRenderer::UpdateListener() because the zones array is now NULL.
G_NewInit() should also clear all the player structures.
SVN r233 (trunk)
2006-06-30 02:13:26 +00:00
|
|
|
void DACSThinker::StopScriptsFor (AActor *actor)
|
|
|
|
{
|
|
|
|
DLevelScript *script = Scripts;
|
|
|
|
|
|
|
|
while (script != NULL)
|
|
|
|
{
|
|
|
|
DLevelScript *next = script->next;
|
|
|
|
if (script->activator == actor)
|
|
|
|
{
|
|
|
|
script->SetState (DLevelScript::SCRIPT_PleaseRemove);
|
|
|
|
}
|
|
|
|
script = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
IMPLEMENT_POINTY_CLASS (DLevelScript)
|
2008-03-12 02:56:11 +00:00
|
|
|
DECLARE_POINTER(next)
|
|
|
|
DECLARE_POINTER(prev)
|
|
|
|
DECLARE_POINTER(activator)
|
2006-02-24 04:48:15 +00:00
|
|
|
END_POINTERS
|
|
|
|
|
|
|
|
void DLevelScript::Serialize (FArchive &arc)
|
|
|
|
{
|
|
|
|
DWORD i;
|
|
|
|
|
|
|
|
Super::Serialize (arc);
|
|
|
|
arc << next << prev
|
|
|
|
<< script;
|
|
|
|
|
|
|
|
arc << state
|
|
|
|
<< statedata
|
|
|
|
<< activator
|
|
|
|
<< activationline
|
|
|
|
<< backSide
|
|
|
|
<< numlocalvars;
|
|
|
|
|
|
|
|
if (arc.IsLoading())
|
|
|
|
{
|
|
|
|
localvars = new SDWORD[numlocalvars];
|
|
|
|
}
|
|
|
|
for (i = 0; i < (DWORD)numlocalvars; i++)
|
|
|
|
{
|
|
|
|
arc << localvars[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
WORD lib = activeBehavior->GetLibraryID() >> 16;
|
|
|
|
arc << lib;
|
|
|
|
i = activeBehavior->PC2Ofs (pc);
|
|
|
|
arc << i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
WORD lib;
|
|
|
|
arc << lib << i;
|
|
|
|
activeBehavior = FBehavior::StaticGetModule (lib);
|
|
|
|
pc = activeBehavior->Ofs2PC (i);
|
|
|
|
}
|
|
|
|
|
|
|
|
arc << activefont
|
|
|
|
<< hudwidth << hudheight;
|
|
|
|
}
|
|
|
|
|
|
|
|
DLevelScript::DLevelScript ()
|
|
|
|
{
|
|
|
|
next = prev = NULL;
|
|
|
|
if (DACSThinker::ActiveThinker == NULL)
|
|
|
|
new DACSThinker;
|
|
|
|
activefont = SmallFont;
|
|
|
|
localvars = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
DLevelScript::~DLevelScript ()
|
|
|
|
{
|
|
|
|
if (localvars != NULL)
|
|
|
|
delete[] localvars;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::Unlink ()
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller->LastScript == this)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
controller->LastScript = prev;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(controller, prev);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (controller->Scripts == this)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
controller->Scripts = next;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(controller, next);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (prev)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
prev->next = next;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(prev, next);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (next)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
next->prev = prev;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(next, prev);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::Link ()
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
next = controller->Scripts;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(this, next);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (controller->Scripts)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
controller->Scripts->prev = this;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(controller->Scripts, this);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
prev = NULL;
|
|
|
|
controller->Scripts = this;
|
2008-03-12 02:56:11 +00:00
|
|
|
GC::WriteBarrier(controller, this);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (controller->LastScript == NULL)
|
2008-03-12 02:56:11 +00:00
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
controller->LastScript = this;
|
2008-03-12 02:56:11 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::PutLast ()
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller->LastScript == this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
Unlink ();
|
|
|
|
if (controller->Scripts == NULL)
|
|
|
|
{
|
|
|
|
Link ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (controller->LastScript)
|
|
|
|
controller->LastScript->next = this;
|
|
|
|
prev = controller->LastScript;
|
|
|
|
next = NULL;
|
|
|
|
controller->LastScript = this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::PutFirst ()
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller->Scripts == this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
Unlink ();
|
|
|
|
Link ();
|
|
|
|
}
|
|
|
|
|
|
|
|
int DLevelScript::Random (int min, int max)
|
|
|
|
{
|
|
|
|
if (max < min)
|
|
|
|
{
|
|
|
|
swap (max, min);
|
|
|
|
}
|
|
|
|
|
- Fixed compilation with mingw again.
- Added multiple-choice sound sequences. These overcome one of the major
deficiences of the Hexen-inherited SNDSEQ system while still being Hexen
compatible: Custom door sounds can now use different opening and closing
sequences, for both normal and blazing speeds.
- Added a serializer for TArray.
- Added a countof macro to doomtype.h. See the1's blog to find out why
it's implemented the way it is.
<http://blogs.msdn.com/the1/articles/210011.aspx>
- Added a new method to FRandom for getting random numbers larger than 255,
which lets me:
- Fixed: SNDSEQ delayrand commands could delay for no more than 255 tics.
- Fixed: If you're going to have sector_t.SoundTarget, then they need to
be included in the pointer cleanup scans.
- Ported back newer name code from 2.1.
- Fixed: Using -warp with only one parameter in Doom and Heretic to
select a map on episode 1 no longer worked.
- New: Loading a multiplayer save now restores the players based on
their names rather than on their connection order. Using connection
order was sensible when -net was the only way to start a network game,
but with -host/-join, it's not so nice. Also, if there aren't enough
players in the save, then the extra players will be spawned normally,
so you can continue a saved game with more players than you started it
with.
- Added some new SNDSEQ commands to make it possible to define Heretic's
ambient sounds in SNDSEQ: volumerel, volumerand, slot, randomsequence,
delayonce, and restart. With these, it is basically possible to obsolete
all of the $ambient SNDINFO commands.
- Fixed: Sound sequences would only execute one command each time they were
ticked.
- Fixed: No bounds checking was done on the volume sound sequences played at.
- Fixed: The tic parameter to playloop was useless and caused it to
act like a redundant playrepeat. I have removed all the logic that
caused playloop to play repeating sounds, and now it acts like an
infinite sequence of play/delay commands until the sequence is
stopped.
- Fixed: Sound sequences were ticked every frame, not every tic, so all
the delay commands were timed incorrectly and varied depending on your
framerate. Since this is useful for restarting looping sounds that got
cut off, I have not changed this. Instead, the delay commands now
record the tic when execution should resume, not the number of tics
left to delay.
SVN r57 (trunk)
2006-04-21 01:22:55 +00:00
|
|
|
return min + pr_acs(max - min + 1);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-03-21 12:25:45 +00:00
|
|
|
int DLevelScript::ThingCount (int type, int stringid, int tid, int tag)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *actor;
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *kind;
|
2006-02-24 04:48:15 +00:00
|
|
|
int count = 0;
|
2006-07-13 03:34:50 +00:00
|
|
|
bool replacemented = false;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (type >= MAX_SPAWNABLES)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (type > 0)
|
|
|
|
{
|
|
|
|
kind = SpawnableThings[type];
|
|
|
|
if (kind == NULL)
|
|
|
|
return 0;
|
|
|
|
}
|
2006-07-09 20:15:38 +00:00
|
|
|
else if (stringid >= 0)
|
|
|
|
{
|
|
|
|
const char *type_name = FBehavior::StaticLookupString (stringid);
|
|
|
|
if (type_name == NULL)
|
|
|
|
return 0;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
kind = PClass::FindClass (type_name);
|
2006-07-13 03:34:50 +00:00
|
|
|
if (kind == NULL || kind->ActorInfo == NULL)
|
2006-07-09 20:15:38 +00:00
|
|
|
return 0;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
kind = NULL;
|
|
|
|
}
|
2006-07-13 03:34:50 +00:00
|
|
|
|
|
|
|
do_count:
|
2006-02-24 04:48:15 +00:00
|
|
|
if (tid)
|
|
|
|
{
|
|
|
|
FActorIterator iterator (tid);
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
if (actor->health > 0 &&
|
|
|
|
(kind == NULL || actor->IsA (kind)))
|
|
|
|
{
|
2008-03-21 12:25:45 +00:00
|
|
|
if (actor->Sector->tag == tag || tag == -1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-21 12:25:45 +00:00
|
|
|
// Don't count items in somebody's inventory
|
|
|
|
if (!actor->IsKindOf (RUNTIME_CLASS(AInventory)) ||
|
|
|
|
static_cast<AInventory *>(actor)->Owner == NULL)
|
|
|
|
{
|
|
|
|
count++;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
TThinkerIterator<AActor> iterator;
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
if (actor->health > 0 &&
|
|
|
|
(kind == NULL || actor->IsA (kind)))
|
|
|
|
{
|
2008-03-21 12:25:45 +00:00
|
|
|
if (actor->Sector->tag == tag || tag == -1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-21 12:25:45 +00:00
|
|
|
// Don't count items in somebody's inventory
|
|
|
|
if (!actor->IsKindOf (RUNTIME_CLASS(AInventory)) ||
|
|
|
|
static_cast<AInventory *>(actor)->Owner == NULL)
|
|
|
|
{
|
|
|
|
count++;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-07-13 03:34:50 +00:00
|
|
|
if (!replacemented && kind != NULL)
|
|
|
|
{
|
|
|
|
// Again, with decorate replacements
|
|
|
|
replacemented = true;
|
|
|
|
PClass *newkind = kind->ActorInfo->GetReplacement()->Class;
|
|
|
|
if (newkind != kind)
|
|
|
|
{
|
|
|
|
kind = newkind;
|
|
|
|
goto do_count;
|
|
|
|
}
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::ChangeFlat (int tag, int name, bool floorOrCeiling)
|
|
|
|
{
|
|
|
|
int flat, secnum = -1;
|
|
|
|
const char *flatname = FBehavior::StaticLookupString (name);
|
|
|
|
|
|
|
|
if (flatname == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
flat = TexMan.GetTexture (flatname, FTexture::TEX_Flat, FTextureManager::TEXMAN_Overridable);
|
|
|
|
|
|
|
|
while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
|
|
|
|
{
|
|
|
|
if (floorOrCeiling == false)
|
|
|
|
{
|
|
|
|
if (sectors[secnum].floorpic != flat)
|
|
|
|
{
|
|
|
|
sectors[secnum].floorpic = flat;
|
|
|
|
sectors[secnum].AdjustFloorClip ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sectors[secnum].ceilingpic = flat;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int DLevelScript::CountPlayers ()
|
|
|
|
{
|
|
|
|
int count = 0, i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
|
|
|
if (playeringame[i])
|
|
|
|
count++;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::SetLineTexture (int lineid, int side, int position, int name)
|
|
|
|
{
|
|
|
|
int texture, linenum = -1;
|
|
|
|
const char *texname = FBehavior::StaticLookupString (name);
|
|
|
|
|
|
|
|
if (texname == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
side = !!side;
|
|
|
|
|
|
|
|
texture = TexMan.GetTexture (texname, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable);
|
|
|
|
|
|
|
|
while ((linenum = P_FindLineFromID (lineid, linenum)) >= 0)
|
|
|
|
{
|
|
|
|
side_t *sidedef;
|
|
|
|
|
|
|
|
if (lines[linenum].sidenum[side] == NO_SIDE)
|
|
|
|
continue;
|
|
|
|
sidedef = sides + lines[linenum].sidenum[side];
|
|
|
|
|
|
|
|
switch (position)
|
|
|
|
{
|
|
|
|
case TEXTURE_TOP:
|
2008-03-21 17:35:49 +00:00
|
|
|
sidedef->SetTexture(side_t::top, texture);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
case TEXTURE_MIDDLE:
|
2008-03-21 17:35:49 +00:00
|
|
|
sidedef->SetTexture(side_t::mid, texture);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
case TEXTURE_BOTTOM:
|
2008-03-21 17:35:49 +00:00
|
|
|
sidedef->SetTexture(side_t::bottom, texture);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
void DLevelScript::ReplaceTextures (int fromnamei, int tonamei, int flags)
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
{
|
|
|
|
const char *fromname = FBehavior::StaticLookupString (fromnamei);
|
|
|
|
const char *toname = FBehavior::StaticLookupString (tonamei);
|
|
|
|
int picnum1, picnum2;
|
|
|
|
|
|
|
|
if (fromname == NULL)
|
|
|
|
return;
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
if ((flags ^ (NOT_BOTTOM | NOT_MIDDLE | NOT_TOP)) != 0)
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
{
|
|
|
|
picnum1 = TexMan.GetTexture (fromname, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable);
|
|
|
|
picnum2 = TexMan.GetTexture (toname, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable);
|
|
|
|
|
|
|
|
for (int i = 0; i < numsides; ++i)
|
|
|
|
{
|
|
|
|
side_t *wal = &sides[i];
|
|
|
|
|
2008-03-21 17:35:49 +00:00
|
|
|
for(int j=0;j<3;j++)
|
|
|
|
{
|
|
|
|
static BYTE bits[]={NOT_TOP, NOT_MIDDLE, NOT_BOTTOM};
|
|
|
|
if (!(flags & bits[j]) && wal->GetTexture(j) == picnum1)
|
|
|
|
{
|
|
|
|
wal->SetTexture(j, picnum2);
|
|
|
|
}
|
|
|
|
}
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
}
|
|
|
|
}
|
2006-09-01 01:08:27 +00:00
|
|
|
if ((flags ^ (NOT_FLOOR | NOT_CEILING)) != 0)
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
{
|
|
|
|
picnum1 = TexMan.GetTexture (fromname, FTexture::TEX_Flat, FTextureManager::TEXMAN_Overridable);
|
|
|
|
picnum2 = TexMan.GetTexture (toname, FTexture::TEX_Flat, FTextureManager::TEXMAN_Overridable);
|
|
|
|
|
|
|
|
for (int i = 0; i < numsectors; ++i)
|
|
|
|
{
|
|
|
|
sector_t *sec = §ors[i];
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
if (!(flags & NOT_FLOOR) && sec->floorpic == picnum1) sec->floorpic = picnum2;
|
|
|
|
if (!(flags & NOT_CEILING) && sec->ceilingpic == picnum1) sec->ceilingpic = picnum2;
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
int DLevelScript::DoSpawn (int type, fixed_t x, fixed_t y, fixed_t z, int tid, int angle)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info = PClass::FindClass (FBehavior::StaticLookupString (type));
|
2006-02-24 04:48:15 +00:00
|
|
|
AActor *actor = NULL;
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
int spawncount = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (info != NULL)
|
|
|
|
{
|
2006-07-16 09:10:45 +00:00
|
|
|
actor = Spawn (info, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (actor != NULL)
|
|
|
|
{
|
2006-10-20 01:58:26 +00:00
|
|
|
DWORD oldFlags2 = actor->flags2;
|
|
|
|
actor->flags2 |= MF2_PASSMOBJ;
|
2006-02-24 04:48:15 +00:00
|
|
|
if (P_TestMobjLocation (actor))
|
|
|
|
{
|
|
|
|
actor->angle = angle << 24;
|
|
|
|
actor->tid = tid;
|
|
|
|
actor->AddToHash ();
|
|
|
|
if (actor->flags & MF_SPECIAL)
|
|
|
|
actor->flags |= MF_DROPPED; // Don't respawn
|
2006-10-20 01:58:26 +00:00
|
|
|
actor->flags2 = oldFlags2;
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
spawncount++;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// If this is a monster, subtract it from the total monster
|
|
|
|
// count, because it already added to it during spawning.
|
2006-04-16 13:29:50 +00:00
|
|
|
if (actor->CountsAsKill())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
level.total_monsters--;
|
|
|
|
}
|
|
|
|
// Same, for items
|
|
|
|
if (actor->flags & MF_COUNTITEM)
|
|
|
|
{
|
|
|
|
level.total_items--;
|
|
|
|
}
|
|
|
|
actor->Destroy ();
|
|
|
|
actor = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
return spawncount;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int DLevelScript::DoSpawnSpot (int type, int spot, int tid, int angle)
|
|
|
|
{
|
|
|
|
FActorIterator iterator (spot);
|
|
|
|
AActor *aspot;
|
|
|
|
int spawned = 0;
|
|
|
|
|
|
|
|
while ( (aspot = iterator.Next ()) )
|
|
|
|
{
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
spawned += DoSpawn (type, aspot->x, aspot->y, aspot->z, tid, angle);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return spawned;
|
|
|
|
}
|
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
int DLevelScript::DoSpawnSpotFacing (int type, int spot, int tid)
|
|
|
|
{
|
|
|
|
FActorIterator iterator (spot);
|
|
|
|
AActor *aspot;
|
|
|
|
int spawned = 0;
|
|
|
|
|
|
|
|
while ( (aspot = iterator.Next ()) )
|
|
|
|
{
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
spawned += DoSpawn (type, aspot->x, aspot->y, aspot->z, tid, aspot->angle >> 24);
|
2006-07-09 20:15:38 +00:00
|
|
|
}
|
|
|
|
return spawned;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void DLevelScript::DoFadeTo (int r, int g, int b, int a, fixed_t time)
|
|
|
|
{
|
|
|
|
DoFadeRange (0, 0, 0, -1, r, g, b, a, time);
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::DoFadeRange (int r1, int g1, int b1, int a1,
|
|
|
|
int r2, int g2, int b2, int a2, fixed_t time)
|
|
|
|
{
|
|
|
|
player_t *viewer;
|
|
|
|
float ftime = (float)time / 65536.f;
|
|
|
|
bool fadingFrom = a1 >= 0;
|
|
|
|
float fr1 = 0, fg1 = 0, fb1 = 0, fa1 = 0;
|
|
|
|
float fr2, fg2, fb2, fa2;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fr2 = (float)r2 / 255.f;
|
|
|
|
fg2 = (float)g2 / 255.f;
|
|
|
|
fb2 = (float)b2 / 255.f;
|
|
|
|
fa2 = (float)a2 / 65536.f;
|
|
|
|
|
|
|
|
if (fadingFrom)
|
|
|
|
{
|
|
|
|
fr1 = (float)r1 / 255.f;
|
|
|
|
fg1 = (float)g1 / 255.f;
|
|
|
|
fb1 = (float)b1 / 255.f;
|
|
|
|
fa1 = (float)a1 / 65536.f;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (activator != NULL)
|
|
|
|
{
|
|
|
|
viewer = activator->player;
|
|
|
|
if (viewer == NULL)
|
|
|
|
return;
|
|
|
|
i = MAXPLAYERS;
|
|
|
|
goto showme;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < MAXPLAYERS; ++i)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
{
|
|
|
|
viewer = &players[i];
|
|
|
|
showme:
|
|
|
|
if (ftime <= 0.f)
|
|
|
|
{
|
|
|
|
viewer->BlendR = fr2;
|
|
|
|
viewer->BlendG = fg2;
|
|
|
|
viewer->BlendB = fb2;
|
|
|
|
viewer->BlendA = fa2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!fadingFrom)
|
|
|
|
{
|
|
|
|
if (viewer->BlendA <= 0.f)
|
|
|
|
{
|
|
|
|
fr1 = fr2;
|
|
|
|
fg1 = fg2;
|
|
|
|
fb1 = fb2;
|
|
|
|
fa1 = 0.f;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fr1 = viewer->BlendR;
|
|
|
|
fg1 = viewer->BlendG;
|
|
|
|
fb1 = viewer->BlendB;
|
|
|
|
fa1 = viewer->BlendA;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
new DFlashFader (fr1, fg1, fb1, fa1, fr2, fg2, fb2, fa2, ftime, viewer->mo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::DoSetFont (int fontnum)
|
|
|
|
{
|
|
|
|
const char *fontname = FBehavior::StaticLookupString (fontnum);
|
2006-09-17 10:43:51 +00:00
|
|
|
activefont = V_GetFont (fontname);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (activefont == NULL)
|
|
|
|
{
|
2006-09-17 10:43:51 +00:00
|
|
|
activefont = SmallFont;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (screen != NULL)
|
|
|
|
{
|
|
|
|
screen->SetFont (activefont);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define APROP_Health 0
|
|
|
|
#define APROP_Speed 1
|
|
|
|
#define APROP_Damage 2
|
|
|
|
#define APROP_Alpha 3
|
|
|
|
#define APROP_RenderStyle 4
|
|
|
|
#define APROP_Ambush 10
|
|
|
|
#define APROP_Invulnerable 11
|
|
|
|
#define APROP_JumpZ 12 // [GRB]
|
2006-05-13 12:41:15 +00:00
|
|
|
#define APROP_ChaseGoal 13
|
|
|
|
#define APROP_Frightened 14
|
2007-01-20 14:27:44 +00:00
|
|
|
#define APROP_Gravity 15
|
2007-02-24 12:09:36 +00:00
|
|
|
#define APROP_Friendly 16
|
2008-01-28 09:39:46 +00:00
|
|
|
#define APROP_SpawnHealth 17
|
2006-02-24 04:48:15 +00:00
|
|
|
#define APROP_SeeSound 5 // Sounds can only be set, not gotten
|
|
|
|
#define APROP_AttackSound 6
|
|
|
|
#define APROP_PainSound 7
|
|
|
|
#define APROP_DeathSound 8
|
|
|
|
#define APROP_ActiveSound 9
|
|
|
|
|
2008-01-26 15:50:52 +00:00
|
|
|
// These are needed for ACS's APROP_RenderStyle
|
|
|
|
static const int LegacyRenderStyleIndices[] =
|
|
|
|
{
|
|
|
|
0, // STYLE_None,
|
|
|
|
1, // STYLE_Normal,
|
|
|
|
2, // STYLE_Fuzzy,
|
|
|
|
3, // STYLE_SoulTrans,
|
|
|
|
4, // STYLE_OptFuzzy,
|
|
|
|
5, // STYLE_Stencil,
|
|
|
|
64, // STYLE_Translucent
|
|
|
|
65, // STYLE_Add,
|
|
|
|
66, // STYLE_Shaded,
|
|
|
|
67, // STYLE_TranslucentStencil,
|
|
|
|
-1
|
|
|
|
};
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void DLevelScript::SetActorProperty (int tid, int property, int value)
|
|
|
|
{
|
|
|
|
if (tid == 0)
|
|
|
|
{
|
|
|
|
DoSetActorProperty (activator, property, value);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
AActor *actor;
|
|
|
|
FActorIterator iterator (tid);
|
|
|
|
|
|
|
|
while ((actor = iterator.Next()) != NULL)
|
|
|
|
{
|
|
|
|
DoSetActorProperty (actor, property, value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value)
|
|
|
|
{
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (property)
|
|
|
|
{
|
|
|
|
case APROP_Health:
|
|
|
|
actor->health = value;
|
|
|
|
if (actor->player != NULL)
|
|
|
|
{
|
|
|
|
actor->player->health = value;
|
|
|
|
}
|
|
|
|
break;
|
2006-06-14 03:57:58 +00:00
|
|
|
|
|
|
|
case APROP_Speed:
|
|
|
|
actor->Speed = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_Damage:
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
actor->Damage = value;
|
2006-06-14 03:57:58 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_Alpha:
|
|
|
|
actor->alpha = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_RenderStyle:
|
2008-01-26 15:50:52 +00:00
|
|
|
for(int i=0; LegacyRenderStyleIndices[i] >= 0; i++)
|
|
|
|
{
|
2008-05-18 15:48:03 +00:00
|
|
|
if (LegacyRenderStyleIndices[i] == value)
|
2008-01-26 15:50:52 +00:00
|
|
|
{
|
|
|
|
actor->RenderStyle = ERenderStyle(i);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-06-14 03:57:58 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_Ambush:
|
|
|
|
if (value) actor->flags |= MF_AMBUSH; else actor->flags &= ~MF_AMBUSH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_Invulnerable:
|
|
|
|
if (value) actor->flags2 |= MF2_INVULNERABLE; else actor->flags2 &= ~MF2_INVULNERABLE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_JumpZ:
|
|
|
|
if (actor->IsKindOf (RUNTIME_CLASS (APlayerPawn)))
|
|
|
|
static_cast<APlayerPawn *>(actor)->JumpZ = value;
|
|
|
|
break; // [GRB]
|
|
|
|
|
|
|
|
case APROP_ChaseGoal:
|
|
|
|
if (value)
|
|
|
|
actor->flags5 |= MF5_CHASEGOAL;
|
|
|
|
else
|
|
|
|
actor->flags5 &= ~MF5_CHASEGOAL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_Frightened:
|
|
|
|
if (value)
|
|
|
|
actor->flags4 |= MF4_FRIGHTENED;
|
|
|
|
else
|
|
|
|
actor->flags4 &= ~MF4_FRIGHTENED;
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2007-02-24 12:09:36 +00:00
|
|
|
case APROP_Friendly:
|
|
|
|
if (value)
|
|
|
|
actor->flags |= MF_FRIENDLY;
|
|
|
|
else
|
|
|
|
actor->flags &= ~MF_FRIENDLY;
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2008-01-28 09:39:46 +00:00
|
|
|
|
|
|
|
case APROP_SpawnHealth:
|
|
|
|
if (actor->IsKindOf (RUNTIME_CLASS (APlayerPawn)))
|
|
|
|
{
|
|
|
|
static_cast<APlayerPawn *>(actor)->MaxHealth = value;
|
|
|
|
}
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2007-01-20 14:27:44 +00:00
|
|
|
case APROP_Gravity:
|
|
|
|
actor->gravity = value;
|
|
|
|
break;
|
2006-06-14 03:57:58 +00:00
|
|
|
|
|
|
|
case APROP_SeeSound:
|
|
|
|
actor->SeeSound = S_FindSound (FBehavior::StaticLookupString (value));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_AttackSound:
|
|
|
|
actor->AttackSound = S_FindSound (FBehavior::StaticLookupString (value));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_PainSound:
|
2008-05-18 15:48:03 +00:00
|
|
|
actor->PainSound = S_FindSound (FBehavior::StaticLookupString (value));
|
2006-06-14 03:57:58 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_DeathSound:
|
|
|
|
actor->DeathSound = S_FindSound (FBehavior::StaticLookupString (value));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case APROP_ActiveSound:
|
|
|
|
actor->ActiveSound = S_FindSound (FBehavior::StaticLookupString (value));
|
|
|
|
break;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static AActor *SingleActorFromTID (int tid, AActor *defactor)
|
|
|
|
{
|
|
|
|
if (tid == 0)
|
|
|
|
{
|
|
|
|
return defactor;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator iterator (tid);
|
|
|
|
return iterator.Next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int DLevelScript::GetActorProperty (int tid, int property)
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID (tid, activator);
|
|
|
|
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
switch (property)
|
|
|
|
{
|
|
|
|
case APROP_Health: return actor->health;
|
|
|
|
case APROP_Speed: return actor->Speed;
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
case APROP_Damage: return actor->Damage; // Should this call GetMissileDamage() instead?
|
2006-02-24 04:48:15 +00:00
|
|
|
case APROP_Alpha: return actor->alpha;
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
case APROP_RenderStyle: for (int style = STYLE_None; style < STYLE_Count; ++style)
|
|
|
|
{ // Check for a legacy render style that matches.
|
|
|
|
if (LegacyRenderStyles[style] == actor->RenderStyle)
|
|
|
|
{
|
2008-01-26 15:50:52 +00:00
|
|
|
return LegacyRenderStyleIndices[style];
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// The current render style isn't expressable as a legacy style,
|
|
|
|
// so pretends it's normal.
|
|
|
|
return STYLE_Normal;
|
2007-01-20 14:27:44 +00:00
|
|
|
case APROP_Gravity: return actor->gravity;
|
2006-02-24 04:48:15 +00:00
|
|
|
case APROP_Ambush: return !!(actor->flags & MF_AMBUSH);
|
2006-05-13 12:41:15 +00:00
|
|
|
case APROP_ChaseGoal: return !!(actor->flags5 & MF5_CHASEGOAL);
|
|
|
|
case APROP_Frightened: return !!(actor->flags4 & MF4_FRIGHTENED);
|
2007-02-24 12:09:36 +00:00
|
|
|
case APROP_Friendly: return !!(actor->flags & MF_FRIENDLY);
|
2008-01-28 09:39:46 +00:00
|
|
|
case APROP_SpawnHealth: if (actor->IsKindOf (RUNTIME_CLASS (APlayerPawn)))
|
|
|
|
{
|
|
|
|
return static_cast<APlayerPawn *>(actor)->MaxHealth;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return actor->GetDefault()->health;
|
|
|
|
}
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case APROP_JumpZ: if (actor->IsKindOf (RUNTIME_CLASS (APlayerPawn)))
|
|
|
|
{
|
|
|
|
return static_cast<APlayerPawn *>(actor)->JumpZ; // [GRB]
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
default: return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define NEXTWORD (LittleLong(*pc++))
|
|
|
|
#define NEXTBYTE (fmt==ACS_LittleEnhanced?getbyte(pc):NEXTWORD)
|
|
|
|
#define STACK(a) (Stack[sp - (a)])
|
|
|
|
#define PushToStack(a) (Stack[sp++] = (a))
|
|
|
|
|
|
|
|
inline int getbyte (int *&pc)
|
|
|
|
{
|
|
|
|
int res = *(BYTE *)pc;
|
|
|
|
pc = (int *)((BYTE *)pc+1);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DLevelScript::RunScript ()
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
SDWORD *locals = localvars;
|
|
|
|
ScriptFunction *activeFunction = NULL;
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
FRemapTable *translation = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
int resultValue = 1;
|
|
|
|
|
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case SCRIPT_Delayed:
|
|
|
|
// Decrement the delay counter and enter state running
|
|
|
|
// if it hits 0
|
|
|
|
if (--statedata == 0)
|
|
|
|
state = SCRIPT_Running;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCRIPT_TagWait:
|
|
|
|
// Wait for tagged sector(s) to go inactive, then enter
|
|
|
|
// state running
|
|
|
|
{
|
|
|
|
int secnum = -1;
|
|
|
|
|
|
|
|
while ((secnum = P_FindSectorFromTag (statedata, secnum)) >= 0)
|
|
|
|
if (sectors[secnum].floordata || sectors[secnum].ceilingdata)
|
|
|
|
return resultValue;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// If we got here, none of the tagged sectors were busy
|
|
|
|
state = SCRIPT_Running;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCRIPT_PolyWait:
|
|
|
|
// Wait for polyobj(s) to stop moving, then enter state running
|
|
|
|
if (!PO_Busy (statedata))
|
|
|
|
{
|
|
|
|
state = SCRIPT_Running;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCRIPT_ScriptWaitPre:
|
|
|
|
// Wait for a script to start running, then enter state scriptwait
|
|
|
|
if (controller->RunningScripts[statedata])
|
|
|
|
state = SCRIPT_ScriptWait;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCRIPT_ScriptWait:
|
|
|
|
// Wait for a script to stop running, then enter state running
|
|
|
|
if (controller->RunningScripts[statedata])
|
|
|
|
return resultValue;
|
|
|
|
|
|
|
|
state = SCRIPT_Running;
|
|
|
|
PutFirst ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-02-24 17:56:43 +00:00
|
|
|
SDWORD Stack[STACK_SIZE];
|
2006-02-24 04:48:15 +00:00
|
|
|
int sp = 0;
|
2007-02-24 17:56:43 +00:00
|
|
|
int *pc = this->pc;
|
2006-02-24 04:48:15 +00:00
|
|
|
ACSFormat fmt = activeBehavior->GetFormat();
|
|
|
|
int runaway = 0; // used to prevent infinite loops
|
|
|
|
int pcd;
|
2006-05-26 04:38:22 +00:00
|
|
|
FString work;
|
2006-02-24 04:48:15 +00:00
|
|
|
const char *lookup;
|
|
|
|
int optstart = -1;
|
|
|
|
int temp;
|
|
|
|
|
|
|
|
if (screen != NULL)
|
|
|
|
{
|
|
|
|
screen->SetFont (activefont);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (state == SCRIPT_Running)
|
|
|
|
{
|
|
|
|
if (++runaway > 500000)
|
|
|
|
{
|
|
|
|
Printf ("Runaway script %d terminated\n", script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fmt == ACS_LittleEnhanced)
|
|
|
|
{
|
|
|
|
pcd = getbyte(pc);
|
|
|
|
if (pcd >= 256-16)
|
|
|
|
{
|
|
|
|
pcd = (256-16) + ((pcd - (256-16)) << 8) + getbyte(pc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pcd = NEXTWORD;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (pcd)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
Printf ("Unknown P-Code %d in script %d\n", pcd, script);
|
|
|
|
// fall through
|
|
|
|
case PCD_TERMINATE:
|
|
|
|
DPrintf ("Script %d finished\n", script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_NOP:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUSPEND:
|
|
|
|
state = SCRIPT_Suspended;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_TAGSTRING:
|
|
|
|
Stack[sp-1] |= activeBehavior->GetLibraryID();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHNUMBER:
|
|
|
|
PushToStack (NEXTWORD);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHBYTE:
|
|
|
|
PushToStack (*(BYTE *)pc);
|
|
|
|
pc = (int *)((BYTE *)pc + 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSH2BYTES:
|
|
|
|
Stack[sp] = ((BYTE *)pc)[0];
|
|
|
|
Stack[sp+1] = ((BYTE *)pc)[1];
|
|
|
|
sp += 2;
|
|
|
|
pc = (int *)((BYTE *)pc + 2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSH3BYTES:
|
|
|
|
Stack[sp] = ((BYTE *)pc)[0];
|
|
|
|
Stack[sp+1] = ((BYTE *)pc)[1];
|
|
|
|
Stack[sp+2] = ((BYTE *)pc)[2];
|
|
|
|
sp += 3;
|
|
|
|
pc = (int *)((BYTE *)pc + 3);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSH4BYTES:
|
|
|
|
Stack[sp] = ((BYTE *)pc)[0];
|
|
|
|
Stack[sp+1] = ((BYTE *)pc)[1];
|
|
|
|
Stack[sp+2] = ((BYTE *)pc)[2];
|
|
|
|
Stack[sp+3] = ((BYTE *)pc)[3];
|
|
|
|
sp += 4;
|
|
|
|
pc = (int *)((BYTE *)pc + 4);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSH5BYTES:
|
|
|
|
Stack[sp] = ((BYTE *)pc)[0];
|
|
|
|
Stack[sp+1] = ((BYTE *)pc)[1];
|
|
|
|
Stack[sp+2] = ((BYTE *)pc)[2];
|
|
|
|
Stack[sp+3] = ((BYTE *)pc)[3];
|
|
|
|
Stack[sp+4] = ((BYTE *)pc)[4];
|
|
|
|
sp += 5;
|
|
|
|
pc = (int *)((BYTE *)pc + 5);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHBYTES:
|
|
|
|
temp = *(BYTE *)pc;
|
|
|
|
pc = (int *)((BYTE *)pc + temp + 1);
|
|
|
|
for (temp = -temp; temp; temp++)
|
|
|
|
{
|
|
|
|
PushToStack (*((BYTE *)pc + temp));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DUP:
|
|
|
|
Stack[sp] = Stack[sp-1];
|
|
|
|
sp++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SWAP:
|
|
|
|
swap(Stack[sp-2], Stack[sp-1]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC1:
|
|
|
|
LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(1), 0, 0, 0, 0);
|
|
|
|
sp -= 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC2:
|
|
|
|
LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(2), STACK(1), 0, 0, 0);
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC3:
|
|
|
|
LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(3), STACK(2), STACK(1), 0, 0);
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC4:
|
|
|
|
LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(4), STACK(3), STACK(2),
|
|
|
|
STACK(1), 0);
|
|
|
|
sp -= 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC5:
|
|
|
|
LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(5), STACK(4), STACK(3),
|
|
|
|
STACK(2), STACK(1));
|
|
|
|
sp -= 5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC5RESULT:
|
|
|
|
STACK(5) = LineSpecials[NEXTBYTE] (activationline, activator, backSide,
|
|
|
|
STACK(5), STACK(4), STACK(3),
|
|
|
|
STACK(2), STACK(1));
|
|
|
|
sp -= 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC1DIRECT:
|
|
|
|
temp = NEXTBYTE;
|
|
|
|
LineSpecials[temp] (activationline, activator, backSide,
|
|
|
|
pc[0], 0, 0, 0, 0);
|
|
|
|
pc += 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC2DIRECT:
|
|
|
|
temp = NEXTBYTE;
|
|
|
|
LineSpecials[temp] (activationline, activator, backSide,
|
|
|
|
pc[0], pc[1], 0, 0, 0);
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC3DIRECT:
|
|
|
|
temp = NEXTBYTE;
|
|
|
|
LineSpecials[temp] (activationline, activator, backSide,
|
|
|
|
pc[0], pc[1], pc[2], 0, 0);
|
|
|
|
pc += 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC4DIRECT:
|
|
|
|
temp = NEXTBYTE;
|
|
|
|
LineSpecials[temp] (activationline, activator, backSide,
|
|
|
|
pc[0], pc[1], pc[2], pc[3], 0);
|
|
|
|
pc += 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC5DIRECT:
|
|
|
|
temp = NEXTBYTE;
|
|
|
|
LineSpecials[temp] (activationline, activator, backSide,
|
|
|
|
pc[0], pc[1], pc[2], pc[3], pc[4]);
|
|
|
|
pc += 5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC1DIRECTB:
|
|
|
|
LineSpecials[((BYTE *)pc)[0]] (activationline, activator, backSide,
|
|
|
|
((BYTE *)pc)[1], 0, 0, 0, 0);
|
|
|
|
pc = (int *)((BYTE *)pc + 2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC2DIRECTB:
|
|
|
|
LineSpecials[((BYTE *)pc)[0]] (activationline, activator, backSide,
|
|
|
|
((BYTE *)pc)[1], ((BYTE *)pc)[2], 0, 0, 0);
|
|
|
|
pc = (int *)((BYTE *)pc + 3);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC3DIRECTB:
|
|
|
|
LineSpecials[((BYTE *)pc)[0]] (activationline, activator, backSide,
|
|
|
|
((BYTE *)pc)[1], ((BYTE *)pc)[2], ((BYTE *)pc)[3], 0, 0);
|
|
|
|
pc = (int *)((BYTE *)pc + 4);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC4DIRECTB:
|
|
|
|
LineSpecials[((BYTE *)pc)[0]] (activationline, activator, backSide,
|
|
|
|
((BYTE *)pc)[1], ((BYTE *)pc)[2], ((BYTE *)pc)[3],
|
|
|
|
((BYTE *)pc)[4], 0);
|
|
|
|
pc = (int *)((BYTE *)pc + 5);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSPEC5DIRECTB:
|
|
|
|
LineSpecials[((BYTE *)pc)[0]] (activationline, activator, backSide,
|
|
|
|
((BYTE *)pc)[1], ((BYTE *)pc)[2], ((BYTE *)pc)[3],
|
|
|
|
((BYTE *)pc)[4], ((BYTE *)pc)[5]);
|
|
|
|
pc = (int *)((BYTE *)pc + 6);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CALL:
|
|
|
|
case PCD_CALLDISCARD:
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
union
|
|
|
|
{
|
|
|
|
CallReturn *ret;
|
|
|
|
SDWORD *retsp;
|
|
|
|
};
|
2006-02-24 04:48:15 +00:00
|
|
|
int funcnum;
|
|
|
|
int i;
|
|
|
|
ScriptFunction *func;
|
|
|
|
FBehavior *module = activeBehavior;
|
2006-04-12 01:50:09 +00:00
|
|
|
SDWORD *mylocals;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
funcnum = NEXTBYTE;
|
|
|
|
func = activeBehavior->GetFunction (funcnum, module);
|
|
|
|
if (func == NULL)
|
|
|
|
{
|
|
|
|
Printf ("Function %d in script %d out of range\n", funcnum, script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (sp + func->LocalCount + 64 > STACK_SIZE)
|
|
|
|
{ // 64 is the margin for the function's working space
|
|
|
|
Printf ("Out of stack space in script %d\n", script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
break;
|
|
|
|
}
|
2006-04-12 01:50:09 +00:00
|
|
|
mylocals = locals;
|
2006-02-24 04:48:15 +00:00
|
|
|
// The function's first argument is also its first local variable.
|
|
|
|
locals = &Stack[sp - func->ArgCount];
|
|
|
|
// Make space on the stack for any other variables the function uses.
|
|
|
|
for (i = 0; i < func->LocalCount; ++i)
|
|
|
|
{
|
|
|
|
Stack[sp+i] = 0;
|
|
|
|
}
|
|
|
|
sp += i;
|
2006-05-26 04:38:22 +00:00
|
|
|
retsp = &Stack[sp];
|
|
|
|
ret->ReturnAddress = activeBehavior->PC2Ofs (pc);
|
|
|
|
ret->ReturnFunction = activeFunction;
|
|
|
|
ret->ReturnModule = activeBehavior;
|
|
|
|
ret->ReturnLocals = mylocals;
|
|
|
|
ret->bDiscardResult = (pcd == PCD_CALLDISCARD);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp += sizeof(CallReturn)/sizeof(int);
|
|
|
|
pc = module->Ofs2PC (func->Address);
|
|
|
|
activeFunction = func;
|
|
|
|
activeBehavior = module;
|
|
|
|
fmt = module->GetFormat();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RETURNVOID:
|
|
|
|
case PCD_RETURNVAL:
|
|
|
|
{
|
|
|
|
int value;
|
2006-05-26 04:38:22 +00:00
|
|
|
union
|
|
|
|
{
|
|
|
|
SDWORD *retsp;
|
|
|
|
CallReturn *retState;
|
|
|
|
};
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (pcd == PCD_RETURNVAL)
|
|
|
|
{
|
|
|
|
value = Stack[--sp];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
value = 0;
|
|
|
|
}
|
|
|
|
sp -= sizeof(CallReturn)/sizeof(int);
|
2006-05-26 04:38:22 +00:00
|
|
|
retsp = &Stack[sp];
|
2006-04-12 01:50:09 +00:00
|
|
|
sp = locals - Stack;
|
2006-02-24 04:48:15 +00:00
|
|
|
pc = retState->ReturnModule->Ofs2PC (retState->ReturnAddress);
|
|
|
|
activeFunction = retState->ReturnFunction;
|
|
|
|
activeBehavior = retState->ReturnModule;
|
|
|
|
fmt = activeBehavior->GetFormat();
|
2006-04-12 01:50:09 +00:00
|
|
|
locals = retState->ReturnLocals;
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!retState->bDiscardResult)
|
|
|
|
{
|
|
|
|
Stack[sp++] = value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADD:
|
|
|
|
STACK(2) = STACK(2) + STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBTRACT:
|
|
|
|
STACK(2) = STACK(2) - STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULTIPLY:
|
|
|
|
STACK(2) = STACK(2) * STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVIDE:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(2) = STACK(2) / STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODULUS:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(2) = STACK(2) % STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EQ:
|
|
|
|
STACK(2) = (STACK(2) == STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_NE:
|
|
|
|
STACK(2) = (STACK(2) != STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LT:
|
|
|
|
STACK(2) = (STACK(2) < STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GT:
|
|
|
|
STACK(2) = (STACK(2) > STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LE:
|
|
|
|
STACK(2) = (STACK(2) <= STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GE:
|
|
|
|
STACK(2) = (STACK(2) >= STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case PCD_ASSIGNMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNMAPARRAY:
|
|
|
|
activeBehavior->SetArrayVal (*(activeBehavior->MapVars[NEXTBYTE]), STACK(2), STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNWORLDARRAY:
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[NEXTBYTE][STACK(2)] = STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ASSIGNGLOBALARRAY:
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[NEXTBYTE][STACK(2)] = STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHSCRIPTVAR:
|
|
|
|
PushToStack (locals[NEXTBYTE]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHMAPVAR:
|
|
|
|
PushToStack (*(activeBehavior->MapVars[NEXTBYTE]));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHWORLDVAR:
|
|
|
|
PushToStack (ACS_WorldVars[NEXTBYTE]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHGLOBALVAR:
|
|
|
|
PushToStack (ACS_GlobalVars[NEXTBYTE]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHMAPARRAY:
|
|
|
|
STACK(1) = activeBehavior->GetArrayVal (*(activeBehavior->MapVars[NEXTBYTE]), STACK(1));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHWORLDARRAY:
|
2007-04-12 23:00:52 +00:00
|
|
|
STACK(1) = ACS_WorldArrays[NEXTBYTE][STACK(1)];
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PUSHGLOBALARRAY:
|
2007-04-12 23:00:52 +00:00
|
|
|
STACK(1) = ACS_GlobalArrays[NEXTBYTE][STACK(1)];
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] += STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) += STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] += STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] += STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) + STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] += STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ADDGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] += STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] -= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) -= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] -= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] -= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) - STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] -= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SUBGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] -= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] *= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) *= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] *= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] *= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) * STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] *= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MULGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] *= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVSCRIPTVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
locals[NEXTBYTE] /= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVMAPVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) /= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVWORLDVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ACS_WorldVars[NEXTBYTE] /= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVGLOBALVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ACS_GlobalVars[NEXTBYTE] /= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVMAPARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) / STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVWORLDARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] /= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DIVGLOBALARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_DivideBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] /= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODSCRIPTVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
locals[NEXTBYTE] %= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODMAPVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) %= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODWORLDVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ACS_WorldVars[NEXTBYTE] %= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODGLOBALVAR:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ACS_GlobalVars[NEXTBYTE] %= STACK(1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODMAPARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) % STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODWORLDARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] %= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MODGLOBALARRAY:
|
|
|
|
if (STACK(1) == 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_ModulusBy0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] %= STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-07-16 20:13:24 +00:00
|
|
|
//[MW] start
|
|
|
|
case PCD_ANDSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] &= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) &= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] &= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] &= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) & STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] &= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] &= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] ^= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) ^= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] ^= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] ^= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) ^ STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] ^= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] ^= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] |= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) |= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] |= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] |= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) | STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] |= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
|
|
|
int i = STACK(2);
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] |= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] <<= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) <<= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] <<= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] <<= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) << STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] <<= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LSGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] <<= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSSCRIPTVAR:
|
|
|
|
locals[NEXTBYTE] >>= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) >>= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSWORLDVAR:
|
|
|
|
ACS_WorldVars[NEXTBYTE] >>= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSGLOBALVAR:
|
|
|
|
ACS_GlobalVars[NEXTBYTE] >>= STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(2);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) >> STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(2)] >>= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(2)] >>= STACK(1);
|
2006-07-16 20:13:24 +00:00
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
//[MW] end
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_INCSCRIPTVAR:
|
|
|
|
++locals[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) += 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCWORLDVAR:
|
|
|
|
++ACS_WorldVars[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCGLOBALVAR:
|
|
|
|
++ACS_GlobalVars[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(1);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) + 1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(1)] += 1;
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_INCGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(1)] += 1;
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECSCRIPTVAR:
|
|
|
|
--locals[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECMAPVAR:
|
|
|
|
*(activeBehavior->MapVars[NEXTBYTE]) -= 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECWORLDVAR:
|
|
|
|
--ACS_WorldVars[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECGLOBALVAR:
|
|
|
|
--ACS_GlobalVars[NEXTBYTE];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECMAPARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[NEXTBYTE]);
|
|
|
|
int i = STACK(1);
|
|
|
|
activeBehavior->SetArrayVal (a, i, activeBehavior->GetArrayVal (a, i) - 1);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECWORLDARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_WorldArrays[a][STACK(1)] -= 1;
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DECGLOBALARRAY:
|
|
|
|
{
|
|
|
|
int a = NEXTBYTE;
|
|
|
|
int i = STACK(1);
|
2007-04-12 23:00:52 +00:00
|
|
|
ACS_GlobalArrays[a][STACK(1)] -= 1;
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GOTO:
|
|
|
|
pc = activeBehavior->Ofs2PC (*pc);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_IFGOTO:
|
|
|
|
if (STACK(1))
|
|
|
|
pc = activeBehavior->Ofs2PC (*pc);
|
|
|
|
else
|
|
|
|
pc++;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DROP:
|
|
|
|
case PCD_SETRESULTVALUE:
|
|
|
|
resultValue = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DELAY:
|
2006-10-03 03:14:28 +00:00
|
|
|
statedata = STACK(1) + (fmt == ACS_Old && gameinfo.gametype == GAME_Hexen);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (statedata > 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_Delayed;
|
|
|
|
}
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DELAYDIRECT:
|
2006-10-03 03:14:28 +00:00
|
|
|
statedata = NEXTWORD + (fmt == ACS_Old && gameinfo.gametype == GAME_Hexen);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (statedata > 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_Delayed;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_DELAYDIRECTB:
|
2006-10-03 03:14:28 +00:00
|
|
|
statedata = *(BYTE *)pc + (fmt == ACS_Old && gameinfo.gametype == GAME_Hexen);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (statedata > 0)
|
|
|
|
{
|
|
|
|
state = SCRIPT_Delayed;
|
|
|
|
}
|
|
|
|
pc = (int *)((BYTE *)pc + 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RANDOM:
|
|
|
|
STACK(2) = Random (STACK(2), STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_RANDOMDIRECT:
|
|
|
|
PushToStack (Random (pc[0], pc[1]));
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RANDOMDIRECTB:
|
|
|
|
PushToStack (Random (((BYTE *)pc)[0], ((BYTE *)pc)[1]));
|
|
|
|
pc = (int *)((BYTE *)pc + 2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THINGCOUNT:
|
2008-03-21 12:25:45 +00:00
|
|
|
STACK(2) = ThingCount (STACK(2), -1, STACK(1), -1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THINGCOUNTDIRECT:
|
2008-03-21 12:25:45 +00:00
|
|
|
PushToStack (ThingCount (pc[0], -1, pc[1], -1));
|
2006-02-24 04:48:15 +00:00
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
case PCD_THINGCOUNTNAME:
|
2008-03-21 12:25:45 +00:00
|
|
|
STACK(2) = ThingCount (-1, STACK(2), STACK(1), -1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THINGCOUNTNAMESECTOR:
|
|
|
|
STACK(2) = ThingCount (-1, STACK(3), STACK(2), STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THINGCOUNTSECTOR:
|
|
|
|
STACK(2) = ThingCount (STACK(3), -1, STACK(2), STACK(1));
|
2006-07-09 20:15:38 +00:00
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_TAGWAIT:
|
|
|
|
state = SCRIPT_TagWait;
|
|
|
|
statedata = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_TAGWAITDIRECT:
|
|
|
|
state = SCRIPT_TagWait;
|
|
|
|
statedata = NEXTWORD;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_POLYWAIT:
|
|
|
|
state = SCRIPT_PolyWait;
|
|
|
|
statedata = STACK(1);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_POLYWAITDIRECT:
|
|
|
|
state = SCRIPT_PolyWait;
|
|
|
|
statedata = NEXTWORD;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHANGEFLOOR:
|
|
|
|
ChangeFlat (STACK(2), STACK(1), 0);
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHANGEFLOORDIRECT:
|
|
|
|
ChangeFlat (pc[0], pc[1], 0);
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHANGECEILING:
|
|
|
|
ChangeFlat (STACK(2), STACK(1), 1);
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHANGECEILINGDIRECT:
|
|
|
|
ChangeFlat (pc[0], pc[1], 1);
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RESTART:
|
|
|
|
{
|
|
|
|
const ScriptPtr *scriptp;
|
|
|
|
|
|
|
|
scriptp = activeBehavior->FindScript (script);
|
|
|
|
pc = activeBehavior->GetScriptAddress (scriptp);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDLOGICAL:
|
|
|
|
STACK(2) = (STACK(2) && STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORLOGICAL:
|
|
|
|
STACK(2) = (STACK(2) || STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ANDBITWISE:
|
|
|
|
STACK(2) = (STACK(2) & STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ORBITWISE:
|
|
|
|
STACK(2) = (STACK(2) | STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_EORBITWISE:
|
|
|
|
STACK(2) = (STACK(2) ^ STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_NEGATELOGICAL:
|
|
|
|
STACK(1) = !STACK(1);
|
|
|
|
break;
|
|
|
|
|
2006-10-09 15:55:47 +00:00
|
|
|
case PCD_NEGATEBINARY:
|
|
|
|
STACK(1) = ~STACK(1);
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_LSHIFT:
|
|
|
|
STACK(2) = (STACK(2) << STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_RSHIFT:
|
|
|
|
STACK(2) = (STACK(2) >> STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_UNARYMINUS:
|
|
|
|
STACK(1) = -STACK(1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_IFNOTGOTO:
|
|
|
|
if (!STACK(1))
|
|
|
|
pc = activeBehavior->Ofs2PC (*pc);
|
|
|
|
else
|
|
|
|
pc++;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LINESIDE:
|
|
|
|
PushToStack (backSide);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SCRIPTWAIT:
|
|
|
|
statedata = STACK(1);
|
|
|
|
if (controller->RunningScripts[statedata])
|
|
|
|
state = SCRIPT_ScriptWait;
|
|
|
|
else
|
|
|
|
state = SCRIPT_ScriptWaitPre;
|
|
|
|
sp--;
|
|
|
|
PutLast ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SCRIPTWAITDIRECT:
|
|
|
|
state = SCRIPT_ScriptWait;
|
|
|
|
statedata = NEXTWORD;
|
|
|
|
PutLast ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CLEARLINESPECIAL:
|
|
|
|
if (activationline)
|
|
|
|
activationline->special = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CASEGOTO:
|
|
|
|
if (STACK(1) == NEXTWORD)
|
|
|
|
{
|
|
|
|
pc = activeBehavior->Ofs2PC (*pc);
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pc++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CASEGOTOSORTED:
|
|
|
|
// The count and jump table are 4-byte aligned
|
|
|
|
pc = (int *)((BYTE *)pc + (4 - (((size_t)pc & 3)) & 3));
|
|
|
|
{
|
|
|
|
int numcases = NEXTWORD;
|
|
|
|
int min = 0, max = numcases-1;
|
|
|
|
while (min <= max)
|
|
|
|
{
|
|
|
|
int mid = (min + max) / 2;
|
|
|
|
SDWORD caseval = pc[mid*2];
|
|
|
|
if (caseval == STACK(1))
|
|
|
|
{
|
|
|
|
pc = activeBehavior->Ofs2PC (pc[mid*2+1]);
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (caseval < STACK(1))
|
|
|
|
{
|
|
|
|
min = mid + 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
max = mid - 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (min > max)
|
|
|
|
{
|
|
|
|
// The case was not found, so go to the next instruction.
|
|
|
|
pc += numcases * 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_BEGINPRINT:
|
2006-05-26 04:38:22 +00:00
|
|
|
work = "";
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PRINTSTRING:
|
|
|
|
case PCD_PRINTLOCALIZED:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(1));
|
|
|
|
if (pcd == PCD_PRINTLOCALIZED)
|
|
|
|
{
|
|
|
|
lookup = GStrings(lookup);
|
|
|
|
}
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
work += lookup;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
--sp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PRINTNUMBER:
|
2006-09-14 00:02:31 +00:00
|
|
|
work.AppendFormat ("%d", STACK(1));
|
2006-02-24 04:48:15 +00:00
|
|
|
--sp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PRINTCHARACTER:
|
2006-05-26 04:38:22 +00:00
|
|
|
work += (char)STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
--sp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PRINTFIXED:
|
2006-05-26 04:38:22 +00:00
|
|
|
work.AppendFormat ("%g", FIXED2FLOAT(STACK(1)));
|
2006-02-24 04:48:15 +00:00
|
|
|
--sp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
// [BC] Print activator's name
|
|
|
|
// [RH] Fancied up a bit
|
|
|
|
case PCD_PRINTNAME:
|
|
|
|
{
|
|
|
|
player_t *player = NULL;
|
|
|
|
|
|
|
|
if (STACK(1) == 0 || (unsigned)STACK(1) > MAXPLAYERS)
|
|
|
|
{
|
|
|
|
if (activator)
|
|
|
|
{
|
|
|
|
player = activator->player;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (playeringame[STACK(1)-1])
|
|
|
|
{
|
|
|
|
player = &players[STACK(1)-1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-09-14 00:02:31 +00:00
|
|
|
work.AppendFormat ("Player %d", STACK(1));
|
2006-02-24 04:48:15 +00:00
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (player)
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
work += player->userinfo.netname;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else if (activator)
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
work += RUNTIME_TYPE(activator)->TypeName.GetChars();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
work += ' ';
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
// [JB] Print map character array
|
|
|
|
case PCD_PRINTMAPCHARARRAY:
|
|
|
|
{
|
|
|
|
int a = *(activeBehavior->MapVars[STACK(1)]);
|
|
|
|
int offset = STACK(2);
|
2006-05-26 04:38:22 +00:00
|
|
|
int c;
|
|
|
|
while((c = activeBehavior->GetArrayVal (a, offset)) != '\0') {
|
|
|
|
work += (char)c;
|
2006-02-24 04:48:15 +00:00
|
|
|
offset++;
|
|
|
|
}
|
|
|
|
sp-=2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
// [JB] Print world character array
|
|
|
|
case PCD_PRINTWORLDCHARARRAY:
|
|
|
|
{
|
|
|
|
int a = STACK(1);
|
|
|
|
int offset = STACK(2);
|
2006-05-26 04:38:22 +00:00
|
|
|
int c;
|
2007-04-12 23:00:52 +00:00
|
|
|
while((c = ACS_WorldArrays[a][offset]) != '\0') {
|
2006-05-26 04:38:22 +00:00
|
|
|
work += (char)c;
|
2006-02-24 04:48:15 +00:00
|
|
|
offset++;
|
|
|
|
}
|
|
|
|
sp-=2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
// [JB] Print global character array
|
|
|
|
case PCD_PRINTGLOBALCHARARRAY:
|
|
|
|
{
|
|
|
|
int a = STACK(1);
|
|
|
|
int offset = STACK(2);
|
2006-05-26 04:38:22 +00:00
|
|
|
int c;
|
2007-04-12 23:00:52 +00:00
|
|
|
while((c = ACS_GlobalArrays[a][offset]) != '\0') {
|
2006-05-26 04:38:22 +00:00
|
|
|
work += (char)c;
|
2006-02-24 04:48:15 +00:00
|
|
|
offset++;
|
|
|
|
}
|
|
|
|
sp-=2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2007-02-24 12:09:36 +00:00
|
|
|
// [GRB] Print key name(s) for a command
|
|
|
|
case PCD_PRINTBIND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(1));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
int key1 = 0, key2 = 0;
|
|
|
|
|
|
|
|
C_GetKeysForCommand ((char *)lookup, &key1, &key2);
|
|
|
|
|
|
|
|
if (key2)
|
2007-02-24 17:56:43 +00:00
|
|
|
work << KeyNames[key1] << " or " << KeyNames[key2];
|
2007-02-24 12:09:36 +00:00
|
|
|
else if (key1)
|
2007-02-24 17:56:43 +00:00
|
|
|
work << KeyNames[key1];
|
2007-02-24 12:09:36 +00:00
|
|
|
else
|
2007-02-24 17:56:43 +00:00
|
|
|
work << "??? (" << (char *)lookup << ')';
|
2007-02-24 12:09:36 +00:00
|
|
|
}
|
|
|
|
--sp;
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_ENDPRINT:
|
|
|
|
case PCD_ENDPRINTBOLD:
|
|
|
|
case PCD_MOREHUDMESSAGE:
|
|
|
|
case PCD_ENDLOG:
|
2006-05-26 04:38:22 +00:00
|
|
|
strbin (work.LockBuffer());
|
|
|
|
work.Truncate ((long)strlen(work));
|
|
|
|
work.UnlockBuffer();
|
2006-02-24 04:48:15 +00:00
|
|
|
if (pcd == PCD_ENDLOG)
|
|
|
|
{
|
2006-05-26 04:38:22 +00:00
|
|
|
Printf ("%s\n", work.GetChars());
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else if (pcd != PCD_MOREHUDMESSAGE)
|
|
|
|
{
|
|
|
|
AActor *screen = activator;
|
|
|
|
// If a missile is the activator, make the thing that
|
|
|
|
// launched the missile the target of the print command.
|
|
|
|
if (screen != NULL &&
|
|
|
|
screen->player == NULL &&
|
|
|
|
(screen->flags & MF_MISSILE) &&
|
|
|
|
screen->target != NULL)
|
|
|
|
{
|
|
|
|
screen = screen->target;
|
|
|
|
}
|
|
|
|
if (pcd == PCD_ENDPRINTBOLD || screen == NULL ||
|
|
|
|
screen->CheckLocalView (consoleplayer))
|
|
|
|
{
|
|
|
|
C_MidPrint (work);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
optstart = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_OPTHUDMESSAGE:
|
|
|
|
optstart = sp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ENDHUDMESSAGE:
|
|
|
|
case PCD_ENDHUDMESSAGEBOLD:
|
|
|
|
if (optstart == -1)
|
|
|
|
{
|
|
|
|
optstart = sp;
|
|
|
|
}
|
|
|
|
{
|
|
|
|
AActor *screen = activator;
|
|
|
|
if (screen != NULL &&
|
|
|
|
screen->player == NULL &&
|
|
|
|
(screen->flags & MF_MISSILE) &&
|
|
|
|
screen->target != NULL)
|
|
|
|
{
|
|
|
|
screen = screen->target;
|
|
|
|
}
|
|
|
|
if (pcd == PCD_ENDHUDMESSAGEBOLD || screen == NULL ||
|
|
|
|
players[consoleplayer].mo == screen)
|
|
|
|
{
|
|
|
|
int type = Stack[optstart-6];
|
|
|
|
int id = Stack[optstart-5];
|
2006-09-01 01:08:27 +00:00
|
|
|
EColorRange color;
|
2006-02-24 04:48:15 +00:00
|
|
|
float x = FIXED2FLOAT(Stack[optstart-3]);
|
|
|
|
float y = FIXED2FLOAT(Stack[optstart-2]);
|
|
|
|
float holdTime = FIXED2FLOAT(Stack[optstart-1]);
|
|
|
|
DHUDMessage *msg;
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
if (type & HUDMSG_COLORSTRING)
|
|
|
|
{
|
|
|
|
color = V_FindFontColor(FBehavior::StaticLookupString(Stack[optstart-4]));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
color = CLAMPCOLOR(Stack[optstart-4]);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (type & 0xFFFF)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
default: // normal
|
|
|
|
msg = new DHUDMessage (work, x, y, hudwidth, hudheight, color, holdTime);
|
|
|
|
break;
|
|
|
|
case 1: // fade out
|
|
|
|
{
|
|
|
|
float fadeTime = (optstart < sp) ? FIXED2FLOAT(Stack[optstart]) : 0.5f;
|
|
|
|
msg = new DHUDMessageFadeOut (work, x, y, hudwidth, hudheight, color, holdTime, fadeTime);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2: // type on, then fade out
|
|
|
|
{
|
|
|
|
float typeTime = (optstart < sp) ? FIXED2FLOAT(Stack[optstart]) : 0.05f;
|
|
|
|
float fadeTime = (optstart < sp-1) ? FIXED2FLOAT(Stack[optstart+1]) : 0.5f;
|
|
|
|
msg = new DHUDMessageTypeOnFadeOut (work, x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 3: // fade in, then fade out
|
|
|
|
{
|
|
|
|
float inTime = (optstart < sp) ? FIXED2FLOAT(Stack[optstart]) : 0.5f;
|
|
|
|
float outTime = (optstart < sp-1) ? FIXED2FLOAT(Stack[optstart+1]) : 0.5f;
|
|
|
|
msg = new DHUDMessageFadeInOut (work, x, y, hudwidth, hudheight, color, holdTime, inTime, outTime);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
StatusBar->AttachMessage (msg, id ? 0xff000000|id : 0);
|
|
|
|
if (type & HUDMSG_LOG)
|
|
|
|
{
|
|
|
|
static const char bar[] = TEXTCOLOR_ORANGE "\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
|
|
|
|
"\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_NORMAL "\n";
|
|
|
|
static const char logbar[] = "\n<------------------------------->\n";
|
2006-05-26 04:38:22 +00:00
|
|
|
char consolecolor[3];
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-05-26 04:38:22 +00:00
|
|
|
consolecolor[0] = '\x1c';
|
|
|
|
consolecolor[1] = color >= CR_BRICK && color <= CR_YELLOW ? color + 'A' : '-';
|
|
|
|
consolecolor[2] = '\0';
|
2006-02-24 04:48:15 +00:00
|
|
|
AddToConsole (-1, bar);
|
2006-05-26 04:38:22 +00:00
|
|
|
AddToConsole (-1, consolecolor);
|
|
|
|
AddToConsole (-1, work);
|
2006-02-24 04:48:15 +00:00
|
|
|
AddToConsole (-1, bar);
|
|
|
|
if (Logfile)
|
|
|
|
{
|
|
|
|
fputs (logbar, Logfile);
|
2006-05-26 04:38:22 +00:00
|
|
|
fputs (work, Logfile);
|
2006-02-24 04:48:15 +00:00
|
|
|
fputs (logbar, Logfile);
|
|
|
|
fflush (Logfile);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp = optstart-6;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETFONT:
|
|
|
|
DoSetFont (STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETFONTDIRECT:
|
|
|
|
DoSetFont (pc[0]);
|
|
|
|
pc++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERCOUNT:
|
|
|
|
PushToStack (CountPlayers ());
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GAMETYPE:
|
|
|
|
if (gamestate == GS_TITLELEVEL)
|
|
|
|
PushToStack (GAME_TITLE_MAP);
|
|
|
|
else if (deathmatch)
|
|
|
|
PushToStack (GAME_NET_DEATHMATCH);
|
|
|
|
else if (multiplayer)
|
|
|
|
PushToStack (GAME_NET_COOPERATIVE);
|
|
|
|
else
|
|
|
|
PushToStack (GAME_SINGLE_PLAYER);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GAMESKILL:
|
2007-11-02 22:03:03 +00:00
|
|
|
PushToStack (G_SkillProperty(SKILLP_ACSReturn));
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
// [BC] Start ST PCD's
|
|
|
|
case PCD_PLAYERHEALTH:
|
|
|
|
if (activator)
|
|
|
|
PushToStack (activator->health);
|
|
|
|
else
|
|
|
|
PushToStack (0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERARMORPOINTS:
|
|
|
|
if (activator)
|
|
|
|
{
|
|
|
|
ABasicArmor *armor = activator->FindInventory<ABasicArmor>();
|
|
|
|
PushToStack (armor ? armor->Amount : 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PushToStack (0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERFRAGS:
|
|
|
|
if (activator && activator->player)
|
|
|
|
PushToStack (activator->player->fragcount);
|
|
|
|
else
|
|
|
|
PushToStack (0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_MUSICCHANGE:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
S_ChangeMusic (lookup, STACK(1));
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SINGLEPLAYER:
|
|
|
|
PushToStack (!netgame);
|
|
|
|
break;
|
|
|
|
// [BC] End ST PCD's
|
|
|
|
|
|
|
|
case PCD_TIMER:
|
|
|
|
PushToStack (level.time);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SECTORSOUND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
if (activationline)
|
|
|
|
{
|
|
|
|
S_Sound (
|
|
|
|
activationline->frontsector->soundorg,
|
|
|
|
CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1)) / 127.f,
|
|
|
|
ATTN_NORM);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
S_Sound (
|
|
|
|
CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1)) / 127.f,
|
|
|
|
ATTN_NORM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_AMBIENTSOUND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
S_Sound (CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1)) / 127.f, ATTN_NONE);
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LOCALAMBIENTSOUND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL && activator->CheckLocalView (consoleplayer))
|
|
|
|
{
|
|
|
|
S_Sound (CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1)) / 127.f, ATTN_NONE);
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ACTIVATORSOUND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
S_Sound (activator, CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1)) / 127.f, ATTN_NORM);
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SOUNDSEQUENCE:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(1));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
if (activationline)
|
|
|
|
{
|
2008-03-25 04:42:26 +00:00
|
|
|
SN_StartSequence (activationline->frontsector, lookup, 0, true);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETLINETEXTURE:
|
|
|
|
SetLineTexture (STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 4;
|
|
|
|
break;
|
|
|
|
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
case PCD_REPLACETEXTURES:
|
2006-09-01 01:08:27 +00:00
|
|
|
ReplaceTextures (STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 3;
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_SETLINEBLOCKING:
|
|
|
|
{
|
|
|
|
int line = -1;
|
|
|
|
|
|
|
|
while ((line = P_FindLineFromID (STACK(2), line)) >= 0)
|
|
|
|
{
|
|
|
|
switch (STACK(1))
|
|
|
|
{
|
|
|
|
case BLOCK_NOTHING:
|
2006-11-10 12:13:37 +00:00
|
|
|
lines[line].flags &= ~(ML_BLOCKING|ML_BLOCKEVERYTHING|ML_RAILING|ML_BLOCK_PLAYERS);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
case BLOCK_CREATURES:
|
|
|
|
default:
|
2006-11-10 12:13:37 +00:00
|
|
|
lines[line].flags &= ~(ML_BLOCKEVERYTHING|ML_RAILING|ML_BLOCK_PLAYERS);
|
2006-02-24 04:48:15 +00:00
|
|
|
lines[line].flags |= ML_BLOCKING;
|
|
|
|
break;
|
|
|
|
case BLOCK_EVERYTHING:
|
2006-11-10 12:13:37 +00:00
|
|
|
lines[line].flags &= ~(ML_RAILING|ML_BLOCK_PLAYERS);
|
2006-02-24 04:48:15 +00:00
|
|
|
lines[line].flags |= ML_BLOCKING|ML_BLOCKEVERYTHING;
|
|
|
|
break;
|
|
|
|
case BLOCK_RAILING:
|
2006-11-10 12:13:37 +00:00
|
|
|
lines[line].flags &= ~(ML_BLOCKEVERYTHING|ML_BLOCK_PLAYERS);
|
2006-02-24 04:48:15 +00:00
|
|
|
lines[line].flags |= ML_RAILING|ML_BLOCKING;
|
|
|
|
break;
|
2006-11-10 12:13:37 +00:00
|
|
|
case BLOCK_PLAYERS:
|
|
|
|
lines[line].flags &= ~(ML_BLOCKEVERYTHING|ML_BLOCKING|ML_RAILING);
|
|
|
|
lines[line].flags |= ML_BLOCK_PLAYERS;
|
|
|
|
break;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETLINEMONSTERBLOCKING:
|
|
|
|
{
|
|
|
|
int line = -1;
|
|
|
|
|
|
|
|
while ((line = P_FindLineFromID (STACK(2), line)) >= 0)
|
|
|
|
{
|
|
|
|
if (STACK(1))
|
|
|
|
lines[line].flags |= ML_BLOCKMONSTERS;
|
|
|
|
else
|
|
|
|
lines[line].flags &= ~ML_BLOCKMONSTERS;
|
|
|
|
}
|
|
|
|
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETLINESPECIAL:
|
|
|
|
{
|
|
|
|
int linenum = -1;
|
|
|
|
|
|
|
|
while ((linenum = P_FindLineFromID (STACK(7), linenum)) >= 0) {
|
|
|
|
line_t *line = &lines[linenum];
|
|
|
|
|
|
|
|
line->special = STACK(6);
|
|
|
|
line->args[0] = STACK(5);
|
|
|
|
line->args[1] = STACK(4);
|
|
|
|
line->args[2] = STACK(3);
|
|
|
|
line->args[3] = STACK(2);
|
|
|
|
line->args[4] = STACK(1);
|
|
|
|
}
|
|
|
|
sp -= 7;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETTHINGSPECIAL:
|
|
|
|
{
|
2006-12-16 11:49:48 +00:00
|
|
|
if (STACK(7) != 0)
|
|
|
|
{
|
|
|
|
FActorIterator iterator (STACK(7));
|
|
|
|
AActor *actor;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-12-16 11:49:48 +00:00
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
actor->special = STACK(6);
|
|
|
|
actor->args[0] = STACK(5);
|
|
|
|
actor->args[1] = STACK(4);
|
|
|
|
actor->args[2] = STACK(3);
|
|
|
|
actor->args[3] = STACK(2);
|
|
|
|
actor->args[4] = STACK(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (activator != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-12-16 11:49:48 +00:00
|
|
|
activator->special = STACK(6);
|
|
|
|
activator->args[0] = STACK(5);
|
|
|
|
activator->args[1] = STACK(4);
|
|
|
|
activator->args[2] = STACK(3);
|
|
|
|
activator->args[3] = STACK(2);
|
|
|
|
activator->args[4] = STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
sp -= 7;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THINGSOUND:
|
|
|
|
lookup = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
if (lookup != NULL)
|
|
|
|
{
|
|
|
|
FActorIterator iterator (STACK(3));
|
|
|
|
AActor *spot;
|
|
|
|
|
|
|
|
while ( (spot = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
S_Sound (spot, CHAN_AUTO,
|
|
|
|
lookup,
|
|
|
|
(float)(STACK(1))/127.f, ATTN_NORM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_FIXEDMUL:
|
|
|
|
STACK(2) = FixedMul (STACK(2), STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_FIXEDDIV:
|
|
|
|
STACK(2) = FixedDiv (STACK(2), STACK(1));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETGRAVITY:
|
|
|
|
level.gravity = (float)STACK(1) / 65536.f;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETGRAVITYDIRECT:
|
|
|
|
level.gravity = (float)pc[0] / 65536.f;
|
|
|
|
pc++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETAIRCONTROL:
|
|
|
|
level.aircontrol = STACK(1);
|
|
|
|
sp--;
|
|
|
|
G_AirControlChanged ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETAIRCONTROLDIRECT:
|
|
|
|
level.aircontrol = pc[0];
|
|
|
|
pc++;
|
|
|
|
G_AirControlChanged ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SPAWN:
|
|
|
|
STACK(6) = DoSpawn (STACK(6), STACK(5), STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SPAWNDIRECT:
|
|
|
|
PushToStack (DoSpawn (pc[0], pc[1], pc[2], pc[3], pc[4], pc[5]));
|
|
|
|
pc += 6;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SPAWNSPOT:
|
|
|
|
STACK(4) = DoSpawnSpot (STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SPAWNSPOTDIRECT:
|
|
|
|
PushToStack (DoSpawnSpot (pc[0], pc[1], pc[2], pc[3]));
|
|
|
|
pc += 4;
|
|
|
|
break;
|
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
case PCD_SPAWNSPOTFACING:
|
|
|
|
STACK(3) = DoSpawnSpotFacing (STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_CLEARINVENTORY:
|
|
|
|
ClearInventory (activator);
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_CLEARACTORINVENTORY:
|
2007-12-18 03:25:19 +00:00
|
|
|
if (STACK(3) == 0)
|
|
|
|
{
|
|
|
|
ClearInventory(NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator it(STACK(3));
|
|
|
|
AActor *actor;
|
|
|
|
for (actor = it.Next(); actor != NULL; actor = it.Next())
|
|
|
|
{
|
|
|
|
ClearInventory(actor);
|
|
|
|
}
|
|
|
|
}
|
2006-06-18 15:49:00 +00:00
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_GIVEINVENTORY:
|
|
|
|
GiveInventory (activator, FBehavior::StaticLookupString (STACK(2)), STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_GIVEACTORINVENTORY:
|
2007-12-18 03:25:19 +00:00
|
|
|
{
|
|
|
|
const char *type = FBehavior::StaticLookupString(STACK(2));
|
|
|
|
if (STACK(3) == 0)
|
|
|
|
{
|
|
|
|
GiveInventory(NULL, FBehavior::StaticLookupString(STACK(2)), STACK(1));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator it(STACK(3));
|
|
|
|
AActor *actor;
|
|
|
|
for (actor = it.Next(); actor != NULL; actor = it.Next())
|
|
|
|
{
|
|
|
|
GiveInventory(actor, type, STACK(1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
}
|
2006-06-18 15:49:00 +00:00
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_GIVEINVENTORYDIRECT:
|
|
|
|
GiveInventory (activator, FBehavior::StaticLookupString (pc[0]), pc[1]);
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_TAKEINVENTORY:
|
|
|
|
TakeInventory (activator, FBehavior::StaticLookupString (STACK(2)), STACK(1));
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_TAKEACTORINVENTORY:
|
2007-12-18 03:25:19 +00:00
|
|
|
{
|
|
|
|
const char *type = FBehavior::StaticLookupString(STACK(2));
|
|
|
|
if (STACK(3) == 0)
|
|
|
|
{
|
|
|
|
TakeInventory(NULL, type, STACK(1));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator it(STACK(3));
|
|
|
|
AActor *actor;
|
|
|
|
for (actor = it.Next(); actor != NULL; actor = it.Next())
|
|
|
|
{
|
|
|
|
TakeInventory(actor, type, STACK(1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
}
|
2006-06-18 15:49:00 +00:00
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_TAKEINVENTORYDIRECT:
|
|
|
|
TakeInventory (activator, FBehavior::StaticLookupString (pc[0]), pc[1]);
|
|
|
|
pc += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHECKINVENTORY:
|
|
|
|
STACK(1) = CheckInventory (activator, FBehavior::StaticLookupString (STACK(1)));
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_CHECKACTORINVENTORY:
|
2008-05-18 15:48:03 +00:00
|
|
|
STACK(2) = CheckInventory (SingleActorFromTID(STACK(2), NULL),
|
2006-06-18 15:49:00 +00:00
|
|
|
FBehavior::StaticLookupString (STACK(1)));
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_CHECKINVENTORYDIRECT:
|
|
|
|
PushToStack (CheckInventory (activator, FBehavior::StaticLookupString (pc[0])));
|
|
|
|
pc += 1;
|
|
|
|
break;
|
|
|
|
|
2007-12-25 08:44:13 +00:00
|
|
|
case PCD_USEINVENTORY:
|
|
|
|
STACK(1) = UseInventory (activator, FBehavior::StaticLookupString (STACK(1)));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_USEACTORINVENTORY:
|
|
|
|
{
|
2007-12-25 09:31:10 +00:00
|
|
|
int ret = 0;
|
2007-12-25 08:44:13 +00:00
|
|
|
const char *type = FBehavior::StaticLookupString(STACK(1));
|
|
|
|
if (STACK(2) == 0)
|
|
|
|
{
|
|
|
|
ret = UseInventory(NULL, type);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator it(STACK(2));
|
|
|
|
AActor *actor;
|
|
|
|
for (actor = it.Next(); actor != NULL; actor = it.Next())
|
|
|
|
{
|
|
|
|
ret += UseInventory(actor, type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
STACK(2) = ret;
|
|
|
|
sp--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_GETSIGILPIECES:
|
|
|
|
{
|
|
|
|
ASigil *sigil;
|
|
|
|
|
|
|
|
if (activator == NULL || (sigil = activator->FindInventory<ASigil>()) == NULL)
|
|
|
|
{
|
|
|
|
PushToStack (0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PushToStack (sigil->NumPieces);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETAMMOCAPACITY:
|
|
|
|
if (activator != NULL)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type = PClass::FindClass (FBehavior::StaticLookupString (STACK(1)));
|
2006-02-24 04:48:15 +00:00
|
|
|
AInventory *item;
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
if (type != NULL && type->ParentClass == RUNTIME_CLASS(AAmmo))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
item = activator->FindInventory (type);
|
|
|
|
if (item != NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = item->MaxAmount;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = ((AInventory *)GetDefaultByType (type))->MaxAmount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETAMMOCAPACITY:
|
|
|
|
if (activator != NULL)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type = PClass::FindClass (FBehavior::StaticLookupString (STACK(2)));
|
2006-02-24 04:48:15 +00:00
|
|
|
AInventory *item;
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
if (type != NULL && type->ParentClass == RUNTIME_CLASS(AAmmo))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
item = activator->FindInventory (type);
|
|
|
|
if (item != NULL)
|
|
|
|
{
|
|
|
|
item->MaxAmount = STACK(1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
item = activator->GiveInventoryType (type);
|
|
|
|
item->MaxAmount = STACK(1);
|
|
|
|
item->Amount = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETMUSIC:
|
|
|
|
S_ChangeMusic (FBehavior::StaticLookupString (STACK(3)), STACK(2));
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETMUSICDIRECT:
|
|
|
|
S_ChangeMusic (FBehavior::StaticLookupString (pc[0]), pc[1]);
|
|
|
|
pc += 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LOCALSETMUSIC:
|
|
|
|
if (activator == players[consoleplayer].mo)
|
|
|
|
{
|
|
|
|
S_ChangeMusic (FBehavior::StaticLookupString (STACK(3)), STACK(2));
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_LOCALSETMUSICDIRECT:
|
|
|
|
if (activator == players[consoleplayer].mo)
|
|
|
|
{
|
|
|
|
S_ChangeMusic (FBehavior::StaticLookupString (pc[0]), pc[1]);
|
|
|
|
}
|
|
|
|
pc += 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_FADETO:
|
|
|
|
DoFadeTo (STACK(5), STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_FADERANGE:
|
|
|
|
DoFadeRange (STACK(9), STACK(8), STACK(7), STACK(6),
|
|
|
|
STACK(5), STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 9;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CANCELFADE:
|
|
|
|
{
|
|
|
|
TThinkerIterator<DFlashFader> iterator;
|
|
|
|
DFlashFader *fader;
|
|
|
|
|
|
|
|
while ( (fader = iterator.Next()) )
|
|
|
|
{
|
|
|
|
if (activator == NULL || fader->WhoFor() == activator)
|
|
|
|
{
|
|
|
|
fader->Cancel ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYMOVIE:
|
|
|
|
STACK(1) = I_PlayMovie (FBehavior::StaticLookupString (STACK(1)));
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_SETACTORPOSITION:
|
|
|
|
{
|
2006-09-14 00:02:31 +00:00
|
|
|
bool result = false;
|
2006-06-18 15:49:00 +00:00
|
|
|
AActor *actor = SingleActorFromTID (STACK(5), activator);
|
|
|
|
if (actor != NULL)
|
|
|
|
result = P_MoveThing(actor, STACK(4), STACK(3), STACK(2), !!STACK(1));
|
|
|
|
sp -= 4;
|
|
|
|
STACK(1) = result;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_GETACTORX:
|
|
|
|
case PCD_GETACTORY:
|
|
|
|
case PCD_GETACTORZ:
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID (STACK(1), activator);
|
|
|
|
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = (&actor->x)[pcd - PCD_GETACTORX];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETACTORFLOORZ:
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_GETACTORCEILINGZ:
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID (STACK(1), activator);
|
|
|
|
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
2006-06-18 15:49:00 +00:00
|
|
|
else if (pcd == PCD_GETACTORFLOORZ)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
STACK(1) = actor->floorz;
|
|
|
|
}
|
2006-06-18 15:49:00 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = actor->ceilingz;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETACTORANGLE:
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID (STACK(1), activator);
|
|
|
|
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = actor->angle >> 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-10-22 10:32:41 +00:00
|
|
|
case PCD_GETACTORPITCH:
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID (STACK(1), activator);
|
|
|
|
|
|
|
|
if (actor == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = actor->pitch >> 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_GETLINEROWOFFSET:
|
|
|
|
if (activationline)
|
|
|
|
{
|
2008-03-21 17:35:49 +00:00
|
|
|
PushToStack (sides[activationline->sidenum[0]].GetTextureYOffset(side_t::mid) >> FRACBITS);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PushToStack (0);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETSECTORFLOORZ:
|
|
|
|
case PCD_GETSECTORCEILINGZ:
|
|
|
|
// Arguments are (tag, x, y). If you don't use slopes, then (x, y) don't
|
|
|
|
// really matter and can be left as (0, 0) if you like.
|
|
|
|
{
|
|
|
|
int secnum = P_FindSectorFromTag (STACK(3), -1);
|
|
|
|
fixed_t z = 0;
|
|
|
|
|
|
|
|
if (secnum >= 0)
|
|
|
|
{
|
|
|
|
fixed_t x = STACK(2) << FRACBITS;
|
|
|
|
fixed_t y = STACK(1) << FRACBITS;
|
|
|
|
if (pcd == PCD_GETSECTORFLOORZ)
|
|
|
|
{
|
|
|
|
z = sectors[secnum].floorplane.ZatPoint (x, y);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
z = sectors[secnum].ceilingplane.ZatPoint (x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
STACK(1) = z;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-06-18 15:49:00 +00:00
|
|
|
case PCD_GETSECTORLIGHTLEVEL:
|
|
|
|
{
|
|
|
|
int secnum = P_FindSectorFromTag (STACK(1), -1);
|
|
|
|
int z = -1;
|
|
|
|
|
|
|
|
if (secnum >= 0)
|
|
|
|
{
|
|
|
|
z = sectors[secnum].lightlevel;
|
|
|
|
}
|
|
|
|
STACK(1) = z;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_SETFLOORTRIGGER:
|
|
|
|
new DPlaneWatcher (activator, activationline, backSide, false, STACK(8),
|
|
|
|
STACK(7), STACK(6), STACK(5), STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETCEILINGTRIGGER:
|
|
|
|
new DPlaneWatcher (activator, activationline, backSide, true, STACK(8),
|
|
|
|
STACK(7), STACK(6), STACK(5), STACK(4), STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_STARTTRANSLATION:
|
|
|
|
{
|
|
|
|
int i = STACK(1);
|
|
|
|
sp--;
|
|
|
|
if (i >= 1 && i <= MAX_ACS_TRANSLATIONS)
|
|
|
|
{
|
2008-01-08 01:08:27 +00:00
|
|
|
translation = translationtables[TRANSLATION_LevelScripted].GetVal(i - 1);
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
if (translation == NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
translation = new FRemapTable;
|
2008-01-08 01:08:27 +00:00
|
|
|
translationtables[TRANSLATION_LevelScripted].SetVal(i - 1, translation);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
translation->MakeIdentity();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_TRANSLATIONRANGE1:
|
|
|
|
{ // translation using palette shifting
|
|
|
|
int start = STACK(4);
|
|
|
|
int end = STACK(3);
|
|
|
|
int pal1 = STACK(2);
|
|
|
|
int pal2 = STACK(1);
|
|
|
|
sp -= 4;
|
|
|
|
|
2007-12-26 16:06:03 +00:00
|
|
|
if (translation != NULL)
|
|
|
|
translation->AddIndexRange(start, end, pal1, pal2);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_TRANSLATIONRANGE2:
|
|
|
|
{ // translation using RGB values
|
|
|
|
// (would HSV be a good idea too?)
|
|
|
|
int start = STACK(8);
|
|
|
|
int end = STACK(7);
|
2007-12-26 16:06:03 +00:00
|
|
|
int r1 = STACK(6);
|
|
|
|
int g1 = STACK(5);
|
|
|
|
int b1 = STACK(4);
|
|
|
|
int r2 = STACK(3);
|
|
|
|
int g2 = STACK(2);
|
|
|
|
int b2 = STACK(1);
|
2006-02-24 04:48:15 +00:00
|
|
|
sp -= 8;
|
|
|
|
|
2007-12-26 16:06:03 +00:00
|
|
|
if (translation != NULL)
|
|
|
|
translation->AddColorRange(start, end, r1, g1, b1, r2, g2, b2);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ENDTRANSLATION:
|
|
|
|
// This might be useful for hardware rendering, but
|
|
|
|
// for software it is superfluous.
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
translation->UpdateNative();
|
2006-02-24 04:48:15 +00:00
|
|
|
translation = NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SIN:
|
|
|
|
STACK(1) = finesine[angle_t(STACK(1)<<16)>>ANGLETOFINESHIFT];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_COS:
|
|
|
|
STACK(1) = finecosine[angle_t(STACK(1)<<16)>>ANGLETOFINESHIFT];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_VECTORANGLE:
|
|
|
|
STACK(2) = R_PointToAngle2 (0, 0, STACK(2), STACK(1)) >> 16;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHECKWEAPON:
|
|
|
|
if (activator == NULL || activator->player == NULL || // Non-players do not have weapons
|
|
|
|
activator->player->ReadyWeapon == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-11-11 09:02:04 +00:00
|
|
|
STACK(1) = 0 == stricmp (FBehavior::StaticLookupString (STACK(1)),
|
2006-05-10 02:40:43 +00:00
|
|
|
activator->player->ReadyWeapon->GetClass()->TypeName.GetChars());
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETWEAPON:
|
|
|
|
if (activator == NULL || activator->player == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
AInventory *item = activator->FindInventory (PClass::FindClass (
|
2006-02-24 04:48:15 +00:00
|
|
|
FBehavior::StaticLookupString (STACK(1))));
|
|
|
|
|
|
|
|
if (item == NULL || !item->IsKindOf (RUNTIME_CLASS(AWeapon)))
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else if (activator->player->ReadyWeapon == item)
|
|
|
|
{
|
|
|
|
// The weapon is already selected, so setweapon succeeds by default,
|
|
|
|
// but make sure the player isn't switching away from it.
|
|
|
|
activator->player->PendingWeapon = WP_NOCHANGE;
|
|
|
|
STACK(1) = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
AWeapon *weap = static_cast<AWeapon *> (item);
|
|
|
|
|
|
|
|
if (weap->CheckAmmo (AWeapon::EitherFire, false))
|
|
|
|
{
|
|
|
|
// There's enough ammo, so switch to it.
|
|
|
|
STACK(1) = 1;
|
|
|
|
activator->player->PendingWeapon = weap;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
case PCD_SETMARINEWEAPON:
|
|
|
|
if (STACK(2) != 0)
|
|
|
|
{
|
|
|
|
AScriptedMarine *marine;
|
|
|
|
TActorIterator<AScriptedMarine> iterator (STACK(2));
|
|
|
|
|
|
|
|
while ((marine = iterator.Next()) != NULL)
|
|
|
|
{
|
|
|
|
marine->SetWeapon ((AScriptedMarine::EMarineWeapon)STACK(1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
if (activator != NULL && activator->IsKindOf (RUNTIME_CLASS(AScriptedMarine)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
barrier_cast<AScriptedMarine *>(activator)->SetWeapon (
|
2006-02-24 04:48:15 +00:00
|
|
|
(AScriptedMarine::EMarineWeapon)STACK(1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETMARINESPRITE:
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type = PClass::FindClass (FBehavior::StaticLookupString (STACK(1)));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (type != NULL)
|
|
|
|
{
|
|
|
|
if (STACK(2) != 0)
|
|
|
|
{
|
|
|
|
AScriptedMarine *marine;
|
|
|
|
TActorIterator<AScriptedMarine> iterator (STACK(2));
|
|
|
|
|
|
|
|
while ((marine = iterator.Next()) != NULL)
|
|
|
|
{
|
|
|
|
marine->SetSprite (type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
if (activator != NULL && activator->IsKindOf (RUNTIME_CLASS(AScriptedMarine)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
barrier_cast<AScriptedMarine *>(activator)->SetSprite (type);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Printf ("Unknown actor type: %s\n", FBehavior::StaticLookupString (STACK(1)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETACTORPROPERTY:
|
|
|
|
SetActorProperty (STACK(3), STACK(2), STACK(1));
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETACTORPROPERTY:
|
|
|
|
STACK(2) = GetActorProperty (STACK(2), STACK(1));
|
|
|
|
sp -= 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERNUMBER:
|
|
|
|
if (activator == NULL || activator->player == NULL)
|
|
|
|
{
|
|
|
|
PushToStack (-1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PushToStack (activator->player - players);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERINGAME:
|
|
|
|
if (STACK(1) < 0 || STACK(1) > MAXPLAYERS)
|
|
|
|
{
|
|
|
|
STACK(1) = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = playeringame[STACK(1)];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_PLAYERISBOT:
|
|
|
|
if (STACK(1) < 0 || STACK(1) > MAXPLAYERS || !playeringame[STACK(1)])
|
|
|
|
{
|
|
|
|
STACK(1) = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = players[STACK(1)].isbot;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_ACTIVATORTID:
|
|
|
|
if (activator == NULL)
|
|
|
|
{
|
|
|
|
PushToStack (0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PushToStack (activator->tid);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETSCREENWIDTH:
|
|
|
|
PushToStack (SCREENWIDTH);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETSCREENHEIGHT:
|
|
|
|
PushToStack (SCREENHEIGHT);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_THING_PROJECTILE2:
|
|
|
|
// Like Thing_Projectile(Gravity) specials, but you can give the
|
|
|
|
// projectile a TID.
|
|
|
|
// Thing_Projectile2 (tid, type, angle, speed, vspeed, gravity, newtid);
|
2006-10-27 03:03:34 +00:00
|
|
|
P_Thing_Projectile (STACK(7), activator, STACK(6), NULL, ((angle_t)(STACK(5)<<24)),
|
2006-06-03 12:30:11 +00:00
|
|
|
STACK(4)<<(FRACBITS-3), STACK(3)<<(FRACBITS-3), 0, NULL, STACK(2), STACK(1), false);
|
|
|
|
sp -= 7;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SPAWNPROJECTILE:
|
|
|
|
// Same, but takes an actor name instead of a spawn ID.
|
2006-10-27 03:03:34 +00:00
|
|
|
P_Thing_Projectile (STACK(7), activator, 0, FBehavior::StaticLookupString (STACK(6)), ((angle_t)(STACK(5)<<24)),
|
2006-02-24 04:48:15 +00:00
|
|
|
STACK(4)<<(FRACBITS-3), STACK(3)<<(FRACBITS-3), 0, NULL, STACK(2), STACK(1), false);
|
|
|
|
sp -= 7;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_STRLEN:
|
|
|
|
STACK(1) = SDWORD(strlen(FBehavior::StaticLookupString (STACK(1))));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETCVAR:
|
|
|
|
{
|
|
|
|
FBaseCVar *cvar = FindCVar (FBehavior::StaticLookupString (STACK(1)), NULL);
|
|
|
|
if (cvar == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
UCVarValue val = cvar->GetGenericRep (CVAR_Int);
|
|
|
|
STACK(1) = val.Int;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETHUDSIZE:
|
|
|
|
hudwidth = abs (STACK(3));
|
|
|
|
hudheight = abs (STACK(2));
|
|
|
|
if (STACK(1) != 0)
|
|
|
|
{ // Negative height means to cover the status bar
|
|
|
|
hudheight = -hudheight;
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_GETLEVELINFO:
|
|
|
|
switch (STACK(1))
|
|
|
|
{
|
|
|
|
case LEVELINFO_PAR_TIME: STACK(1) = level.partime; break;
|
|
|
|
case LEVELINFO_SUCK_TIME: STACK(1) = level.sucktime; break;
|
|
|
|
case LEVELINFO_CLUSTERNUM: STACK(1) = level.cluster; break;
|
|
|
|
case LEVELINFO_LEVELNUM: STACK(1) = level.levelnum; break;
|
|
|
|
case LEVELINFO_TOTAL_SECRETS: STACK(1) = level.total_secrets; break;
|
|
|
|
case LEVELINFO_FOUND_SECRETS: STACK(1) = level.found_secrets; break;
|
|
|
|
case LEVELINFO_TOTAL_ITEMS: STACK(1) = level.total_items; break;
|
|
|
|
case LEVELINFO_FOUND_ITEMS: STACK(1) = level.found_items; break;
|
|
|
|
case LEVELINFO_TOTAL_MONSTERS: STACK(1) = level.total_monsters; break;
|
|
|
|
case LEVELINFO_KILLED_MONSTERS: STACK(1) = level.killed_monsters; break;
|
|
|
|
default: STACK(1) = 0; break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_CHANGESKY:
|
|
|
|
{
|
|
|
|
const char *sky1name, *sky2name;
|
|
|
|
|
|
|
|
sky1name = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
sky2name = FBehavior::StaticLookupString (STACK(1));
|
|
|
|
if (sky1name[0] != 0)
|
|
|
|
{
|
|
|
|
strncpy (level.skypic1, sky1name, 8);
|
2008-05-23 14:04:16 +00:00
|
|
|
sky1texture = TexMan.GetTexture (sky1name, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (sky2name[0] != 0)
|
|
|
|
{
|
|
|
|
strncpy (level.skypic2, sky2name, 8);
|
2008-05-23 14:04:16 +00:00
|
|
|
sky2texture = TexMan.GetTexture (sky2name, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
R_InitSkyMap ();
|
2008-06-11 21:03:32 +00:00
|
|
|
sp -= 2;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETCAMERATOTEXTURE:
|
|
|
|
{
|
|
|
|
const char *picname = FBehavior::StaticLookupString (STACK(2));
|
|
|
|
AActor *camera;
|
|
|
|
|
|
|
|
if (STACK(3) == 0)
|
|
|
|
{
|
|
|
|
camera = activator;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator it (STACK(3));
|
|
|
|
camera = it.Next ();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (camera != NULL)
|
|
|
|
{
|
|
|
|
int picnum = TexMan.CheckForTexture (picname, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable);
|
|
|
|
if (picnum < 0)
|
|
|
|
{
|
|
|
|
Printf ("SetCameraToTexture: %s is not a texture\n", picname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FCanvasTextureInfo::Add (camera, picnum, STACK(1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 3;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_SETACTORANGLE: // [GRB]
|
2006-10-27 03:03:34 +00:00
|
|
|
if (STACK(2) == 0)
|
|
|
|
{
|
2008-06-03 14:38:42 +00:00
|
|
|
if (activator != NULL)
|
|
|
|
activator->angle = STACK(1) << 16;
|
2006-10-27 03:03:34 +00:00
|
|
|
}
|
|
|
|
else
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
FActorIterator iterator (STACK(2));
|
|
|
|
AActor *actor;
|
|
|
|
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
actor->angle = STACK(1) << 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
2006-07-13 10:17:56 +00:00
|
|
|
|
2006-10-22 10:32:41 +00:00
|
|
|
case PCD_SETACTORPITCH:
|
2006-10-27 03:03:34 +00:00
|
|
|
if (STACK(2) == 0)
|
|
|
|
{
|
2008-06-03 14:38:42 +00:00
|
|
|
if (activator != NULL)
|
|
|
|
activator->pitch = STACK(1) << 16;
|
2006-10-27 03:03:34 +00:00
|
|
|
}
|
|
|
|
else
|
2006-10-22 10:32:41 +00:00
|
|
|
{
|
|
|
|
FActorIterator iterator (STACK(2));
|
|
|
|
AActor *actor;
|
|
|
|
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
actor->pitch = STACK(1) << 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
|
|
|
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
case PCD_SETACTORSTATE:
|
|
|
|
{
|
|
|
|
const char *statename = FBehavior::StaticLookupString (STACK(2));
|
2007-04-22 09:06:29 +00:00
|
|
|
TArray<FName> statelist;
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
FState *state;
|
|
|
|
|
2007-04-22 09:06:29 +00:00
|
|
|
MakeStateNameList(statename, &statelist);
|
2008-05-18 15:48:03 +00:00
|
|
|
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
if (STACK(3) == 0)
|
|
|
|
{
|
2008-06-03 14:38:42 +00:00
|
|
|
if (activator != NULL)
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
{
|
2008-06-03 14:38:42 +00:00
|
|
|
state = activator->GetClass()->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1));
|
|
|
|
if (state != NULL)
|
|
|
|
{
|
|
|
|
activator->SetState (state);
|
|
|
|
STACK(3) = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(3) = 0;
|
|
|
|
}
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator iterator (STACK(3));
|
|
|
|
AActor *actor;
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
state = actor->GetClass()->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1));
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
if (state != NULL)
|
|
|
|
{
|
|
|
|
actor->SetState (state);
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
STACK(3) = count;
|
|
|
|
}
|
|
|
|
sp -= 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-07-13 10:17:56 +00:00
|
|
|
case PCD_PLAYERCLASS: // [GRB]
|
|
|
|
if (STACK(1) < 0 || STACK(1) >= MAXPLAYERS || !playeringame[STACK(1)])
|
|
|
|
{
|
|
|
|
STACK(1) = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
STACK(1) = players[STACK(1)].CurrentPlayerClass;
|
|
|
|
}
|
|
|
|
break;
|
2006-07-16 20:13:24 +00:00
|
|
|
|
2006-07-30 22:56:20 +00:00
|
|
|
case PCD_GETPLAYERINFO: // [GRB]
|
|
|
|
if (STACK(2) < 0 || STACK(2) >= MAXPLAYERS || !playeringame[STACK(2)])
|
|
|
|
{
|
|
|
|
STACK(2) = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
userinfo_t *userinfo = &players[STACK(2)].userinfo;
|
|
|
|
switch (STACK(1))
|
|
|
|
{
|
2007-02-24 12:09:36 +00:00
|
|
|
case PLAYERINFO_TEAM: STACK(2) = userinfo->team; break;
|
|
|
|
case PLAYERINFO_AIMDIST: STACK(2) = userinfo->aimdist; break;
|
|
|
|
case PLAYERINFO_COLOR: STACK(2) = userinfo->color; break;
|
|
|
|
case PLAYERINFO_GENDER: STACK(2) = userinfo->gender; break;
|
|
|
|
case PLAYERINFO_NEVERSWITCH: STACK(2) = userinfo->neverswitch; break;
|
|
|
|
case PLAYERINFO_MOVEBOB: STACK(2) = userinfo->MoveBob; break;
|
|
|
|
case PLAYERINFO_STILLBOB: STACK(2) = userinfo->StillBob; break;
|
|
|
|
case PLAYERINFO_PLAYERCLASS: STACK(2) = userinfo->PlayerClass; break;
|
|
|
|
default: STACK(2) = 0; break;
|
2006-07-30 22:56:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
sp -= 1;
|
2006-09-30 08:35:09 +00:00
|
|
|
break;
|
2006-08-10 15:28:12 +00:00
|
|
|
|
|
|
|
case PCD_CHANGELEVEL:
|
|
|
|
{
|
|
|
|
int flags = STACK(2);
|
2008-05-18 15:48:03 +00:00
|
|
|
G_ChangeLevel(FBehavior::StaticLookupString(STACK(4)), STACK(3),
|
2006-08-10 15:28:12 +00:00
|
|
|
!!(flags & CHANGELEVEL_KEEPFACING), STACK(1),
|
|
|
|
!!(flags & CHANGELEVEL_NOINTERMISSION),
|
|
|
|
!!(flags & CHANGELEVEL_RESETINVENTORY),
|
|
|
|
!!(flags & CHANGELEVEL_NOMONSTERS));
|
|
|
|
sp -= 4;
|
|
|
|
}
|
2006-07-30 22:56:20 +00:00
|
|
|
break;
|
|
|
|
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
case PCD_SECTORDAMAGE:
|
|
|
|
{
|
2006-09-01 01:08:27 +00:00
|
|
|
int tag = STACK(5);
|
|
|
|
int amount = STACK(4);
|
|
|
|
FName type = FBehavior::StaticLookupString(STACK(3));
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
FName protection = FName (FBehavior::StaticLookupString(STACK(2)), true);
|
|
|
|
const PClass *protectClass = PClass::FindClass (protection);
|
2006-09-01 01:08:27 +00:00
|
|
|
int flags = STACK(1);
|
|
|
|
sp -= 5;
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
|
|
|
|
int secnum = -1;
|
2008-05-18 15:48:03 +00:00
|
|
|
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
|
|
|
|
{
|
|
|
|
AActor *actor, *next;
|
|
|
|
sector_t *sec = §ors[secnum];
|
|
|
|
|
|
|
|
for (actor = sec->thinglist; actor != NULL; actor = next)
|
|
|
|
{
|
|
|
|
next = actor->snext;
|
|
|
|
|
|
|
|
if (!(actor->flags & MF_SHOOTABLE))
|
|
|
|
continue;
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
if (!(flags & DAMAGE_NONPLAYERS) && actor->player == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!(flags & DAMAGE_PLAYERS) && actor->player != NULL)
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
continue;
|
|
|
|
|
2006-09-01 01:08:27 +00:00
|
|
|
if (!(flags & DAMAGE_IN_AIR) && actor->z != sec->floorplane.ZatPoint (actor->x, actor->y) && !actor->waterlevel)
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (protectClass != NULL)
|
|
|
|
{
|
2006-09-01 01:08:27 +00:00
|
|
|
if (!(flags & DAMAGE_SUBCLASSES_PROTECT))
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
{
|
|
|
|
if (actor->FindInventory (protectClass))
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
AInventory *item;
|
|
|
|
|
|
|
|
for (item = actor->Inventory; item != NULL; item = item->Inventory)
|
|
|
|
{
|
|
|
|
if (item->IsKindOf (protectClass))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (item != NULL)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-31 14:53:21 +00:00
|
|
|
P_DamageMobj (actor, NULL, NULL, amount, type);
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
- Moved the implementation for the Thing_Damage special into another function
so that I can create the ACS function Thing_Damage2. It's exactly the same as
Thing_Damage, except the damage type is specified by name. When I did this,
I noticed that it didn't do anything useful for a TID of 0, so I made it
affect the activator in that case.
- Added a new SetActorState ACS function:
int SetActorState (int tid, str statename, optional bool exact);
If tid is 0, it affects the script activator, otherwise it affects all the
matching actors. Statename is the name of the state you want to put the
actor in. The final parameter, exact, specifies whether or not partial
state name matches are accepted. If you don't specify it or set it to
false, if you try to do something like:
SetActorState (0, "Foo.Bar");
And the actor has a Foo state but no Foo.Bar state, it will enter the Foo
state. If you set exact to true:
SetActorState (0, "Foo.Bar", true);
Then the actor must have a Foo.Bar state, or it will not change state at
all, even if it has a Foo state.
The return value for this function is the number of actors that successfully
changed state. Note that you should refrain from using this function to
enter special states such as Death, or unpredictable results could occur.
SVN r505 (trunk)
2007-03-23 22:26:14 +00:00
|
|
|
|
|
|
|
case PCD_THINGDAMAGE2:
|
|
|
|
STACK(3) = P_Thing_Damage (STACK(3), activator, STACK(2), FName(FBehavior::StaticLookupString(STACK(1))));
|
|
|
|
sp -= 2;
|
|
|
|
break;
|
2008-03-01 16:59:17 +00:00
|
|
|
|
|
|
|
case PCD_CHECKACTORCEILINGTEXTURE:
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID(STACK(2), activator);
|
|
|
|
if (actor != NULL)
|
|
|
|
{
|
|
|
|
FTexture *tex = TexMan.FindTexture(FBehavior::StaticLookupString(STACK(1)));
|
|
|
|
STACK(2) = (tex == TexMan[actor->Sector->ceilingpic]);
|
|
|
|
}
|
|
|
|
else STACK(2)=0;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case PCD_CHECKACTORFLOORTEXTURE:
|
|
|
|
{
|
|
|
|
AActor *actor = SingleActorFromTID(STACK(2), activator);
|
|
|
|
if (actor != NULL)
|
|
|
|
{
|
|
|
|
FTexture *tex = TexMan.FindTexture(FBehavior::StaticLookupString(STACK(1)));
|
|
|
|
STACK(2) = (tex == TexMan[actor->Sector->floorpic]);
|
|
|
|
}
|
|
|
|
else STACK(2)=0;
|
|
|
|
sp--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case PCD_GETACTORLIGHTLEVEL:
|
2008-03-19 09:53:23 +00:00
|
|
|
{
|
2008-03-01 16:59:17 +00:00
|
|
|
AActor *actor = SingleActorFromTID(STACK(1), activator);
|
|
|
|
if (actor != NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = actor->Sector->lightlevel;
|
|
|
|
}
|
|
|
|
else STACK(1)=0;
|
|
|
|
break;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-03-19 09:53:23 +00:00
|
|
|
|
|
|
|
case PCD_SETMUGSHOTSTATE:
|
2008-05-18 15:48:03 +00:00
|
|
|
StatusBar->SetMugShotState(FBehavior::StaticLookupString(STACK(1)));
|
2008-03-19 09:53:23 +00:00
|
|
|
break;
|
2008-04-15 10:04:41 +00:00
|
|
|
|
|
|
|
case PCD_CHECKPLAYERCAMERA:
|
|
|
|
{
|
2008-04-15 22:17:30 +00:00
|
|
|
int playernum = STACK(1);
|
2008-05-18 15:48:03 +00:00
|
|
|
|
2008-04-15 22:17:30 +00:00
|
|
|
if (playernum < 0 || playernum >= MAXPLAYERS || !playeringame[playernum] || players[playernum].camera == NULL)
|
|
|
|
{
|
|
|
|
STACK(1) = -1;
|
2008-04-15 10:04:41 +00:00
|
|
|
}
|
2008-05-18 15:48:03 +00:00
|
|
|
else
|
2008-04-15 22:17:30 +00:00
|
|
|
{
|
|
|
|
STACK(1) = players[playernum].camera->tid;
|
|
|
|
}
|
2008-05-18 15:48:03 +00:00
|
|
|
}
|
2008-04-15 22:17:30 +00:00
|
|
|
break;
|
2008-05-22 19:35:38 +00:00
|
|
|
|
|
|
|
case PCD_MORPHACTOR:
|
|
|
|
{
|
|
|
|
int tag = STACK(7);
|
|
|
|
FName playerclass_name = FBehavior::StaticLookupString(STACK(6));
|
|
|
|
const PClass *playerclass = PClass::FindClass (playerclass_name);
|
|
|
|
FName monsterclass_name = FBehavior::StaticLookupString(STACK(5));
|
|
|
|
const PClass *monsterclass = PClass::FindClass (monsterclass_name);
|
|
|
|
int duration = STACK(4);
|
|
|
|
int style = STACK(3);
|
|
|
|
FName morphflash_name = FBehavior::StaticLookupString(STACK(2));
|
|
|
|
const PClass *morphflash = PClass::FindClass (morphflash_name);
|
|
|
|
FName unmorphflash_name = FBehavior::StaticLookupString(STACK(1));
|
|
|
|
const PClass *unmorphflash = PClass::FindClass (unmorphflash_name);
|
|
|
|
int changes = 0;
|
|
|
|
|
|
|
|
if (tag == 0)
|
|
|
|
{
|
|
|
|
if (activator->player)
|
|
|
|
{
|
|
|
|
if (P_MorphPlayer(activator->player, activator->player, playerclass, duration, style, morphflash, unmorphflash))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (P_MorphMonster(activator, monsterclass, duration, style, morphflash, unmorphflash))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator iterator (tag);
|
|
|
|
AActor *actor;
|
|
|
|
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
if (actor->player)
|
|
|
|
{
|
|
|
|
if (P_MorphPlayer(activator->player, actor->player, playerclass, duration, style, morphflash, unmorphflash))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (P_MorphMonster(actor, monsterclass, duration, style, morphflash, unmorphflash))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
STACK(7) = changes;
|
|
|
|
sp -= 6;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCD_UNMORPHACTOR:
|
|
|
|
{
|
|
|
|
int tag = STACK(2);
|
|
|
|
bool force = !!STACK(1);
|
|
|
|
int changes = 0;
|
|
|
|
|
|
|
|
if (tag == 0)
|
|
|
|
{
|
|
|
|
if (activator->player)
|
|
|
|
{
|
|
|
|
if (P_UndoPlayerMorph(activator->player, activator->player, force))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (activator->GetClass()->IsDescendantOf(RUNTIME_CLASS(AMorphedMonster)))
|
|
|
|
{
|
|
|
|
AMorphedMonster *morphed_actor = barrier_cast<AMorphedMonster *>(activator);
|
|
|
|
if (P_UndoMonsterMorph(morphed_actor, force))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FActorIterator iterator (tag);
|
|
|
|
AActor *actor;
|
|
|
|
|
|
|
|
while ( (actor = iterator.Next ()) )
|
|
|
|
{
|
|
|
|
if (actor->player)
|
|
|
|
{
|
|
|
|
if (P_UndoPlayerMorph(activator->player, actor->player, force))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (actor->GetClass()->IsDescendantOf(RUNTIME_CLASS(AMorphedMonster)))
|
|
|
|
{
|
|
|
|
AMorphedMonster *morphed_actor = static_cast<AMorphedMonster *>(actor);
|
|
|
|
if (P_UndoMonsterMorph(morphed_actor, force))
|
|
|
|
{
|
|
|
|
changes++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
STACK(2) = changes;
|
|
|
|
sp -= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (state == SCRIPT_DivideBy0)
|
|
|
|
{
|
|
|
|
Printf ("Divide by zero in script %d\n", script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
}
|
|
|
|
else if (state == SCRIPT_ModulusBy0)
|
|
|
|
{
|
|
|
|
Printf ("Modulus by zero in script %d\n", script);
|
|
|
|
state = SCRIPT_PleaseRemove;
|
|
|
|
}
|
|
|
|
if (state == SCRIPT_PleaseRemove)
|
|
|
|
{
|
|
|
|
Unlink ();
|
|
|
|
if (controller->RunningScripts[script] == this)
|
|
|
|
controller->RunningScripts[script] = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
this->pc = pc;
|
|
|
|
assert (sp == 0);
|
|
|
|
}
|
|
|
|
if (screen != NULL)
|
|
|
|
{
|
|
|
|
screen->SetFont (SmallFont);
|
|
|
|
}
|
|
|
|
return resultValue;
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef PushtoStack
|
|
|
|
|
|
|
|
static DLevelScript *P_GetScriptGoing (AActor *who, line_t *where, int num, const ScriptPtr *code, FBehavior *module,
|
2008-03-12 02:56:11 +00:00
|
|
|
bool backSide, int arg0, int arg1, int arg2, int always)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller && !always && controller->RunningScripts[num])
|
|
|
|
{
|
|
|
|
if (controller->RunningScripts[num]->GetState () == DLevelScript::SCRIPT_Suspended)
|
|
|
|
{
|
|
|
|
controller->RunningScripts[num]->SetState (DLevelScript::SCRIPT_Running);
|
|
|
|
return controller->RunningScripts[num];
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
return new DLevelScript (who, where, num, code, module, backSide, arg0, arg1, arg2, always);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DLevelScript::DLevelScript (AActor *who, line_t *where, int num, const ScriptPtr *code, FBehavior *module,
|
2008-03-12 02:56:11 +00:00
|
|
|
bool backside, int arg0, int arg1, int arg2, int always)
|
2006-02-24 04:48:15 +00:00
|
|
|
: activeBehavior (module)
|
|
|
|
{
|
|
|
|
if (DACSThinker::ActiveThinker == NULL)
|
|
|
|
new DACSThinker;
|
|
|
|
|
|
|
|
script = num;
|
|
|
|
numlocalvars = code->VarCount;
|
|
|
|
localvars = new SDWORD[code->VarCount];
|
|
|
|
localvars[0] = arg0;
|
|
|
|
localvars[1] = arg1;
|
|
|
|
localvars[2] = arg2;
|
|
|
|
memset (localvars+code->ArgCount, 0, (code->VarCount-code->ArgCount)*sizeof(SDWORD));
|
|
|
|
pc = module->GetScriptAddress (code);
|
|
|
|
activator = who;
|
|
|
|
activationline = where;
|
|
|
|
backSide = backside;
|
|
|
|
activefont = SmallFont;
|
|
|
|
hudwidth = hudheight = 0;
|
2008-03-12 02:56:11 +00:00
|
|
|
state = SCRIPT_Running;
|
|
|
|
// Hexen waited one second before executing any open scripts. I didn't realize
|
|
|
|
// this when I wrote my ACS implementation. Now that I know, it's still best to
|
|
|
|
// run them right away because there are several map properties that can't be
|
|
|
|
// set in an editor. If an open script sets them, it looks dumb if a second
|
|
|
|
// goes by while they're in their default state.
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (!always)
|
|
|
|
DACSThinker::ActiveThinker->RunningScripts[num] = this;
|
|
|
|
|
|
|
|
Link ();
|
|
|
|
|
|
|
|
DPrintf ("Script %d started.\n", num);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SetScriptState (int script, DLevelScript::EScriptState state)
|
|
|
|
{
|
|
|
|
DACSThinker *controller = DACSThinker::ActiveThinker;
|
|
|
|
|
|
|
|
if (controller != NULL && controller->RunningScripts[script])
|
|
|
|
controller->RunningScripts[script]->SetState (state);
|
|
|
|
}
|
|
|
|
|
|
|
|
void P_DoDeferedScripts ()
|
|
|
|
{
|
|
|
|
acsdefered_t *def;
|
|
|
|
const ScriptPtr *scriptdata;
|
|
|
|
FBehavior *module;
|
|
|
|
|
|
|
|
// Handle defered scripts in this step, too
|
|
|
|
def = level.info->defered;
|
|
|
|
while (def)
|
|
|
|
{
|
|
|
|
acsdefered_t *next = def->next;
|
|
|
|
switch (def->type)
|
|
|
|
{
|
|
|
|
case acsdefered_t::defexecute:
|
|
|
|
case acsdefered_t::defexealways:
|
|
|
|
scriptdata = FBehavior::StaticFindScript (def->script, module);
|
|
|
|
if (scriptdata)
|
|
|
|
{
|
|
|
|
P_GetScriptGoing ((unsigned)def->playernum < MAXPLAYERS &&
|
|
|
|
playeringame[def->playernum] ? players[def->playernum].mo : NULL,
|
|
|
|
NULL, def->script,
|
|
|
|
scriptdata, module,
|
|
|
|
0, def->arg0, def->arg1, def->arg2,
|
2008-03-12 02:56:11 +00:00
|
|
|
def->type == acsdefered_t::defexealways);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Printf ("P_DoDeferredScripts: Unknown script %d\n", def->script);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case acsdefered_t::defsuspend:
|
|
|
|
SetScriptState (def->script, DLevelScript::SCRIPT_Suspended);
|
|
|
|
DPrintf ("Defered suspend of script %d\n", def->script);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case acsdefered_t::defterminate:
|
|
|
|
SetScriptState (def->script, DLevelScript::SCRIPT_PleaseRemove);
|
|
|
|
DPrintf ("Defered terminate of script %d\n", def->script);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
delete def;
|
|
|
|
def = next;
|
|
|
|
}
|
|
|
|
level.info->defered = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void addDefered (level_info_t *i, acsdefered_t::EType type, int script, int arg0, int arg1, int arg2, AActor *who)
|
|
|
|
{
|
|
|
|
if (i)
|
|
|
|
{
|
|
|
|
acsdefered_t *def = new acsdefered_s;
|
|
|
|
|
|
|
|
def->next = i->defered;
|
|
|
|
def->type = type;
|
|
|
|
def->script = script;
|
|
|
|
def->arg0 = arg0;
|
|
|
|
def->arg1 = arg1;
|
|
|
|
def->arg2 = arg2;
|
|
|
|
if (who != NULL && who->player != NULL)
|
|
|
|
{
|
|
|
|
def->playernum = who->player - players;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
def->playernum = -1;
|
|
|
|
}
|
|
|
|
i->defered = def;
|
|
|
|
DPrintf ("Script %d on map %s defered\n", script, i->mapname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EXTERN_CVAR (Bool, sv_cheats)
|
|
|
|
|
|
|
|
int P_StartScript (AActor *who, line_t *where, int script, char *map, bool backSide,
|
|
|
|
int arg0, int arg1, int arg2, int always, bool wantResultCode, bool net)
|
|
|
|
{
|
|
|
|
if (map == NULL || 0 == strnicmp (level.mapname, map, 8))
|
|
|
|
{
|
|
|
|
FBehavior *module = NULL;
|
|
|
|
const ScriptPtr *scriptdata;
|
|
|
|
|
|
|
|
if ((scriptdata = FBehavior::StaticFindScript (script, module)) != NULL)
|
|
|
|
{
|
|
|
|
if (net && netgame && !sv_cheats)
|
|
|
|
{
|
|
|
|
// If playing multiplayer and cheats are disallowed, check to
|
|
|
|
// make sure only net scripts are run.
|
|
|
|
if (!(scriptdata->Flags & SCRIPTF_Net))
|
|
|
|
{
|
|
|
|
Printf (PRINT_BOLD, "%s tried to puke script %d (%d, %d, %d)\n",
|
|
|
|
who->player->userinfo.netname, script, arg0, arg1, arg2);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DLevelScript *runningScript = P_GetScriptGoing (who, where, script,
|
2008-03-12 02:56:11 +00:00
|
|
|
scriptdata, module, backSide, arg0, arg1, arg2, always);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (runningScript != NULL)
|
|
|
|
{
|
|
|
|
if (wantResultCode)
|
|
|
|
{
|
|
|
|
return runningScript->RunScript ();
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-05-13 21:22:08 +00:00
|
|
|
if (!net || (who && who->player == &players[consoleplayer]))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
Printf ("P_StartScript: Unknown script %d\n", script);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
addDefered (FindLevelInfo (map),
|
|
|
|
always ? acsdefered_t::defexealways : acsdefered_t::defexecute,
|
|
|
|
script, arg0, arg1, arg2, who);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void P_SuspendScript (int script, char *map)
|
|
|
|
{
|
|
|
|
if (strnicmp (level.mapname, map, 8))
|
|
|
|
addDefered (FindLevelInfo (map), acsdefered_t::defsuspend, script, 0, 0, 0, NULL);
|
|
|
|
else
|
|
|
|
SetScriptState (script, DLevelScript::SCRIPT_Suspended);
|
|
|
|
}
|
|
|
|
|
|
|
|
void P_TerminateScript (int script, char *map)
|
|
|
|
{
|
|
|
|
if (strnicmp (level.mapname, map, 8))
|
|
|
|
addDefered (FindLevelInfo (map), acsdefered_t::defterminate, script, 0, 0, 0, NULL);
|
|
|
|
else
|
|
|
|
SetScriptState (script, DLevelScript::SCRIPT_PleaseRemove);
|
|
|
|
}
|
|
|
|
|
|
|
|
FArchive &operator<< (FArchive &arc, acsdefered_s *&defertop)
|
|
|
|
{
|
|
|
|
BYTE more;
|
|
|
|
|
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
acsdefered_s *defer = defertop;
|
|
|
|
more = 1;
|
|
|
|
while (defer)
|
|
|
|
{
|
|
|
|
BYTE type;
|
|
|
|
arc << more;
|
|
|
|
type = (BYTE)defer->type;
|
|
|
|
arc << type << defer->script << defer->playernum
|
|
|
|
<< defer->arg0 << defer->arg1 << defer->arg2;
|
|
|
|
defer = defer->next;
|
|
|
|
}
|
|
|
|
more = 0;
|
|
|
|
arc << more;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
acsdefered_s **defer = &defertop;
|
|
|
|
|
|
|
|
arc << more;
|
|
|
|
while (more)
|
|
|
|
{
|
|
|
|
*defer = new acsdefered_s;
|
|
|
|
arc << more;
|
|
|
|
(*defer)->type = (acsdefered_s::EType)more;
|
|
|
|
arc << (*defer)->script << (*defer)->playernum
|
|
|
|
<< (*defer)->arg0 << (*defer)->arg1 << (*defer)->arg2;
|
|
|
|
defer = &((*defer)->next);
|
|
|
|
arc << more;
|
|
|
|
}
|
|
|
|
*defer = NULL;
|
|
|
|
}
|
|
|
|
return arc;
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD (scriptstat)
|
|
|
|
{
|
|
|
|
if (DACSThinker::ActiveThinker == NULL)
|
|
|
|
{
|
|
|
|
Printf ("No scripts are running.\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DACSThinker::ActiveThinker->DumpScriptStatus ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DACSThinker::DumpScriptStatus ()
|
|
|
|
{
|
|
|
|
static const char *stateNames[] =
|
|
|
|
{
|
|
|
|
"Running",
|
|
|
|
"Suspended",
|
|
|
|
"Delayed",
|
|
|
|
"TagWait",
|
|
|
|
"PolyWait",
|
|
|
|
"ScriptWaitPre",
|
|
|
|
"ScriptWait",
|
|
|
|
"PleaseRemove"
|
|
|
|
};
|
|
|
|
DLevelScript *script = Scripts;
|
|
|
|
|
|
|
|
while (script != NULL)
|
|
|
|
{
|
|
|
|
Printf ("%d: %s\n", script->script, stateNames[script->state]);
|
|
|
|
script = script->next;
|
|
|
|
}
|
|
|
|
}
|