Skip to content

Commit 86816c1

Browse files
madebrmadebr
committed
MinGW fixes
1 parent e23e7b7 commit 86816c1

15 files changed

Lines changed: 98 additions & 136 deletions

‎GolDP/src/font/golfontlibrary.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ void GolFontLibrary::ReadFontCharList(GolFileParser* p_parser, undefined2* p_cha
189189
p_parser->HandleUnexpectedToken(GolFileParser::e_leftBracket);
190190
}
191191

192-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
193-
while (token != GolFileParser::e_rightBracket) {
192+
GolFileParser::ParserTokenType token;
193+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightBracket) {
194194
switch (token) {
195195
case GolFileParser::e_string:
196196
LegoChar character;
@@ -214,7 +214,6 @@ void GolFontLibrary::ReadFontCharList(GolFileParser* p_parser, undefined2* p_cha
214214
}
215215

216216
(*p_count)++;
217-
token = p_parser->GetNextToken();
218217
}
219218
}
220219

‎LEGORacers/include/race/racer/carvisuals.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "scene/golbillboard.h"
1010
#include "types.h"
1111

12-
class ColorTransform;
12+
struct ColorTransform;
1313
class CutsceneAnimation;
1414
class GolCamera;
1515
class GolCollidableEntity;

‎LEGORacers/include/race/racer/racer.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
#include "race/racer/racerphysics.h"
1111
#include "util/legoeventqueue.h"
1212

13+
class DroppableBrick;
1314
class GolFileParser;
1415
class RaceCameraController;
1516
class RaceForceFeedback;
1617
class RaceHud;
1718
class RacePowerupManager;
18-
class DroppableBrick;
19+
class RaceState;
1920
class RacerContext;
2021
class RacerSoundSource;
2122
class SpatialSoundInstance;

‎LEGORacers/src/menu/runtime/cutsceneanimation.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ void CutsceneAnimation::Emitter::Parse(
389389
p_param4->AddName(name, this);
390390
p_parser->ReadLeftCurly();
391391

392-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
392+
GolFileParser::ParserTokenType token;
393393

394-
while (token != GolFileParser::e_rightCurly) {
394+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
395395
switch (token) {
396396
case CutsceneAnimation::EmbTxtParser::e_emitInterval:
397397
m_emitIntervalMs = static_cast<LegoS32>(g_floatConst1000 / p_parser->ReadFloat());
@@ -461,7 +461,6 @@ void CutsceneAnimation::Emitter::Parse(
461461
default:
462462
p_parser->HandleUnexpectedToken(GolFileParser::e_syntaxerror);
463463
}
464-
token = p_parser->GetNextToken();
465464
}
466465
}
467466

‎LEGORacers/src/menu/runtime/cutsceneanimationevent.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ void CutsceneAnimationEvent::Parse(GolFileParser* p_parser, CutscenePlayer* p_ow
6363
{
6464
p_parser->ReadLeftCurly();
6565

66-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
67-
while (token != GolFileParser::e_rightCurly) {
66+
GolFileParser::ParserTokenType token;
67+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
6868
switch (token) {
6969
case e_animationIndex: {
7070
LegoU32 index = p_parser->ReadInteger();
@@ -102,8 +102,6 @@ void CutsceneAnimationEvent::Parse(GolFileParser* p_parser, CutscenePlayer* p_ow
102102
ParseCommonToken(p_parser, p_owner, token);
103103
break;
104104
}
105-
106-
token = p_parser->GetNextToken();
107105
}
108106
}
109107

‎LEGORacers/src/menu/runtime/cutscenecolorevent.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ void CutsceneColorEvent::Parse(GolFileParser* p_parser, CutscenePlayer* p_owner)
6464
{
6565
p_parser->ReadLeftCurly();
6666

67-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
68-
while (token != GolFileParser::e_rightCurly) {
67+
GolFileParser::ParserTokenType token;
68+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
6969
switch (token) {
7070
case e_shifts:
7171
m_shiftRed = p_parser->ReadInteger();
@@ -86,8 +86,6 @@ void CutsceneColorEvent::Parse(GolFileParser* p_parser, CutscenePlayer* p_owner)
8686
ParseCommonToken(p_parser, p_owner, token);
8787
break;
8888
}
89-
90-
token = p_parser->GetNextToken();
9189
}
9290
}
9391

‎LEGORacers/src/menu/runtime/cutscenedefinition.cpp‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ LegoU32 CutsceneDefinition::Frame::ModelEvent::Parse(CutsceneDefinition* p_paren
8383
::strncpy(m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_name));
8484
p_parser->ReadLeftCurly();
8585

86-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
87-
while (token != GolFileParser::e_rightCurly) {
86+
GolFileParser::ParserTokenType token;
87+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
8888
switch (token) {
8989
case CutsceneDefinition::c_tokenStaticModelName:
9090
::strncpy(m_modelRef.m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_modelRef.m_name));
@@ -151,8 +151,6 @@ LegoU32 CutsceneDefinition::Frame::ModelEvent::Parse(CutsceneDefinition* p_paren
151151
default:
152152
break;
153153
}
154-
155-
token = p_parser->GetNextToken();
156154
}
157155

158156
// duration += m_startFrame;
@@ -336,8 +334,8 @@ LegoU32 CutsceneDefinition::Frame::CameraEvent::Parse(CutsceneDefinition* p_pare
336334
::strncpy(m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_name));
337335
p_parser->ReadLeftCurly();
338336

339-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
340-
while (token != GolFileParser::e_rightCurly) {
337+
GolFileParser::ParserTokenType token;
338+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
341339
switch (token) {
342340
case CutsceneDefinition::c_tokenCameraName:
343341
::strncpy(m_cameraName, p_parser->ReadStringWithMaxLength(8), sizeof(m_cameraName));
@@ -354,8 +352,6 @@ LegoU32 CutsceneDefinition::Frame::CameraEvent::Parse(CutsceneDefinition* p_pare
354352
default:
355353
break;
356354
}
357-
358-
token = p_parser->GetNextToken();
359355
}
360356

361357
m_endFrame = duration + m_startFrame;
@@ -423,8 +419,8 @@ LegoU32 CutsceneDefinition::Frame::DirectionalLightEvent::Parse(GolFileParser* p
423419
::strncpy(m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_name));
424420
p_parser->ReadLeftCurly();
425421

426-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
427-
while (token != GolFileParser::e_rightCurly) {
422+
GolFileParser::ParserTokenType token;
423+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
428424
switch (token) {
429425
case CutsceneDefinition::c_tokenStartFrame:
430426
m_startFrame = p_parser->ReadInteger();
@@ -457,8 +453,6 @@ LegoU32 CutsceneDefinition::Frame::DirectionalLightEvent::Parse(GolFileParser* p
457453
default:
458454
break;
459455
}
460-
461-
token = p_parser->GetNextToken();
462456
}
463457

464458
LegoU32 end = m_startFrame;
@@ -626,8 +620,8 @@ void CutsceneDefinition::Frame::AmbientLightEvent::Parse(GolFileParser* p_parser
626620
::strncpy(m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_name));
627621
p_parser->ReadLeftCurly();
628622

629-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
630-
while (token != GolFileParser::e_rightCurly) {
623+
GolFileParser::ParserTokenType token;
624+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
631625
switch (token) {
632626
case CutsceneDefinition::c_tokenStartFrame:
633627
m_startFrame = p_parser->ReadInteger();
@@ -652,8 +646,6 @@ void CutsceneDefinition::Frame::AmbientLightEvent::Parse(GolFileParser* p_parser
652646
default:
653647
break;
654648
}
655-
656-
token = p_parser->GetNextToken();
657649
}
658650

659651
LegoU32 end = m_startFrame;
@@ -774,8 +766,8 @@ void CutsceneDefinition::Frame::Parse(CutsceneDefinition* p_parent, GolFileParse
774766
m_definition = p_parent;
775767
p_parser->ReadLeftCurly();
776768

777-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
778-
while (token != GolFileParser::e_rightCurly) {
769+
GolFileParser::ParserTokenType token;
770+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
779771
switch (token) {
780772
case CutsceneDefinition::c_tokenCameraBlock:
781773
ParseCameraEvents(p_parser);
@@ -803,8 +795,6 @@ void CutsceneDefinition::Frame::Parse(CutsceneDefinition* p_parent, GolFileParse
803795
p_parser->HandleUnexpectedToken(GolFileParser::e_syntaxerror);
804796
break;
805797
}
806-
807-
token = p_parser->GetNextToken();
808798
}
809799

810800
if (!m_frameCount && m_cameraEventCount) {
@@ -1660,8 +1650,8 @@ LegoU32 CutsceneDefinition::Frame::TransformEvent::Parse(GolFileParser* p_parser
16601650
::strncpy(m_name, p_parser->ReadStringWithMaxLength(8), sizeof(m_name));
16611651
p_parser->ReadLeftCurly();
16621652

1663-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
1664-
while (token != GolFileParser::e_rightCurly) {
1653+
GolFileParser::ParserTokenType token;
1654+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
16651655
switch (token) {
16661656
case CutsceneDefinition::c_tokenStartFrame:
16671657
m_startFrame = p_parser->ReadInteger();
@@ -1685,8 +1675,6 @@ LegoU32 CutsceneDefinition::Frame::TransformEvent::Parse(GolFileParser* p_parser
16851675
default:
16861676
break;
16871677
}
1688-
1689-
token = p_parser->GetNextToken();
16901678
}
16911679

16921680
m_endFrame = duration + m_startFrame;

‎LEGORacers/src/menu/runtime/cutsceneimagevisual.cpp‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,14 @@ void CutsceneImageVisual::Parse(GolFileParser* p_parser, CutscenePlayer* p_owner
6060
p_parser->ReadLeftCurly();
6161
m_flags = 3;
6262

63-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
64-
if (token != GolFileParser::e_rightCurly) {
65-
do {
66-
if (token != CutscenePlayer::CebTxtParser::e_imageVisuals) {
67-
ParseVisualToken(p_parser, token, p_owner, p_renderer);
68-
}
69-
else {
70-
::strncpy(m_imageName, p_parser->ReadStringWithMaxLength(sizeof(GolName)), sizeof(GolName));
71-
}
72-
73-
token = p_parser->GetNextToken();
74-
} while (token != GolFileParser::e_rightCurly);
63+
GolFileParser::ParserTokenType token;
64+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
65+
if (token != CutscenePlayer::CebTxtParser::e_imageVisuals) {
66+
ParseVisualToken(p_parser, token, p_owner, p_renderer);
67+
}
68+
else {
69+
::strncpy(m_imageName, p_parser->ReadStringWithMaxLength(sizeof(GolName)), sizeof(GolName));
70+
}
7571
}
7672

7773
if (m_imageName[0] == '\0') {

‎LEGORacers/src/menu/runtime/cutscenemenuanimationevent.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ void CutsceneMenuAnimationEvent::Parse(
6868
m_animationList = p_animationList;
6969
p_parser->ReadLeftCurly();
7070

71-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
72-
while (token != GolFileParser::e_rightCurly) {
71+
GolFileParser::ParserTokenType token;
72+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
7373
switch (token) {
7474
case e_durationMs:
7575
m_durationMs = p_parser->ReadInteger();
@@ -101,8 +101,6 @@ void CutsceneMenuAnimationEvent::Parse(
101101
ParseCommonToken(p_parser, p_owner, token);
102102
break;
103103
}
104-
105-
token = p_parser->GetNextToken();
106104
}
107105

108106
if (materialName[0] != '\0') {

‎LEGORacers/src/race/checkpointgraph.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ void CheckpointGraph::Entry::Load(GolFileParser* p_parser, LegoBool32 p_mirror)
4646
p_parser->ReadLeftCurly();
4747

4848
LegoU32 i;
49-
GolFileParser::ParserTokenType token = p_parser->GetNextToken();
50-
while (token != GolFileParser::e_rightCurly) {
49+
GolFileParser::ParserTokenType token;
50+
while ((token = p_parser->GetNextToken()) != GolFileParser::e_rightCurly) {
5151
switch (token) {
5252
case CpbTxtParser::e_plane:
5353
m_planeNormal.m_x = p_parser->ReadFloat();
@@ -79,8 +79,6 @@ void CheckpointGraph::Entry::Load(GolFileParser* p_parser, LegoBool32 p_mirror)
7979
p_parser->HandleUnexpectedToken(GolFileParser::e_syntaxerror);
8080
break;
8181
}
82-
83-
token = p_parser->GetNextToken();
8482
}
8583
}
8684

0 commit comments

Comments
 (0)