* Se agrega un Tanque al ejemplo, y ANDA!!!!

[z.facultad/75.42/plaqui.git] / Server / src / command.cpp

diff --git a/Server/src/command.cpp b/Server/src/command.cpp
index 084cf796b6acb3bfe1bb21a364aff5b8f9e8d5d2..08a73c9b36ae4a9bd5cb18bec05325d667acd2ff 100644 (file)
--- a/Server/src/command.cpp
+++ b/Server/src/command.cpp
@@ -44,12 +44,13 @@ Command::~Command(void) {
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-Command::Command(const string& target, const string& command):
-               target(target), command(command) {
+Command::Command(const string& _target, const string& _command) {

 #ifdef DEBUG
        cerr << __FILE__ << ": target = " << target << " | "
                        << "command = " << command << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": target = " << target << " | "
                        << "command = " << command << endl;
 #endif // DEBUG

+       set_target(_target);
+       set_command(_command);

 }
 
 void Command::build(void) {
 }
 
 void Command::build(void) {


@@ -64,7 +65,7 @@ void Command::set_target(const std::string& _target) {
        build();
 }
 
        build();
 }
 

-const std::string& Command::get_target(void) {
+const std::string& Command::get_target(void) const {

        return target;
 }
 
        return target;
 }
 


@@ -73,7 +74,7 @@ void Command::set_command(const std::string& _command) {
        build();
 }
 
        build();
 }
 

-const std::string& Command::get_command(void) {
+const std::string& Command::get_command(void) const {

        return command;
 }
 
        return command;
 }
 


@@ -82,7 +83,7 @@ void Command::set_args(const Command::Arguments& _args) {
        build();
 }
 
        build();
 }
 

-const Command::Arguments& Command::get_args(void) {
+const Command::Arguments& Command::get_args(void) const {

        return args;
 }
 
        return args;
 }
 


@@ -108,8 +109,8 @@ istream& operator>>(istream& is, Command& command) {
        } else {
                command.target = "";
        }
        } else {
                command.target = "";
        }

-       if (command.args.size() > 1) {
-               command.command = command.args[1];
+       if (command.args.size() > 0) {
+               command.command = command.args[0];

                command.args.erase(command.args.begin());
        } else {
                command.command = "";
                command.args.erase(command.args.begin());
        } else {
                command.command = "";