From 91ae454d7fcb6944cc6c5db8c0101da351a7ea79 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 2 Jul 2001 22:57:52 +0000 Subject: [PATCH] --- data/DataCache.scr | 22 +++ data/Scripts/c1l1_celebrate.scr | 17 ++ data/Scripts/c1l2_celebrate.scr | 17 ++ data/Scripts/c1l3_celebrate.scr | 17 ++ data/Scripts/c1l4_celebrate.scr | 17 ++ data/Scripts/c2l1_celebrate.scr | 17 ++ data/Scripts/c2l2_celebrate.scr | 17 ++ data/Scripts/c2l3_celebrate.scr | 17 ++ data/Scripts/c2l4_celebrate.scr | 17 ++ data/Scripts/c3l1_celebrate.scr | 17 ++ data/Scripts/c3l2_celebrate.scr | 17 ++ data/Scripts/c3l3_celebrate.scr | 17 ++ data/Scripts/c3l4_celebrate.scr | 17 ++ data/Scripts/c4l1_celebrate.scr | 17 ++ data/Scripts/c4l2_celebrate.scr | 17 ++ data/Scripts/c4l3_celebrate.scr | 17 ++ data/Scripts/c4l4_celebrate.scr | 17 ++ data/Scripts/c5l1_celebrate.scr | 17 ++ data/Scripts/c5l2_celebrate.scr | 17 ++ data/Scripts/c5l3_celebrate.scr | 17 ++ data/Scripts/c5l4_celebrate.scr | 17 ++ data/translations/text.dat | 51 ++++++ makefile.gaz | 11 +- makefile.gfx | 7 +- source/game/convo.cpp | 134 +++++++++++--- source/pickups/pquest.cpp | 4 +- source/player/player.cpp | 14 +- source/player/player.h | 3 +- source/player/pmbubble.cpp | 5 + source/player/pmcoral.cpp | 5 + source/player/pmjelly.cpp | 5 + source/player/pmnet.cpp | 5 + source/player/pmodes.cpp | 45 ++++- source/player/pmodes.h | 2 + source/player/psdance.cpp | 50 +++++- source/player/psdance.h | 2 + .../spongebob project/spongebob project.dsp | 170 +++++++++--------- 37 files changed, 753 insertions(+), 122 deletions(-) create mode 100644 data/Scripts/c1l1_celebrate.scr create mode 100644 data/Scripts/c1l2_celebrate.scr create mode 100644 data/Scripts/c1l3_celebrate.scr create mode 100644 data/Scripts/c1l4_celebrate.scr create mode 100644 data/Scripts/c2l1_celebrate.scr create mode 100644 data/Scripts/c2l2_celebrate.scr create mode 100644 data/Scripts/c2l3_celebrate.scr create mode 100644 data/Scripts/c2l4_celebrate.scr create mode 100644 data/Scripts/c3l1_celebrate.scr create mode 100644 data/Scripts/c3l2_celebrate.scr create mode 100644 data/Scripts/c3l3_celebrate.scr create mode 100644 data/Scripts/c3l4_celebrate.scr create mode 100644 data/Scripts/c4l1_celebrate.scr create mode 100644 data/Scripts/c4l2_celebrate.scr create mode 100644 data/Scripts/c4l3_celebrate.scr create mode 100644 data/Scripts/c4l4_celebrate.scr create mode 100644 data/Scripts/c5l1_celebrate.scr create mode 100644 data/Scripts/c5l2_celebrate.scr create mode 100644 data/Scripts/c5l3_celebrate.scr create mode 100644 data/Scripts/c5l4_celebrate.scr diff --git a/data/DataCache.scr b/data/DataCache.scr index 23eebe14a..bbae3fe51 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -50,6 +50,28 @@ scripts/fma_ch6_03.dat scripts/fma_plankton.dat +scripts/c1l1_celebrate.dat +scripts/c1l2_celebrate.dat +scripts/c1l3_celebrate.dat +scripts/c1l4_celebrate.dat +scripts/c2l1_celebrate.dat +scripts/c2l2_celebrate.dat +scripts/c2l3_celebrate.dat +scripts/c2l4_celebrate.dat +scripts/c3l1_celebrate.dat +scripts/c3l2_celebrate.dat +scripts/c3l3_celebrate.dat +scripts/c3l4_celebrate.dat +scripts/c4l1_celebrate.dat +scripts/c4l2_celebrate.dat +scripts/c4l3_celebrate.dat +scripts/c4l4_celebrate.dat +scripts/c5l1_celebrate.dat +scripts/c5l2_celebrate.dat +scripts/c5l3_celebrate.dat +scripts/c5l4_celebrate.dat + + translations/swe.dat translations/dut.dat translations/ita.dat diff --git a/data/Scripts/c1l1_celebrate.scr b/data/Scripts/c1l1_celebrate.scr new file mode 100644 index 000000000..438ece585 --- /dev/null +++ b/data/Scripts/c1l1_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH1__L1__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c1l2_celebrate.scr b/data/Scripts/c1l2_celebrate.scr new file mode 100644 index 000000000..7d5dbb18f --- /dev/null +++ b/data/Scripts/c1l2_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH1__L2__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c1l3_celebrate.scr b/data/Scripts/c1l3_celebrate.scr new file mode 100644 index 000000000..ad83a5d88 --- /dev/null +++ b/data/Scripts/c1l3_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH1__L3__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c1l4_celebrate.scr b/data/Scripts/c1l4_celebrate.scr new file mode 100644 index 000000000..5c5464dbb --- /dev/null +++ b/data/Scripts/c1l4_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH1__L4__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c2l1_celebrate.scr b/data/Scripts/c2l1_celebrate.scr new file mode 100644 index 000000000..fbd8e7ccc --- /dev/null +++ b/data/Scripts/c2l1_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH2__L1__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c2l2_celebrate.scr b/data/Scripts/c2l2_celebrate.scr new file mode 100644 index 000000000..3df072e97 --- /dev/null +++ b/data/Scripts/c2l2_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH2__L2__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c2l3_celebrate.scr b/data/Scripts/c2l3_celebrate.scr new file mode 100644 index 000000000..6a7c12e35 --- /dev/null +++ b/data/Scripts/c2l3_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH2__L3__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c2l4_celebrate.scr b/data/Scripts/c2l4_celebrate.scr new file mode 100644 index 000000000..b72f91eb7 --- /dev/null +++ b/data/Scripts/c2l4_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH2__L4__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c3l1_celebrate.scr b/data/Scripts/c3l1_celebrate.scr new file mode 100644 index 000000000..2beed0c44 --- /dev/null +++ b/data/Scripts/c3l1_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH3__L1__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c3l2_celebrate.scr b/data/Scripts/c3l2_celebrate.scr new file mode 100644 index 000000000..ac6a096e8 --- /dev/null +++ b/data/Scripts/c3l2_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH3__L2__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c3l3_celebrate.scr b/data/Scripts/c3l3_celebrate.scr new file mode 100644 index 000000000..a0309ff14 --- /dev/null +++ b/data/Scripts/c3l3_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH3__L3__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c3l4_celebrate.scr b/data/Scripts/c3l4_celebrate.scr new file mode 100644 index 000000000..99f649ba8 --- /dev/null +++ b/data/Scripts/c3l4_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH3__L4__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c4l1_celebrate.scr b/data/Scripts/c4l1_celebrate.scr new file mode 100644 index 000000000..c8bba477c --- /dev/null +++ b/data/Scripts/c4l1_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH4__L1__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c4l2_celebrate.scr b/data/Scripts/c4l2_celebrate.scr new file mode 100644 index 000000000..48c2aef4e --- /dev/null +++ b/data/Scripts/c4l2_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH4__L2__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c4l3_celebrate.scr b/data/Scripts/c4l3_celebrate.scr new file mode 100644 index 000000000..5805e6194 --- /dev/null +++ b/data/Scripts/c4l3_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH4__L3__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c4l4_celebrate.scr b/data/Scripts/c4l4_celebrate.scr new file mode 100644 index 000000000..386dd0628 --- /dev/null +++ b/data/Scripts/c4l4_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH4__L4__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c5l1_celebrate.scr b/data/Scripts/c5l1_celebrate.scr new file mode 100644 index 000000000..c53642ac8 --- /dev/null +++ b/data/Scripts/c5l1_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH5__L1__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c5l2_celebrate.scr b/data/Scripts/c5l2_celebrate.scr new file mode 100644 index 000000000..933c06a83 --- /dev/null +++ b/data/Scripts/c5l2_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH5__L2__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c5l3_celebrate.scr b/data/Scripts/c5l3_celebrate.scr new file mode 100644 index 000000000..f5dc1213b --- /dev/null +++ b/data/Scripts/c5l3_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH5__L3__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/Scripts/c5l4_celebrate.scr b/data/Scripts/c5l4_celebrate.scr new file mode 100644 index 000000000..eed31c9a1 --- /dev/null +++ b/data/Scripts/c5l4_celebrate.scr @@ -0,0 +1,17 @@ +#include data/scripts/defs/defs.scr + +#include data/scripts/defs/charanim.scr +#include data/scripts/defs/items.scr +#include data/scripts/defs/response.scr +#include data/scripts/defs/trans.scr + + +_setText(CHAR_SPONGEBOB,STR__INGAME__CH5__L4__SBCELEBRATE); +_setResponseOptions(QUESTION_OK); +do +{ + pause; +} +while(_getResponse()==ANSWER_NONE); + +stop; diff --git a/data/translations/text.dat b/data/translations/text.dat index 6fd79c420..a3a2881ee 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -365,6 +365,57 @@ eng=I ain't telling you again lad! Wear your boots and you'll go far! Argh! +; --------------------------------------------------------------- +; End of level celebration text +; --------------------------------------------------------------- +[STR__INGAME__CH1__L1__SBCELEBRATE] +eng=Yippee... Now to find the Jar of Sea-Nut Butter +[STR__INGAME__CH1__L2__SBCELEBRATE] +eng=Yippee... Now to find the Kelp Lettuce...... Off to Fish Hooks Park +[STR__INGAME__CH1__L3__SBCELEBRATE] +eng=Now to find the Bread. But where? I know! Bikini Bottom has loads of bread! +[STR__INGAME__CH1__L4__SBCELEBRATE] +eng= + +[STR__INGAME__CH2__L1__SBCELEBRATE] +eng=Yippee... Now to find the Loofah...... That has to be in Thermal Tunnels +[STR__INGAME__CH2__L2__SBCELEBRATE] +eng=Now to find the Mud Pack.... off to those nasty Acrid Air Pockets, better make sure I'm nice and moist! +[STR__INGAME__CH2__L3__SBCELEBRATE] +eng=Now to find the False Teeth.... only in the lava fields, better pack some ice - it's gonna be a hot one! +[STR__INGAME__CH2__L4__SBCELEBRATE] +eng=Right! Now back to Mermaid Man to receive my new orders!!! + +[STR__INGAME__CH3__L1__SBCELEBRATE] +eng=Now to find the Scallop Bra, the only place is Desert Wasteland. But what if I get stuck in quicksand? Like that's gonna happen. +[STR__INGAME__CH3__L2__SBCELEBRATE] +eng=Now to find the a pair of Shell slippers..... and in to Kelp Jungle! +[STR__INGAME__CH3__L3__SBCELEBRATE] +eng=Uh Oh, those plants are moving! They're not trees....... Hellllllllppppppp! +[STR__INGAME__CH3__L4__SBCELEBRATE] +eng=Right, lets get out of here and back to shady shoals!!. What is that smell!! + +[STR__INGAME__CH4__L1__SBCELEBRATE] +eng=Tartar sauce! It ate my coin. Double Tartar sauce, it's empty!! +[STR__INGAME__CH4__L2__SBCELEBRATE] +eng=This one is empty too?? They really should refill them more often... or at least once.... +[STR__INGAME__CH4__L3__SBCELEBRATE] +eng=This one too? Who could be eating all these Kandy bars...? +[STR__INGAME__CH4__L4__SBCELEBRATE] +eng=I've got a kandy bar for my favorite Super hero! + +[STR__INGAME__CH5__L1__SBCELEBRATE] +eng=Right, now to find an aerial???????? +[STR__INGAME__CH5__L2__SBCELEBRATE] +eng=I need to find an oil can, but the only place is that abandoned oil rig. Hmmmm. That gives me an idea. +[STR__INGAME__CH5__L3__SBCELEBRATE] +eng=Now, I need a monkey wrench!!! +[STR__INGAME__CH5__L4__SBCELEBRATE] +eng=I got it! Well, celebration time is over! Now back to Bikini Bottom to add the finishing touches for my Birthday surprise + + + + ; --------------------------------------------------------------- ; Pause menu ; --------------------------------------------------------------- diff --git a/makefile.gaz b/makefile.gaz index 0f0399d59..70f5b1370 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -273,25 +273,26 @@ player_src := demoplay \ pmodes \ pmbloon \ pmbubble \ + pmcart \ pmchop \ pmcoral \ pmdead \ pmfly \ pmjelly \ pmnet \ - pmcart \ psbutt \ - pslook \ + pscart \ + psdance \ psduck \ psfall \ + psfloat \ pshitgnd \ psidle \ psjmpbck \ psjump \ + pslook \ psrun \ - psspring \ - pscart \ - psfloat + psspring save_src := save diff --git a/makefile.gfx b/makefile.gfx index 08ec35430..811ffd07d 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -603,7 +603,12 @@ SCRIPTS_LIST := ch1l1_01 ch1l1_02 ch1l2_01 ch1l2_02 ch1l2_03 ch1l4_01 ch1l4_02 fma_ch4_00 fma_ch4_01 fma_ch4_02 \ fma_ch5_00 fma_ch5_01 fma_ch5_02 \ fma_ch6_00 fma_ch6_01 fma_ch6_02 fma_ch6_03 \ - fma_plankton + fma_plankton \ + c1l1_celebrate c1l2_celebrate c1l3_celebrate c1l4_celebrate \ + c2l1_celebrate c2l2_celebrate c2l3_celebrate c2l4_celebrate \ + c3l1_celebrate c3l2_celebrate c3l3_celebrate c3l4_celebrate \ + c4l1_celebrate c4l2_celebrate c4l3_celebrate c4l4_celebrate \ + c5l1_celebrate c5l2_celebrate c5l3_celebrate c5l4_celebrate SCRIPTS_IN_DIR := $(GAME_DATA_DIR)/scripts diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 9c0e2b88f..b2e3917d6 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -110,12 +110,12 @@ const sSpeechTable SpeechTable[]= {SPEECH_010,STR__INGAME__CH1__L1__SPONGEY1}, {SPEECH_011,STR__INGAME__CH1__L1__SQUIDWARD1}, {SPEECH_012,STR__INGAME__CH1__L1__SQUIDWARD2}, -{SPEECH_013,-1}, +{SPEECH_013,STR__INGAME__CH1__L1__SBCELEBRATE}, {SPEECH_014,STR__INGAME__CH1__L2__SANDY1}, {SPEECH_015,STR__INGAME__CH1__L2__SANDY2}, {SPEECH_016,STR__INGAME__CH1__L2__SANDY3}, -{SPEECH_017,-1}, -{SPEECH_018,-1}, +{SPEECH_017,STR__INGAME__CH1__L2__SBCELEBRATE}, +{SPEECH_018,STR__INGAME__CH1__L3__SBCELEBRATE}, {SPEECH_019,STR__INGAME__CH1__L4__KRUSTY1}, {SPEECH_020,STR__INGAME__CH1__L4__KRUSTY2}, {SPEECH_021,STR__INGAME__FMA_C2_MM_ZZZ}, @@ -127,42 +127,42 @@ const sSpeechTable SpeechTable[]= {SPEECH_027,STR__INGAME__CH2__L1__KRUSTY2}, {SPEECH_028,-1}, {SPEECH_029,-1}, // Another Meow -{SPEECH_030,-1}, +{SPEECH_030,STR__INGAME__CH2__L1__SBCELEBRATE}, {SPEECH_031,STR__INGAME__CH2__L2__PATRICK1}, {SPEECH_032,STR__INGAME__CH2__L2__PATRICK2}, -{SPEECH_033,-1}, -{SPEECH_034,-1}, -{SPEECH_035,-1}, +{SPEECH_033,STR__INGAME__CH2__L2__SBCELEBRATE}, +{SPEECH_034,STR__INGAME__CH2__L3__SBCELEBRATE}, +{SPEECH_035,STR__INGAME__CH2__L4__SBCELEBRATE}, {SPEECH_036,STR__INGAME__FMA_C3_SB0}, {SPEECH_037,-1}, {SPEECH_038,STR__INGAME__FMA_C3_SB1}, {SPEECH_039,STR__INGAME__FMA_C3_BB1}, {SPEECH_040,STR__INGAME__FMA_C3_SB2}, {SPEECH_041,STR__INGAME__FMA_PLANKTON}, -{SPEECH_042,-1}, -{SPEECH_043,-1}, +{SPEECH_042,STR__INGAME__CH3__L1__SBCELEBRATE}, +{SPEECH_043,STR__INGAME__CH3__L2__SBCELEBRATE}, {SPEECH_044,STR__INGAME__CH3__L3__PATRICK1}, {SPEECH_045,STR__INGAME__CH3__L3__PATRICK2}, -{SPEECH_046,-1}, -{SPEECH_047,-1}, +{SPEECH_046,STR__INGAME__CH3__L3__SBCELEBRATE}, +{SPEECH_047,STR__INGAME__CH3__L4__SBCELEBRATE}, {SPEECH_048,STR__INGAME__FMA_C4_SB0}, {SPEECH_049,STR__INGAME__FMA_C4_MM_GASP}, {SPEECH_050,STR__INGAME__FMA_C4_BB_GASP}, {SPEECH_051,STR__INGAME__FMA_C4_SB1}, {SPEECH_052,STR__INGAME__FMA_C4_BB0}, -{SPEECH_053,-1}, -{SPEECH_054,-1}, +{SPEECH_053,STR__INGAME__CH4__L1__SBCELEBRATE}, +{SPEECH_054,STR__INGAME__CH4__L2__SBCELEBRATE}, {SPEECH_055,STR__INGAME__CH4__L3__KRUSTY1}, {SPEECH_056,STR__INGAME__CH4__L3__KRUSTY2}, -{SPEECH_057,-1}, -{SPEECH_058,-1}, +{SPEECH_057,STR__INGAME__CH4__L3__SBCELEBRATE}, +{SPEECH_058,STR__INGAME__CH4__L4__SBCELEBRATE}, {SPEECH_059,STR__INGAME__FMA_C5_SB0}, {SPEECH_060,STR__INGAME__FMA_C5_BB0}, {SPEECH_061,STR__INGAME__FMA_C5_SB1}, -{SPEECH_062,}, -{SPEECH_063,}, -{SPEECH_064,}, -{SPEECH_065,}, +{SPEECH_062,STR__INGAME__CH5__L1__SBCELEBRATE}, +{SPEECH_063,STR__INGAME__CH5__L2__SBCELEBRATE}, +{SPEECH_064,STR__INGAME__CH5__L3__SBCELEBRATE}, +{SPEECH_065,STR__INGAME__CH5__L4__SBCELEBRATE}, {SPEECH_066,STR__INGAME__FMA_C6_SB0}, {SPEECH_067,STR__INGAME__FMA_C6_SB1}, {SPEECH_068,STR__INGAME__FMA_C6_BB0}, @@ -745,6 +745,7 @@ void CConversation::registerConversationLevelScripts(int level) { CConversation::registerConversationScript(SCRIPTS_CH1L1_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH1L1_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C1L1_CELEBRATE_DAT); break; } @@ -753,6 +754,13 @@ void CConversation::registerConversationLevelScripts(int level) CConversation::registerConversationScript(SCRIPTS_CH1L2_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH1L2_02_DAT); CConversation::registerConversationScript(SCRIPTS_CH1L2_03_DAT); + CConversation::registerConversationScript(SCRIPTS_C1L2_CELEBRATE_DAT); + break; + } + + case 3: + { + CConversation::registerConversationScript(SCRIPTS_C1L3_CELEBRATE_DAT); break; } @@ -760,6 +768,7 @@ void CConversation::registerConversationLevelScripts(int level) { CConversation::registerConversationScript(SCRIPTS_CH1L4_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH1L4_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C1L4_CELEBRATE_DAT); break; } @@ -778,6 +787,7 @@ void CConversation::registerConversationLevelScripts(int level) { CConversation::registerConversationScript(SCRIPTS_CH2L1_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH2L1_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C2L1_CELEBRATE_DAT); break; } @@ -785,6 +795,19 @@ void CConversation::registerConversationLevelScripts(int level) { CConversation::registerConversationScript(SCRIPTS_CH2L2_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH2L2_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C2L2_CELEBRATE_DAT); + break; + } + + case 3: + { + CConversation::registerConversationScript(SCRIPTS_C2L3_CELEBRATE_DAT); + break; + } + + case 4: + { + CConversation::registerConversationScript(SCRIPTS_C2L4_CELEBRATE_DAT); break; } @@ -799,16 +822,16 @@ void CConversation::registerConversationLevelScripts(int level) { switch ( CLevel::getCurrentChapterLevel() ) { -// removed as this is an FMA script -// case 1: -// { -// CConversation::registerConversationScript(SCRIPTS_CH3L1_01_DAT); -// break; -// } + case 1: + { + CConversation::registerConversationScript(SCRIPTS_C3L1_CELEBRATE_DAT); + break; + } case 2: { CConversation::registerConversationScript(SCRIPTS_CH3L2_01_DAT); + CConversation::registerConversationScript(SCRIPTS_C3L2_CELEBRATE_DAT); break; } @@ -816,6 +839,13 @@ void CConversation::registerConversationLevelScripts(int level) { CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH3L3_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C3L3_CELEBRATE_DAT); + break; + } + + case 4: + { + CConversation::registerConversationScript(SCRIPTS_C3L4_CELEBRATE_DAT); break; } @@ -830,10 +860,64 @@ void CConversation::registerConversationLevelScripts(int level) { switch ( CLevel::getCurrentChapterLevel() ) { + case 1: + { + CConversation::registerConversationScript(SCRIPTS_C4L1_CELEBRATE_DAT); + break; + } + + case 2: + { + CConversation::registerConversationScript(SCRIPTS_C4L2_CELEBRATE_DAT); + break; + } + case 3: { CConversation::registerConversationScript(SCRIPTS_CH4L3_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH4L3_02_DAT); + CConversation::registerConversationScript(SCRIPTS_C4L3_CELEBRATE_DAT); + break; + } + + case 4: + { + CConversation::registerConversationScript(SCRIPTS_C4L4_CELEBRATE_DAT); + break; + } + + default: + break; + } + + break; + } + + case 5: + { + switch ( CLevel::getCurrentChapterLevel() ) + { + case 1: + { + CConversation::registerConversationScript(SCRIPTS_C5L1_CELEBRATE_DAT); + break; + } + + case 2: + { + CConversation::registerConversationScript(SCRIPTS_C5L2_CELEBRATE_DAT); + break; + } + + case 3: + { + CConversation::registerConversationScript(SCRIPTS_C5L3_CELEBRATE_DAT); + break; + } + + case 4: + { + CConversation::registerConversationScript(SCRIPTS_C5L4_CELEBRATE_DAT); break; } diff --git a/source/pickups/pquest.cpp b/source/pickups/pquest.cpp index ea5a8310d..ccb580d60 100644 --- a/source/pickups/pquest.cpp +++ b/source/pickups/pquest.cpp @@ -189,7 +189,7 @@ void CQuestItemPickup::collect(class CPlayer *_player) ---------------------------------------------------------------------- */ void CQuestItemPickup::collidedWith(CThing *_thisThing) { - if(!m_hiddenUntilBossDead) + if(!m_hiddenUntilBossDead&!m_collected) { switch(_thisThing->getThingType()) { @@ -197,7 +197,7 @@ void CQuestItemPickup::collidedWith(CThing *_thisThing) // collect((CPlayer*)_thisThing); CSoundMediator::playSfx(sfxToPlayWhenCollected()); m_collected=true; - ((CPlayer*)_thisThing)->setCanExitLevelNow(); + ((CPlayer*)_thisThing)->collectedQuestItem(); break; case TYPE_NPC: diff --git a/source/player/player.cpp b/source/player/player.cpp index b5ca3b8d7..045debfb8 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -771,7 +771,8 @@ if(newmode!=-1) #ifdef __USER_paul__ if(PadGetDown(0)&PAD_TRIANGLE) { - CSoundMediator::setVolume(CSoundMediator::VOL_SONG,0); +// CSoundMediator::setVolume(CSoundMediator::VOL_SONG,0); + m_currentPlayerModeClass->setState(STATE_CELEBRATE); } #endif /// @@ -2147,6 +2148,17 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh } } +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +void CPlayer::collectedQuestItem() +{ + m_currentPlayerModeClass->setState(STATE_CELEBRATE); +} + /*---------------------------------------------------------------------- Function: Purpose: diff --git a/source/player/player.h b/source/player/player.h index 901941570..bdfd1d96b 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -87,6 +87,7 @@ typedef enum STATE_JUMPBACK, STATE_CART, STATE_FLOAT, + STATE_CELEBRATE, NUM_STATES, }PLAYER_STATE; @@ -293,6 +294,7 @@ public: void respawn(); void setCanExitLevelNow() {m_canExitLevel=true;} int getCanExitLevelNow() {return m_canExitLevel;} + void collectedQuestItem(); int getLivesLeft() {return m_lives;} @@ -455,7 +457,6 @@ public: - // Graphical resources public: class FontBank *getFontBank() {return m_fontBank;} diff --git a/source/player/pmbubble.cpp b/source/player/pmbubble.cpp index 7c22ea52a..7eb2e158b 100644 --- a/source/player/pmbubble.cpp +++ b/source/player/pmbubble.cpp @@ -78,6 +78,10 @@ #include "player\psfloat.h" #endif +#ifndef __PLAYER_PSDANCE_H__ +#include "player\psdance.h" +#endif + /* Std Lib ------- */ @@ -133,6 +137,7 @@ static CPlayerState *s_stateTable[]= &s_stateJumpBack, // STATE_JUMPBACK &s_stateCart, // STATE_CART &s_stateFloat, // STATE_FLOAT + &s_stateDance, // STATE_CELEBRATE }; diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index 9c588386c..f65b3d875 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -82,6 +82,10 @@ #include "utils\mathtab.h" #endif +#ifndef __PLAYER_PSDANCE_H__ +#include "player\psdance.h" +#endif + /* Std Lib ------- */ @@ -137,6 +141,7 @@ static CPlayerState *s_stateTable[]= &s_stateJumpBack, // STATE_JUMPBACK NULL, // STATE_CART NULL, // STATE_FLOAT + &s_stateDance, // STATE_CELEBRATE }; diff --git a/source/player/pmjelly.cpp b/source/player/pmjelly.cpp index 9ed4cec27..31e222dec 100644 --- a/source/player/pmjelly.cpp +++ b/source/player/pmjelly.cpp @@ -90,6 +90,10 @@ #include "player\psfloat.h" #endif +#ifndef __PLAYER_PSDANCE_H__ +#include "player\psdance.h" +#endif + /* Std Lib ------- */ @@ -145,6 +149,7 @@ static CPlayerState *s_stateTable[]= &s_stateJumpBack, // STATE_JUMPBACK &s_stateCart, // STATE_CART &s_stateFloat, // STATE_FLOAT + &s_stateDance, // STATE_CELEBRATE }; diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp index 21567ef41..0b4a528d4 100644 --- a/source/player/pmnet.cpp +++ b/source/player/pmnet.cpp @@ -82,6 +82,10 @@ #include "player\psspring.h" #endif +#ifndef __PLAYER_PSDANCE_H__ +#include "player\psdance.h" +#endif + /* Std Lib ------- */ @@ -137,6 +141,7 @@ static CPlayerState *s_stateTable[]= &s_stateJumpBack, // STATE_JUMPBACK NULL, // STATE_CART NULL, // STATE_FLOAT + &s_stateDance, // STATE_CELEBRATE }; diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp index 397754055..a84da2576 100644 --- a/source/player/pmodes.cpp +++ b/source/player/pmodes.cpp @@ -82,7 +82,15 @@ #include "platform\platform.h" #endif -#include "game/game.h" +#ifndef __PLAYER_PSDANCE_H__ +#include "player\psdance.h" +#endif + +#ifndef __GAME_GAME_H__ +#include "game/game.h" +#endif + + /* Std Lib ------- */ @@ -133,6 +141,7 @@ static CPlayerState *s_stateTable[]= &s_stateJumpBack, // STATE_JUMPBACK &s_stateCart, // STATE_CART &s_stateFloat, // STATE_FLOAT + &s_stateDance, // STATE_CELEBRATE }; static PlayerMetrics s_playerMetrics= @@ -162,6 +171,18 @@ static PlayerMetrics s_playerMetrics= int CPlayerMode::getPadInputHeld() {return m_player->getPadInputHeld();} int CPlayerMode::getPadInputDown() {return m_player->getPadInputDown();} +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +int CPlayerMode::getHeightFromGound() +{ + DVECTOR pos=getPlayerPos(); + return m_player->getHeightFromGround(pos.vx,pos.vy); +} + /*---------------------------------------------------------------------- Function: @@ -311,7 +332,8 @@ void CPlayerModeBase::thinkVerticalMovement() { DVECTOR pos; - playerHasHitGround(); + if(m_currentState!=STATE_CELEBRATE) + playerHasHitGround(); pos=m_player->getPlayerPos(); if(m_player->getHeightFromGround(pos.vx,pos.vy,5)==0&& (CGameScene::getCollision()->getCollisionBlock(pos.vx,pos.vy)&COLLISION_TYPE_MASK)==COLLISION_TYPE_FLAG_SOAKUP&& @@ -325,7 +347,7 @@ void CPlayerModeBase::thinkVerticalMovement() m_currentState!=STATE_BUTTFALL&&m_currentState!=STATE_BUTTBOUNCE&& m_currentState!=STATE_JUMP&&m_currentState!=STATE_SPRINGUP&& m_currentState!=STATE_JUMPBACK&&m_currentState!=STATE_BUTTBOUNCEUP&& - m_currentState!=STATE_FLOAT) + m_currentState!=STATE_FLOAT&&m_currentState!=STATE_CELEBRATE) { DVECTOR pos; pos=m_player->getPlayerPos(); @@ -698,6 +720,23 @@ void CPlayerModeBase::fall() setMoveVelocity(&moveVel); m_player->fall(); } +// whatever.. +void CPlayerModeBase::fallToDance() +{ + const PlayerMetrics *metrics; + DVECTOR moveVel; + + metrics=getPlayerMetrics(); + moveVel=*m_player->getMoveVelocity(); + + moveVel.vy+=getPlayerMetrics()->m_metric[PM__GRAVITY]; + if(moveVel.vy>=metrics->m_metric[PM__TERMINAL_VELOCITY]<m_metric[PM__TERMINAL_VELOCITY]<fall(); +} int buttfallspeed=9; void CPlayerModeBase::buttFall() { diff --git a/source/player/pmodes.h b/source/player/pmodes.h index be572c259..c89a4471c 100644 --- a/source/player/pmodes.h +++ b/source/player/pmodes.h @@ -97,6 +97,7 @@ public: virtual int setState(int _state) {return 0;} virtual int getState() {return STATE_IDLE;} // ARSE.. states need to go back in CPlayer! (pkg) + int getHeightFromGound(); int getPadInputHeld(); int getPadInputDown(); @@ -173,6 +174,7 @@ public: void spring(); void jumpback(); void fall(); + void fallToDance(); void buttFall(); int getSpringHeight() {return m_springHeight;} diff --git a/source/player/psdance.cpp b/source/player/psdance.cpp index 6b63bb66a..16b8b85bb 100644 --- a/source/player/psdance.cpp +++ b/source/player/psdance.cpp @@ -26,6 +26,14 @@ #include "player\pmodes.h" #endif +#ifndef __GAME_CONVO_H__ +#include "game\convo.h" +#endif + +#ifndef __GAME_GAME_H__ +#include "game\game.h" +#endif + /* Std Lib ------- */ @@ -33,6 +41,10 @@ /* Data ---- */ +#ifndef __FILE_EQUATES_H__ +#include +#endif + #ifndef __ANIM_SPONGEBOB_HEADER__ #include #endif @@ -57,6 +69,18 @@ CPlayerStateDance s_stateDance; + +static const FileEquate s_celebrationScripts[5][4]= +{ + { SCRIPTS_C1L1_CELEBRATE_DAT, SCRIPTS_C1L2_CELEBRATE_DAT, SCRIPTS_C1L3_CELEBRATE_DAT, SCRIPTS_C1L4_CELEBRATE_DAT }, + { SCRIPTS_C2L1_CELEBRATE_DAT, SCRIPTS_C2L2_CELEBRATE_DAT, SCRIPTS_C2L3_CELEBRATE_DAT, SCRIPTS_C2L4_CELEBRATE_DAT }, + { SCRIPTS_C3L1_CELEBRATE_DAT, SCRIPTS_C3L2_CELEBRATE_DAT, SCRIPTS_C3L3_CELEBRATE_DAT, SCRIPTS_C3L4_CELEBRATE_DAT }, + { SCRIPTS_C4L1_CELEBRATE_DAT, SCRIPTS_C4L2_CELEBRATE_DAT, SCRIPTS_C4L3_CELEBRATE_DAT, SCRIPTS_C4L4_CELEBRATE_DAT }, + { SCRIPTS_C5L1_CELEBRATE_DAT, SCRIPTS_C5L2_CELEBRATE_DAT, SCRIPTS_C5L3_CELEBRATE_DAT, SCRIPTS_C5L4_CELEBRATE_DAT }, +}; + + + /*---------------------------------------------------------------------- Function: Purpose: @@ -65,7 +89,8 @@ CPlayerStateDance s_stateDance; ---------------------------------------------------------------------- */ void CPlayerStateDance::enter(CPlayerModeBase *_playerMode) { - _playerMode->setAnimNo(ANIM_SPONGEBOB_CELEBRATE); + _playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP); + m_hitGround=false; } @@ -77,9 +102,28 @@ void CPlayerStateDance::enter(CPlayerModeBase *_playerMode) ---------------------------------------------------------------------- */ void CPlayerStateDance::think(CPlayerModeBase *_playerMode) { - _playerMode->advanceAnimFrameAndCheckForEndOfAnim(); _playerMode->slowdown(); - _playerMode->fall(); + if(!m_hitGround) + { + if(_playerMode->getHeightFromGound()==0) + { + _playerMode->setAnimNo(ANIM_SPONGEBOB_CELEBRATE); + m_hitGround=true; + } + else + { + _playerMode->fallToDance(); + } + } + else + { + if(_playerMode->advanceAnimFrameAndCheckForEndOfAnim()) + { + CConversation::trigger(s_celebrationScripts[GameScene.getChapterNumber()-1][GameScene.getLevelNumber()-1]); +// GameScene.getPlayer()->setCanExitLevelNow(); + _playerMode->setState(STATE_IDLE); + } + } } diff --git a/source/player/psdance.h b/source/player/psdance.h index 3325732bb..79e7e4503 100644 --- a/source/player/psdance.h +++ b/source/player/psdance.h @@ -38,6 +38,8 @@ public: void enter(class CPlayerModeBase *_playerMode); void think(class CPlayerModeBase *_playerMode); +private: + int m_hitGround; }; diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index f9b812606..e685fd07e 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -1770,6 +1770,87 @@ SOURCE=..\..\..\source\platform\ptrpdoor.h # Begin Group "modes" # PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\source\player\pmbloon.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmbloon.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmbubble.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmbubble.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmcart.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmcart.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmchop.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmchop.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmcoral.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmcoral.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmdead.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmdead.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmfly.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmfly.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmjelly.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmjelly.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmnet.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmnet.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmodes.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pmodes.h +# End Source File +# End Group # Begin Group "states" # PROP Default_Filter "" @@ -1791,6 +1872,14 @@ SOURCE=..\..\..\source\player\pscart.h # End Source File # Begin Source File +SOURCE=..\..\..\source\player\psdance.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\psdance.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\player\psduck.cpp # End Source File # Begin Source File @@ -1876,87 +1965,6 @@ SOURCE=..\..\..\source\player\pstates.h # End Group # Begin Source File -SOURCE=..\..\..\source\player\pmbloon.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmbloon.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmbubble.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmbubble.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmcart.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmcart.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmchop.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmchop.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmcoral.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmcoral.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmdead.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmdead.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmfly.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmfly.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmjelly.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmjelly.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmnet.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmnet.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmodes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pmodes.h -# End Source File -# End Group -# Begin Source File - SOURCE=..\..\..\source\player\demoplay.cpp # End Source File # Begin Source File