zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-07-02 15:40:28 +00:00
parent 488ecef680
commit b8aee4f01d
6 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Utils/MkActor/MkActor.cpp
View file

@ -652,6 +652,7 @@ vector<sSpriteAnim> Hdrs;
OutFrame.FrameIdx=ThisFrame.FrameIdx; OutFrame.FrameIdx=ThisFrame.FrameIdx;
OutFrame.XOfs=ThisFrame.XOfs; OutFrame.XOfs=ThisFrame.XOfs;
OutFrame.YOfs=ThisFrame.YOfs; OutFrame.YOfs=ThisFrame.YOfs;
fwrite(&OutFrame,1,sizeof(sSpriteFrame),File); fwrite(&OutFrame,1,sizeof(sSpriteFrame),File);
} }
PadFile(File); PadFile(File);

1
data/DataCache.scr
View file

@ -199,6 +199,7 @@ actors/GARY.SBK
actors/SANDY.SBK actors/SANDY.SBK
actors/PATRICK.SBK actors/PATRICK.SBK
actors/MERMAIDMAN.SBK actors/MERMAIDMAN.SBK
actors/PLANKTON.SBK
actors/ANENOME.SBK actors/ANENOME.SBK
actors/BABYOCTOPUS.SBK actors/BABYOCTOPUS.SBK

3
makefile.gaz
View file

@ -97,8 +97,7 @@ friend_src := friend \
fsquid \ fsquid \
fsandy \ fsandy \
fkrusty \ fkrusty \
fpatrick \ fpatrick
fplnkton
platform_src := platform \ platform_src := platform \
platdata \ platdata \

4
makefile.gfx
View file

@ -114,11 +114,11 @@ ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \ ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish \
PuffaFish Manray Skeletalfish SpiderCrab SpikeyAnenome Stomper \ PuffaFish Manray Skeletalfish SpiderCrab SpikeyAnenome Stomper \
SharkSub Motherjellyfish SeaSnake GiantWorm SharkSub Motherjellyfish SeaSnake GiantWorm Plankton
# Boogermonster Nautilus Neptune # Boogermonster Nautilus Neptune
ACTOR_SPRITES := Jellyfish1 Squiddart Plankton Butterfly Shell Eyeball ACTOR_SPRITES := Jellyfish1 Squiddart Butterfly Shell Eyeball
ACTOR_SPR_LIST := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/$(ACTOR)_*.bmp) ACTOR_SPR_LIST := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/$(ACTOR)_*.bmp)
ACTOR_SPR_DEP := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/*) ACTOR_SPR_DEP := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/*)

8
source/friend/fdata.cpp
View file

@ -34,7 +34,7 @@
#ifndef __ANIM_PATRICK_HEADER__ #ifndef __ANIM_PATRICK_HEADER__
#include <ACTOR_PATRICK_Anim.h> #include <ACTOR_PATRICK_Anim.h>
#endif #endif
/*
#ifndef __ANIM_BARNACLEBOY_HEADER__ #ifndef __ANIM_BARNACLEBOY_HEADER__
#include <ACTOR_BARNACLEBOY_Anim.h> #include <ACTOR_BARNACLEBOY_Anim.h>
#endif #endif
@ -42,7 +42,7 @@
#ifndef __ANIM_MERMAIDMAN_HEADER__ #ifndef __ANIM_MERMAIDMAN_HEADER__
#include <ACTOR_MERMAIDMAN_Anim.h> #include <ACTOR_MERMAIDMAN_Anim.h>
#endif #endif
*/
#ifndef __ANIM_GARY_HEADER__ #ifndef __ANIM_GARY_HEADER__
#include <ACTOR_GARY_Anim.h> #include <ACTOR_GARY_Anim.h>
#endif #endif
@ -56,7 +56,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
ANIM_BARNACLEBOY_IDLE, 0,//ANIM_BARNACLEBOY_IDLE,
}, },
{ // NPC_FRIEND_GARY { // NPC_FRIEND_GARY
@ -83,7 +83,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
ANIM_MERMAIDMAN_IDLE, 0,//ANIM_MERMAIDMAN_IDLE,
}, },
{ // NPC_FRIEND_PATRICK { // NPC_FRIEND_PATRICK

17
source/friend/friend.cpp
View file

@ -26,11 +26,11 @@
#ifndef __UTILS_HEADER__ #ifndef __UTILS_HEADER__
#include "utils\utils.h" #include "utils\utils.h"
#endif #endif
/*
#ifndef __FRIEND_FBBOY_H__ #ifndef __FRIEND_FBBOY_H__
#include "friend\fbboy.h" #include "friend\fbboy.h"
#endif #endif
*/
#ifndef __FRIEND_FGARY_H__ #ifndef __FRIEND_FGARY_H__
#include "friend\fgary.h" #include "friend\fgary.h"
#endif #endif
@ -38,11 +38,11 @@
#ifndef __FRIEND_FKRUSTY_H__ #ifndef __FRIEND_FKRUSTY_H__
#include "friend\fkrusty.h" #include "friend\fkrusty.h"
#endif #endif
/*
#ifndef __FRIEND_FMMAN_H__ #ifndef __FRIEND_FMMAN_H__
#include "friend\fmman.h" #include "friend\fmman.h"
#endif #endif
*/
#ifndef __FRIEND_FPATRICK_H__ #ifndef __FRIEND_FPATRICK_H__
#include "friend\fpatrick.h" #include "friend\fpatrick.h"
#endif #endif
@ -96,7 +96,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
{ {
case CNpcFriend::NPC_FRIEND_BARNACLE_BOY: case CNpcFriend::NPC_FRIEND_BARNACLE_BOY:
{ {
friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend; ASSERT(!"Friend removed");
// friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend;
break; break;
} }
@ -114,7 +115,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
case CNpcFriend::NPC_FRIEND_MERMAID_MAN: case CNpcFriend::NPC_FRIEND_MERMAID_MAN:
{ {
friendNpc = new ("mermaid man") CNpcMermaidManFriend; ASSERT(!"Friend removed");
// friendNpc = new ("mermaid man") CNpcMermaidManFriend;
break; break;
} }
@ -138,7 +140,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
case CNpcFriend::NPC_FRIEND_PLANKTON: case CNpcFriend::NPC_FRIEND_PLANKTON:
{ {
friendNpc = new ("plankton") CNpcPlanktonFriend; ASSERT(!"Friend removed");
// friendNpc = new ("plankton") CNpcPlanktonFriend;
break; break;
} }