Skip to content

Commit 9ef4f04

Browse files
committed
Made suggested changes for primative types and updated variables. also used code formmatting tool
1 parent 1c48385 commit 9ef4f04

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

src/SB/Game/zTalkBox.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -373,18 +373,17 @@ void ztalkbox::load(xBase& data, xDynAsset& asset, unsigned long)
373373

374374
namespace
375375
{
376-
377-
static void parse_tag_pause(xtextbox::jot&, const xtextbox&, const xtextbox&, const xtextbox::split_tag&)
376+
static void parse_tag_pause(xtextbox::jot&, const xtextbox&, const xtextbox&,
377+
const xtextbox::split_tag&)
378378
{
379-
380379
}
381380

382-
static void reset_tag_pause(xtextbox::jot&, const xtextbox&, const xtextbox&, const xtextbox::split_tag&)
381+
static void reset_tag_pause(xtextbox::jot&, const xtextbox&, const xtextbox&,
382+
const xtextbox::split_tag&)
383383
{
384-
385384
}
386385

387-
static unsigned char trigger_pause(const xtextbox::jot&)
386+
U8 trigger_pause(const xtextbox::jot&)
388387
{
389388
return 1;
390389
}
@@ -394,40 +393,35 @@ namespace
394393
type = t;
395394
}
396395

397-
}
396+
} // namespace
398397

399398
void start_state_type::stop()
400399
{
401400
}
402401

403-
signed char start_state_type::update(xScene&, float)
402+
S8 start_state_type::update(xScene& scn, F32 dt)
404403
{
405404
return 2;
406405
}
407406

408407
void next_state_type::stop()
409408
{
410-
411409
}
412410

413411
void stop_state_type::start()
414412
{
415-
416413
}
417414

418415
void stop_state_type::stop()
419416
{
420-
421417
}
422418

423-
signed char stop_state_type::update(xScene&, float)
419+
S8 stop_state_type::update(xScene& scn, F32 dt)
424420
{
425421
return -1;
426422
}
427423

428424
void wait_context::reset_type()
429425
{
430-
431426
*(U16*)&this->type = 0;
432-
433427
}

src/SB/Game/zTalkBox.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff 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

@@ -164,14 +159,14 @@ namespace
164159
struct start_state_type
165160
{
166161
void stop();
167-
signed char update(xScene&, float);
162+
S8 update(xScene& scn, F32 dt);
168163
};
169164

170165
struct stop_state_type
171166
{
172167
void start();
173168
void stop();
174-
signed char update(xScene&, float);
169+
S8 update(xScene& scn, F32 dt);
175170
};
176171

177172
struct jot;
@@ -310,6 +305,6 @@ namespace
310305
zNPCCommon* speak_npc; // 0x8694
311306
U32 speak_player; // 0x8698
312307
};
313-
}
308+
} // namespace
314309

315310
#endif

0 commit comments

Comments
 (0)