Skip to content

Commit b3e6c66

Browse files
abhayMoreabhayMore
committed
Code Refactoring
1 parent 6b23824 commit b3e6c66

File tree

7 files changed

+5
-166
lines changed

7 files changed

+5
-166
lines changed

‎AMMPED-UP/Header Files/GamePlay.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,8 @@ class GamePlay : public am::State
120120
//COINS
121121
std::list<Coin> m_coins;
122122

123-
//SFX and MUSIC
124-
125-
//sf::Sound m_damageSFX;
126-
//sf::Sound m_blastSFX;
127-
//sf::Sound m_coinEatSfx;
128-
//sf::Sound m_enemyDeathSFX;
129-
//sf::Music& m_inGame;
130-
131123
AudioManager* m_sound;
132124

133-
134125
//EXPLOSIONS
135126
std::vector<sf::Sprite> m_explosions;
136127

‎AMMPED-UP/Header Files/LoginState.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ class LoginState : public am::State
3636
void draw() override;
3737
void start();
3838
void pause();
39-
4039
};
4140

‎AMMPED-UP/Source/GamePlay.cpp‎

Lines changed: 4 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,14 @@ GamePlay::GamePlay(std::shared_ptr<Context>& context) :
3737
m_scoreManager = ScoreManager::getInstance();
3838
m_theme.load("Resources/Black.txt");
3939

40-
4140
AudioManager& audioManager = AudioManager::getInstance(m_context->m_assets->getSoundTrack(MAIN_SOUND_TRACK),
4241
m_context->m_assets->getSoundTrack(IN_GAME_SOUND_TRACK),
4342
m_context->m_assets->getSoundEffect(DAMAGE_SFX),
4443
m_context->m_assets->getSoundEffect(BLAST_SFX),
4544
m_context->m_assets->getSoundEffect(COIN_SFX),
4645
m_context->m_assets->getSoundEffect(ENEMY_DEATH_SFX)
4746
);
48-
4947
m_sound = &audioManager;
50-
//m_sound->setSFXVolume();
51-
5248
srand(time(nullptr));
5349
}
5450

@@ -287,19 +283,6 @@ void GamePlay::init()
287283
i.init(m_context->m_assets->getTexture(COIN));
288284
i.setPosition(sf::Vector2f(pos));
289285
}
290-
291-
// SOUND EFFECT SETTINGS
292-
//m_coinEatSfx.setBuffer(m_context->m_assets->getSoundEffect(COIN_SFX));
293-
//m_coinEatSfx.setVolume(20);
294-
295-
//m_blastSFX.setBuffer(m_context->m_assets->getSoundEffect(BLAST_SFX));
296-
//m_blastSFX.setVolume(80);
297-
298-
//m_damageSFX.setBuffer(m_context->m_assets->getSoundEffect(DAMAGE_SFX));
299-
//m_damageSFX.setVolume(100);
300-
301-
//m_enemyDeathSFX.setBuffer(m_context->m_assets->getSoundEffect(ENEMY_DEATH_SFX));
302-
//m_enemyDeathSFX.setVolume(100);
303286
//takeScreenshot("../Resources/assets/");
304287
}
305288

@@ -354,14 +337,14 @@ void GamePlay::processInput()
354337
}
355338
break;
356339
}
340+
//TEMPORARY DEBUGGIN TOOL
357341
/*case sf::Keyboard::Q:
358342
{
359343
m_shiftToGameOver = true;
360344
m_currentGameState = std::string("You Won!!");
361345
break;
362-
}*/
363-
//TEMPORARY DEBUGGIN TOOL
364-
/*case sf::Keyboard::P:
346+
}
347+
case sf::Keyboard::P:
365348
{
366349
if (!showPowerUP)
367350
showPowerUP = true;
@@ -1085,77 +1068,4 @@ int GamePlay::removeWalls(sf::Vector2f pos, int radius)
10851068
}
10861069
}
10871070
return explodeTileCount;
1088-
}
1089-
//REMOVE LATER
1090-
/*
1091-
void GamePlay::explosions(sf::Vector2f bombPos, int radius)
1092-
{
1093-
sf::Sprite center;
1094-
center.setTexture(m_context->m_assets->getTexture(EXPLOSION_CENTER));
1095-
center.setPosition(bombPos);
1096-
m_explosions.push_back(center);
1097-
1098-
//i = 1 i < radius for middle piece
1099-
for (int i = 1; i < radius; i++)
1100-
{
1101-
sf::Sprite sprite1;
1102-
sprite1.setTexture(m_context->m_assets->getTexture(EXPLOSION_SIDE));
1103-
sprite1.setPosition(sf::Vector2f(bombPos.x, bombPos.y - 16 * i));
1104-
1105-
sf::Sprite sprite2;
1106-
sprite2.setTexture(m_context->m_assets->getTexture(EXPLOSION_SIDE));
1107-
sprite2.setPosition(sf::Vector2f(bombPos.x, bombPos.y + 16 * i));
1108-
1109-
sf::Sprite sprite3;
1110-
sprite3.setTexture(m_context->m_assets->getTexture(EXPLOSION_SIDE));
1111-
sprite3.setPosition(sf::Vector2f(bombPos.x - 16 * i, bombPos.y));
1112-
sprite3.setOrigin(8, 8);
1113-
sprite3.setRotation(-90);
1114-
sprite3.setOrigin(0, 0);
1115-
sprite3.setPosition(sprite3.getPosition() + sf::Vector2f(0, 16));
1116-
1117-
sf::Sprite sprite4;
1118-
sprite4.setTexture(m_context->m_assets->getTexture(EXPLOSION_SIDE));
1119-
sprite4.setPosition(sf::Vector2f(bombPos.x + 16 * i, bombPos.y));
1120-
sprite4.setOrigin(8, 8);
1121-
sprite4.setRotation(90);
1122-
sprite4.setOrigin(0, 0);
1123-
sprite4.setPosition(sprite4.getPosition() + sf::Vector2f(16, 0));
1124-
1125-
m_explosions.push_back(sprite1);
1126-
m_explosions.push_back(sprite2);
1127-
m_explosions.push_back(sprite3);
1128-
m_explosions.push_back(sprite4);
1129-
1130-
}
1131-
sf::Sprite end[4];
1132-
for (int i = 0; i < 4; i++)
1133-
{
1134-
end[i].setTexture(m_context->m_assets->getTexture(EXPLOSION_END));
1135-
}
1136-
1137-
end[0].setPosition(sf::Vector2f(bombPos.x, bombPos.y - 16 * radius));
1138-
1139-
end[1].setPosition(sf::Vector2f(bombPos.x, bombPos.y + 16 * radius));
1140-
end[1].setOrigin(8, 8);
1141-
end[1].setRotation(180.0f);
1142-
end[1].setOrigin(0, 0);
1143-
end[1].setPosition(end[1].getPosition() + sf::Vector2f(16, 16));
1144-
1145-
end[2].setPosition(sf::Vector2f(bombPos.x - 16 * radius, bombPos.y));
1146-
end[2].setOrigin(8, 8);
1147-
end[2].setRotation(-90.0f);
1148-
end[2].setOrigin(0, 0);
1149-
end[2].setPosition(end[2].getPosition() + sf::Vector2f(0, 16));
1150-
1151-
end[3].setPosition(sf::Vector2f(bombPos.x + 16 * radius, bombPos.y));
1152-
end[3].setOrigin(8, 8);
1153-
end[3].setRotation(90.0f);
1154-
end[3].setOrigin(0, 0);
1155-
end[3].setPosition(end[3].getPosition() + sf::Vector2f(16, 0));
1156-
1157-
m_explosions.push_back(end[0]);
1158-
m_explosions.push_back(end[1]);
1159-
m_explosions.push_back(end[2]);
1160-
m_explosions.push_back(end[3]);
1161-
}*/
1071+
}

‎AMMPED-UP/Source/LoginPageState.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ void LoginPageState::init()
8686
m_errorPrompt.setCharacterSize(20);
8787
m_errorPrompt.setOrigin(m_errorPrompt.getLocalBounds().width / 2, m_errorPrompt.getLocalBounds().height / 2);
8888
m_errorPrompt.setPosition(m_errorPrompt.getLocalBounds().width / 2 + 2, m_errorPrompt.getLocalBounds().height / 2 + 2);
89-
9089
}
9190

9291
void LoginPageState::processInput()
@@ -177,17 +176,14 @@ void LoginPageState::update(sf::Time deltaTime)
177176
break;
178177
}
179178
}
180-
181179
}
182180
else
183181
{
184182
m_errorPrompt.setString("User not found, did you register?");
185-
//std::cout << "User not found, did you register?" << std::endl;
186183
}
187184
if(fileEmpty == false && verified == false)
188185
{
189186
m_errorPrompt.setString("Error login, invalid username or password");
190-
//std::cout << "Error login, invalid username or password" << std::endl;
191187
}
192188
m_isSignInButtonPressed = false;
193189
}

‎AMMPED-UP/Source/MainMenu.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ void MainMenu::update(sf::Time deltaTime)
226226
m_leadershipButton.setFillColor(::sf::Color::White);
227227
m_optionsButton.setFillColor(::sf::Color::White);
228228
}
229-
230229
if (m_isPlayButtonPressed)
231230
{
232231
//TODO
@@ -246,12 +245,10 @@ void MainMenu::update(sf::Time deltaTime)
246245
{
247246
m_context->m_states->add(std::make_unique<ExitState>(m_context), true);
248247
}
249-
250248
if (m_bgm->isMenuMusicPlaying() == sf::SoundStream::Status::Stopped && !m_isPlayButtonPressed)
251249
{
252250
m_bgm->startMainMenuMusic();
253251
}
254-
255252
}
256253

257254
void MainMenu::draw()
@@ -269,7 +266,6 @@ void MainMenu::draw()
269266

270267
void MainMenu::start()
271268
{
272-
273269
}
274270

275271
void MainMenu::pause()

‎AMMPED-UP/Source/RegisterPageState.cpp‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -217,59 +217,6 @@ void RegisterPageState::processInput()
217217
registerUser();
218218
}
219219
}
220-
/*
221-
std::cout << "entered for loop" << std::endl;
222-
223-
if (m_allTextBoxes[0].getText() == person["username"].get<std::string>())
224-
{
225-
if (m_allTextBoxes[2].getText() == person["email"].get<std::string>())
226-
{
227-
//std::cout << "same username, different mail ID" << std::endl;
228-
//m_errorPrompt.setString("Username is already taken. Please choose another username!!");
229-
m_errorPrompt.setString("User already exists. Please login!!");
230-
resetTextboxes();
231-
break;
232-
}
233-
else if (m_allTextBoxes[2].getText() != person["email"].get<std::string>())
234-
{
235-
m_errorPrompt.setString("Username is already taken. Please choose another username!!");
236-
resetTextboxes();
237-
break;
238-
}
239-
}
240-
else if (m_allTextBoxes[2].getText() == person["email"].get<std::string>())
241-
{
242-
m_errorPrompt.setString("Email is already registered. Please use a different email!!");
243-
resetTextboxes();
244-
break;
245-
}
246-
else if()
247-
248-
249-
else if (m_allTextBoxes[2].getText() == person["email"].get<std::string>() &&
250-
m_allTextBoxes[0].getText() != person["username"].get<std::string>()
251-
)
252-
{
253-
m_errorPrompt.setString("Email is already registered. Please use a different email!!");
254-
resetTextboxes();
255-
break;
256-
}
257-
else if (m_allTextBoxes[0].getText() == person["username"].get<std::string>() &&
258-
m_allTextBoxes[2].getText() == person["email"].get<std::string>())
259-
{
260-
m_errorPrompt.setString("User already exists. Please login!!");
261-
resetTextboxes();
262-
break;
263-
}
264-
else if ((person["username"].get<std::string>() != m_allTextBoxes[0].getText()) && (person["email"].get<std::string>() != m_allTextBoxes[2].getText()))
265-
{
266-
if (!anyTextboxEmpty())
267-
{
268-
std::cout << "file not empty, and registered" << std::endl;
269-
registerUser();
270-
}
271-
break;
272-
}*/
273220
isUsernameTaken = false;
274221
isEmailRegistered = false;
275222
isUserExists = false;

‎AMMPED-UP/score.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"score": 150,
3+
"score": 0,
44
"username": "gg"
55
}
66
]

0 commit comments

Comments
 (0)