zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 09:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- GCC fixes.

Browse source 
SVN r1139 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-09 22:10:41 +00:00
parent 023b21a142
commit 520a40f0bf
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/b_bot.cpp
View file

@ -111,7 +111,7 @@ void InitBotStuff()
if (done) return; if (done) return;
done = true; done = true;
struct BotInit static struct BotInit
{ {
const char *type; const char *type;
int movecombatdist; int movecombatdist;
@ -158,7 +158,7 @@ void InitBotStuff()
{ "StrifeGrenadeLauncher2", 18350080, WIF_BOT_REACTION_SKILL_THING|WIF_BOT_EXPLOSIVE, "PhosphorousGrenade" }, { "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); const PClass *cls = PClass::FindClass(botinits[i].type);
if (cls != NULL && cls->IsDescendantOf(RUNTIME_CLASS(AWeapon))) if (cls != NULL && cls->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
@ -173,8 +173,8 @@ void InitBotStuff()
} }
} }
static char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" }; static const char *warnbotmissiles[] = { "PlasmaBall", "Ripper", "HornRodFX1" };
for(int i=0;i<countof(warnbotmissiles);i++) for(unsigned i=0;i<countof(warnbotmissiles);i++)
{ {
AActor *a = GetDefaultByName (warnbotmissiles[i]); AActor *a = GetDefaultByName (warnbotmissiles[i]);
if (a != NULL) if (a != NULL)

10
src/g_hexen/a_heresiarch.cpp
View file

@ -71,6 +71,16 @@ static FRandom pr_heresiarch ("Heresiarch");
// The Heresiarch him/itself ------------------------------------------------ // 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[] = FState AHeresiarch::States[] =
{ {
#define S_SORC_SPAWN1 0 #define S_SORC_SPAWN1 0

10
src/g_hexen/a_hexenglobal.h
View file

@ -3,16 +3,6 @@
#include "d_player.h" #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 class AHolySpirit : public AActor
{ {
DECLARE_CLASS (AHolySpirit, AActor) DECLARE_CLASS (AHolySpirit, AActor)