diff --git a/data/Scripts/defs/charanim.scr b/data/Scripts/defs/charanim.scr index 3c568562e..072cf2b9b 100644 --- a/data/Scripts/defs/charanim.scr +++ b/data/Scripts/defs/charanim.scr @@ -7,6 +7,9 @@ #define CHAR_SQUIDWARD 3 #define CHAR_KRABS 4 #define CHAR_PLANKTON 5 +#define CHAR_MERMAIDMAN 6 +#define CHAR_BARNACLEBOY 7 +#define CHAR_JACKCUSTARD 8 #define ANIM_QUIET 0 #define ANIM_TALKING 1 diff --git a/data/Scripts/speechtest.scr b/data/Scripts/speechtest.scr index c1d761380..8a679bc9f 100644 --- a/data/Scripts/speechtest.scr +++ b/data/Scripts/speechtest.scr @@ -8,7 +8,7 @@ do { - _setText(CHAR_SANDY,STR__INGAME__SANDY__TEST1); + _setText(CHAR_JACKCUSTARD,STR__INGAME__SANDY__TEST1); _setResponseOptions(QUESTION_OK); do { diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 822e3f08e..63fe0d904 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -84,12 +84,16 @@ CConversation::CHAR_ICON_FRAMES CConversation::s_characterIconFrames[]= { - { FRM_SPONGEBOB, }, // CHAR_SPONGEBOB - { FRM_SANDY }, // CHAR_SANDY - { FRM_PATRICK }, // CHAR_PATRICK - { FRM_SQUIDWARD }, // CHAR_SQUIDWARD - { FRM_MR_KRABS }, // CHAR_KRABS - { FRM_PLANKTON }, // CHAR_PLANKTON + { FRM_SPONGEBOB, }, // CHAR_SPONGEBOB + { FRM_SANDY }, // CHAR_SANDY + { FRM_PATRICK }, // CHAR_PATRICK + { FRM_SQUIDWARD }, // CHAR_SQUIDWARD + { FRM_MR_KRABS }, // CHAR_KRABS + { FRM_PLANKTON }, // CHAR_PLANKTON + { FRM_MERMAIDMAN }, // CHAR_MERMAIDMAN, + { FRM_BARNACLEBOY }, // CHAR_BARNACLEBOY, + { FRM_JACK_CUSTARD }, // CHAR_JACKCUSTARD + }; class CGUIGroupFrame *CConversation::s_guiFrame=NULL; diff --git a/source/game/convo.h b/source/game/convo.h index a30e2ffc0..e76c96647 100644 --- a/source/game/convo.h +++ b/source/game/convo.h @@ -78,6 +78,9 @@ private: CHAR_SQUIDWARD, CHAR_KRABS, CHAR_PLANKTON, + CHAR_MERMAIDMAN, + CHAR_BARNACLEBOY, + CHAR_JACKCUSTARD, MAX_CHARS, }; typedef struct