devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored Unit class

Browse Source 
removed unused unit classes and files
This commit is contained in:
devZoGok
2022-10-31 09:34:31 +02:00
parent 80656f36b1
commit 7c5b2c455b
24 changed files with 112 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
consoleCommand.cpp
+26 -63
View File
@@ -6,23 +6,14 @@
#include <stateManager.h>
#include "consoleCommand.h"
#include "unitData.h"
#include "aircraftCarrier.h"
#include "cruiser.h"
#include "destroyer.h"
#include "submarine.h"
#include "demoJet.h"
#include "missileJet.h"
#include "inGameAppState.h"
#include "unitData.h"
using namespace std;
using namespace vb01;
using namespace vb01Gui;
using namespace gameBase;
namespace battleship{
using namespace unitData;
void ConsoleCommand::execute(string commandStr) {
vector<string> fullCommand;
parse(commandStr, fullCommand);
@@ -38,70 +29,42 @@ namespace battleship{
}
}
void ConsoleCommand::parse(string commandStr, vector<string> &fullCommand){
vector<int> spaceIds;
void ConsoleCommand::parse(string commandStr, vector<string> &fullCommand){
vector<int> spaceIds;
for(int i = 0; i < commandStr.length(); i++)
if(commandStr[i] == ' ')
spaceIds.push_back(i);
for(int i = 0; i < commandStr.length(); i++)
if(commandStr[i] == ' ')
spaceIds.push_back(i);
fullCommand.push_back(commandStr.substr(0, spaceIds[0]));
fullCommand.push_back(commandStr.substr(0, spaceIds[0]));
for(int i = 0; i < spaceIds.size(); i++){
bool lastSpace = (i == spaceIds.size() - 1);
string argument = commandStr.substr(spaceIds[i] + 1, lastSpace ? string::npos : spaceIds[i + 1] - spaceIds[i] - 1);
fullCommand.push_back(argument);
}
for(int i = 0; i < spaceIds.size(); i++){
bool lastSpace = (i == spaceIds.size() - 1);
string argument = commandStr.substr(spaceIds[i] + 1, lastSpace ? string::npos : spaceIds[i + 1] - spaceIds[i] - 1);
fullCommand.push_back(argument);
}
}
void ConsoleCommand::validateAddUnitArguments(vector<string> &fullCommand){
//addUnit <playerId> <unitId> [<posX> <posY> <posZ> ]
if(fullCommand.size() != 3 || fullCommand.size() != 6)
return;
void ConsoleCommand::validateAddUnitArguments(vector<string> &fullCommand){
//addUnit <playerId> <unitId> [<posX> <posY> <posZ> ]
if(fullCommand.size() != 3 || fullCommand.size() != 6)
return;
int playerId = atoi(fullCommand[1].c_str());
int playerId = atoi(fullCommand[1].c_str());
if(playerId != 0 && playerId != 1)
return;
if(playerId != 0 && playerId != 1)
return;
int unitId = atoi(fullCommand[2].c_str());
int unitId = atoi(fullCommand[2].c_str());
if(!(0 <= unitId && unitId <= unitData::numberOfUnits))
return;
}
if(!(0 <= unitId && unitId <= UnitDataManager::getSingleton()->getNumUnits()))
return;
}
void ConsoleCommand::executeAddUnit(int playerId, int unitId, Vector3 pos) {
StateManager *stateManager = GameManager::getSingleton()->getStateManager();
InGameAppState *inGameState = (InGameAppState*)stateManager->getAppStateByType(AppStateType::IN_GAME_STATE);
StateManager *stateManager = GameManager::getSingleton()->getStateManager();
InGameAppState *inGameState = (InGameAppState*)stateManager->getAppStateByType(AppStateType::IN_GAME_STATE);
vector<Player*> players = inGameState->getPlayers();
Unit *u = nullptr;
switch (unitType[unitId]) {
case UNIT_TYPE::VESSEL:
u = new Unit(players[playerId], pos, unitId);
break;
case UNIT_TYPE::DESTROYER:
u = new Destroyer(players[playerId], pos, unitId);
break;
case UNIT_TYPE::CRUISER:
u = new Cruiser(players[playerId], pos, unitId);
break;
case UNIT_TYPE::SUBMARINE:
u = new Submarine(players[playerId], pos, unitId);
break;
case UNIT_TYPE::AIRCRAFT_CARRIER:
u = new AircraftCarrier(players[playerId], pos, unitId);
break;
case UNIT_TYPE::MISSILE_JET:
u = new MissileJet(players[playerId], pos, unitId, false);
break;
case UNIT_TYPE::DEMO_JET:
u = new DemoJet(players[playerId], pos, unitId, false);
break;
default:
break;
}
players[playerId]->addUnit(u);
players[playerId]->addUnit(new Unit(players[playerId], pos, unitId));
}
}