File tree Expand file tree Collapse file tree 2 files changed +81
-6
lines changed
Expand file tree Collapse file tree 2 files changed +81
-6
lines changed Original file line number Diff line number Diff line change @@ -365,3 +365,63 @@ void ztalkbox::permit(U32 add_flags, U32 remove_flags)
365365 shared.permit &= ~remove_flags;
366366 shared.permit |= add_flags;
367367}
368+
369+ void ztalkbox::load (xBase& data, xDynAsset& asset, unsigned long )
370+ {
371+ ((ztalkbox&)data).load ((const ztalkbox::asset_type&)asset);
372+ }
373+
374+ namespace
375+ {
376+ static void parse_tag_pause (xtextbox::jot&, const xtextbox&, const xtextbox&,
377+ const xtextbox::split_tag&)
378+ {
379+ }
380+
381+ static void reset_tag_pause (xtextbox::jot&, const xtextbox&, const xtextbox&,
382+ const xtextbox::split_tag&)
383+ {
384+ }
385+
386+ U8 trigger_pause (const xtextbox::jot&)
387+ {
388+ return 1 ;
389+ }
390+
391+ state_type::state_type (state_enum t)
392+ {
393+ type = t;
394+ }
395+
396+ } // namespace
397+
398+ void start_state_type::stop ()
399+ {
400+ }
401+
402+ S8 start_state_type::update (xScene& scn, F32 dt)
403+ {
404+ return 2 ;
405+ }
406+
407+ void next_state_type::stop ()
408+ {
409+ }
410+
411+ void stop_state_type::start ()
412+ {
413+ }
414+
415+ void stop_state_type::stop ()
416+ {
417+ }
418+
419+ S8 stop_state_type::update (xScene& scn, F32 dt)
420+ {
421+ return -1 ;
422+ }
423+
424+ void wait_context::reset_type ()
425+ {
426+ *(U16*)&this ->type = 0 ;
427+ }
Original file line number Diff line number Diff line change @@ -61,27 +61,22 @@ struct ztalkbox : xBase
6161 {
6262 callback ()
6363 {
64-
6564 }
6665
6766 virtual void on_signal (U32 )
6867 {
69-
7068 }
7169
7270 virtual void on_start ()
7371 {
74-
7572 }
7673
7774 virtual void on_stop ()
7875 {
79-
8076 }
8177
8278 virtual void on_answer (answer_enum answer )
8379 {
84-
8580 }
8681 };
8782
@@ -150,9 +145,28 @@ namespace
150145 struct state_type
151146 {
152147 state_enum type ;
148+
149+ state_type (state_enum t );
150+ virtual void start ();
151+ virtual void stop ();
152+ };
153153
154+ struct next_state_type
155+ {
156+ void stop ();
157+ };
158+
159+ struct start_state_type
160+ {
161+ void stop ();
162+ S8 update (xScene & scn , F32 dt );
163+ };
164+
165+ struct stop_state_type
166+ {
154167 void start ();
155168 void stop ();
169+ S8 update (xScene & scn , F32 dt );
156170 };
157171
158172 struct jot ;
@@ -252,6 +266,7 @@ namespace
252266 F32 delay ;
253267 U32 event_mask ;
254268 query_enum query ;
269+ void reset_type ();
255270 };
256271
257272 struct trigger_pair
@@ -290,6 +305,6 @@ namespace
290305 zNPCCommon * speak_npc ; // 0x8694
291306 U32 speak_player ; // 0x8698
292307 };
293- }
308+ } // namespace
294309
295310#endif
You can’t perform that action at this time.
0 commit comments