mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
- GCC fixes.
SVN r1139 (trunk)
This commit is contained in:
parent
023b21a142
commit
520a40f0bf
3 changed files with 14 additions and 14 deletions
|
@ -111,7 +111,7 @@ void InitBotStuff()
|
|||
if (done) return;
|
||||
done = true;
|
||||
|
||||
struct BotInit
|
||||
static struct BotInit
|
||||
{
|
||||
const char *type;
|
||||
int movecombatdist;
|
||||
|
@ -158,7 +158,7 @@ void InitBotStuff()
|
|||
{ "StrifeGrenadeLauncher2", 18350080, WIF_BOT_REACTION_SKILL_THING|WIF_BOT_EXPLOSIVE, "PhosphorousGrenade" },
|
||||
};
|
||||
|
||||
for(int i=0;i<countof(botinits);i++)
|
||||
for(unsigned i=0;i<sizeof(botinits)/sizeof(botinits[0]);i++)
|
||||
{
|
||||
const PClass *cls = PClass::FindClass(botinits[i].type);
|
||||
if (cls != NULL && cls->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
|
||||
|
@ -173,8 +173,8 @@ void InitBotStuff()
|
|||
}
|
||||
}
|
||||
|
||||
static char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" };
|
||||
for(int i=0;i<countof(warnbotmissiles);i++)
|
||||
static const char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" };
|
||||
for(unsigned i=0;i<countof(warnbotmissiles);i++)
|
||||
{
|
||||
AActor *a = GetDefaultByName (warnbotmissiles[i]);
|
||||
if (a != NULL)
|
||||
|
|
|
@ -71,6 +71,16 @@ static FRandom pr_heresiarch ("Heresiarch");
|
|||
|
||||
// The Heresiarch him/itself ------------------------------------------------
|
||||
|
||||
class AHeresiarch : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AHeresiarch, AActor)
|
||||
public:
|
||||
const PClass *StopBall;
|
||||
|
||||
void Serialize (FArchive &arc);
|
||||
void Die (AActor *source, AActor *inflictor);
|
||||
};
|
||||
|
||||
FState AHeresiarch::States[] =
|
||||
{
|
||||
#define S_SORC_SPAWN1 0
|
||||
|
|
|
@ -3,16 +3,6 @@
|
|||
|
||||
#include "d_player.h"
|
||||
|
||||
class AHeresiarch : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AHeresiarch, AActor)
|
||||
public:
|
||||
const PClass *StopBall;
|
||||
|
||||
void Serialize (FArchive &arc);
|
||||
void Die (AActor *source, AActor *inflictor);
|
||||
};
|
||||
|
||||
class AHolySpirit : public AActor
|
||||
{
|
||||
DECLARE_CLASS (AHolySpirit, AActor)
|
||||
|
|
Loading…
Reference in a new issue