makefile.gaz

@@ -79,7 +79,8 @@ enemy_src :=		npc \
 					nhcrab \
 					nbblob \
 					npuffa \
-					ngen
+					ngen \
+					nsdart
 
 projectl_src :=		projectl
 

source/enemy/npc.cpp

@@ -146,6 +146,38 @@
 #include "enemy\nhazard.h"
 #endif
 
+#ifndef __ENEMY_NSDART_H__
+#include "enemy\nsdart.h"
+#endif
+
+#ifndef __ENEMY_NPBUG_H__
+#include "enemy\npbug.h"
+#endif
+
+#ifndef __ENEMY_NSSNAKE_H__
+#include "enemy\nssnake.h"
+#endif
+
+#ifndef __ENEMY_NANGLER_H__
+#include "enemy\nangler.h"
+#endif
+
+#ifndef __ENEMY_NMINE_H__
+#include "enemy\nmine.h"
+#endif
+
+#ifndef __ENEMY_NSTRFISH_H__
+#include "enemy\nstrfish.h"
+#endif
+
+#ifndef __ENEMY_NGHOST_H__
+#include "enemy\nghost.h"
+#endif
+
+#ifndef __ENEMY_NOILBLOB_H__
+#include "enemy\noilblob.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Friend NPCs
@@ -296,15 +328,10 @@ CNpcEnemy	*CNpcEnemy::Create(sThingActor *ThisActor)
 
 	NPC_UNIT_TYPE enemyType = CNpcEnemy::getTypeFromMapEdit( ThisActor->Type );
 
-//!!!!!! Sort you code out charles - Unhappy Dave
-	if (enemyType==14)
-	{
-		enemyType=CNpcEnemy::NPC_SMALL_JELLYFISH_1;
-	}
-
 	switch( enemyType )
 	{
 		case CNpcEnemy::NPC_SMALL_JELLYFISH_1:
+		case CNpcEnemy::NPC_SMALL_JELLYFISH_2:
 		{
 			printf("JFish\n");
 			enemy = new ("small jellyfish") CNpcSmallJellyfishEnemy;
@@ -522,6 +549,54 @@ CNpcEnemy	*CNpcEnemy::Create(sThingActor *ThisActor)
 			break;
 		}
 
+		case CNpcEnemy::NPC_SQUID_DART:
+		{
+			enemy = new ("squid dart") CNpcSquidDartEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_PRICKLY_BUG:
+		{
+			enemy = new ("prickly bug") CNpcPricklyBugEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_SEA_SNAKE:
+		{
+			enemy = new ("sea snake") CNpcSeaSnakeEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_ANGLER_FISH:
+		{
+			enemy = new ("angler fish") CNpcAnglerFish;
+			break;
+		}
+
+		case CNpcEnemy::NPC_MINE:
+		{
+			enemy = new ("mine") CNpcMineEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_NINJA_STARFISH:
+		{
+			enemy = new ("ninja starfish") CNpcNinjaStarfishEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_GHOST:
+		{
+			enemy = new ("ghost") CNpcGhostEnemy;
+			break;
+		}
+
+		case CNpcEnemy::NPC_OIL_BLOB:
+		{
+			enemy = new ("oil blob") CNpcOilBlobEnemy;
+			break;
+		}
+
 		default:
 		{
 			printf("UNKNOWN %i\n",enemyType);

source/projectl/projectl.cpp

@@ -482,8 +482,8 @@ void CPlayerProjectile::think(int _frames)
 			}
 			else
 			{
-				Pos.vx += ( _frames * 3 * rcos( m_heading ) ) >> 12;
+				Pos.vx += ( _frames * 2 * rcos( m_heading ) ) >> 12;
-				Pos.vy += ( _frames * 3 * rsin( m_heading ) ) >> 12;
+				Pos.vy += ( _frames * 2 * rsin( m_heading ) ) >> 12;
 			}
 
 			break;
@@ -523,7 +523,6 @@ void CPlayerProjectile::render()
 		return;
 	}
 
-	//m_spriteBank->printFT4(FRM_BARNACLEBOY,x,y,0,0,0);
 	SprFrame = m_spriteBank->printFT4(m_frame,x,y,m_reversed,0,10);
 	setRGB0( SprFrame, 255, 128, 255 );
 }

users/paul/spongebob project/spongebob project.dsp

@@ -117,6 +117,10 @@ SOURCE=..\..\..\source\enemy\nanemone.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nangler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\nbblob.cpp
 # End Source File
 # Begin Source File
@@ -197,6 +201,10 @@ SOURCE=..\..\..\source\enemy\ngeneric.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nghost.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\ngpirate.cpp
 # End Source File
 # Begin Source File
@@ -221,6 +229,10 @@ SOURCE=..\..\..\source\enemy\nhcrab.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nmine.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\nmjfish.cpp
 # End Source File
 # Begin Source File
@@ -237,6 +249,14 @@ SOURCE=..\..\..\source\enemy\nocto.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\noilblob.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\enemy\npbug.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\npc.cpp
 # End Source File
 # Begin Source File
@@ -281,6 +301,14 @@ SOURCE=..\..\..\source\enemy\nscrab.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nsdart.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\enemy\nsdart.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\nshrkman.cpp
 # End Source File
 # Begin Source File
@@ -313,6 +341,10 @@ SOURCE=..\..\..\source\enemy\nsshark.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nssnake.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\nsstomp.cpp
 # End Source File
 # Begin Source File
@@ -321,6 +353,10 @@ SOURCE=..\..\..\source\enemy\nsstomp.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\nstrfish.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\nworm.cpp
 # End Source File
 # Begin Source File