Skip to content

Commit 1744a48

Browse files
committed
Fix compilation error related to redefinition of 'pause'
Fix update override warning Improve code
1 parent 00d4f7c commit 1744a48

File tree

2 files changed

+19
-25
lines changed

2 files changed

+19
-25
lines changed

templates/cpp-template-default/Classes/HelloWorldScene.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,17 @@ bool HelloWorld::init()
116116
drawNode->drawRect(safeArea.origin, safeArea.origin + safeArea.size, Color4F::BLUE);
117117
}
118118

119-
120-
myGameState = myGameState::update;
119+
_gameState = ExampleGameState::update;
121120
scheduleUpdate();
122121

123122
return true;
124123
}
125124

126125
void HelloWorld::update(float delta)
127126
{
128-
switch (myGameState)
127+
switch (_gameState)
129128
{
130-
case myGameState::update:
129+
case ExampleGameState::update:
131130
/////////////////////////////
132131
// Add your codes below...like....
133132
//
@@ -137,28 +136,28 @@ void HelloWorld::update(float delta)
137136
// ...
138137
break;
139138

140-
case myGameState::pause:
139+
case ExampleGameState::pause:
141140
/////////////////////////////
142141
// Add your codes below...like....
143142
//
144143
// anyPauseStuff()
145144
break;
146145

147-
case myGameState::menu1:
146+
case ExampleGameState::menu1:
148147
/////////////////////////////
149148
// Add your codes below...like....
150149
//
151150
// UpdateMenu1();
152151
break;
153152

154-
case myGameState::menu2:
153+
case ExampleGameState::menu2:
155154
/////////////////////////////
156155
// Add your codes below...like....
157156
//
158157
// UpdateMenu2();
159158
break;
160159

161-
case myGameState::end:
160+
case ExampleGameState::end:
162161
/////////////////////////////
163162
// Add your codes below...like....
164163
//
@@ -168,9 +167,6 @@ void HelloWorld::update(float delta)
168167
}
169168
}
170169

171-
172-
173-
174170
void HelloWorld::menuCloseCallback(Ref* sender)
175171
{
176172
// Close the axmol game scene and quit the application

templates/cpp-template-default/Classes/HelloWorldScene.h

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,27 @@
2929
#include "axmol.h"
3030

3131

32-
33-
enum myGameState
34-
{
35-
update = 0,
36-
pause,
37-
end,
38-
menu1,
39-
menu2,
40-
menu3,
41-
};
42-
43-
4432
class HelloWorld : public ax::Scene
4533
{
34+
enum class ExampleGameState
35+
{
36+
update = 0,
37+
pause,
38+
end,
39+
menu1,
40+
menu2,
41+
menu3,
42+
};
43+
4644
public:
4745
virtual bool init() override;
48-
void update(float delta);
46+
void update(float delta) override;
4947

5048
// a selector callback
5149
void menuCloseCallback(Ref* sender);
5250

5351
private:
54-
myGameState myGameState;
52+
ExampleGameState _gameState;
5553
};
5654

5755
#endif // __HELLOWORLD_SCENE_H__

0 commit comments

Comments
 (0)