Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / enemies.cpp

diff --git a/src/enemies.cpp b/src/enemies.cpp
index 41d31e612ddbf0883c6d62622d0045a39d726af8..944eab2d30bd5703bbe9b6cff3baa86a0efa8cdd 100644 (file)
--- a/src/enemies.cpp
+++ b/src/enemies.cpp
@@ -57,7 +57,6 @@ Entity *getEnemy(const char *name)
 
 void addEnemy(const char *name, int x, int y, int flags)
 {
-       Entity *enemy = new Entity();
        Entity *defEnemy = getDefinedEnemy(name);
 
        if (defEnemy == NULL)
@@ -66,6 +65,7 @@ void addEnemy(const char *name, int x, int y, int flags)
                return;
        }
 
+       Entity *enemy = new Entity();
        enemy->setName(defEnemy->name);
        enemy->setSprites(defEnemy->sprite[0], defEnemy->sprite[1], defEnemy->sprite[2]);
        enemy->currentWeapon = defEnemy->currentWeapon;
@@ -821,7 +821,7 @@ void loadEnemy(const char *token)
 {
        int enemy = -1;
 
-       for (int i = MAX_ENEMIES ; i > -1 ; i--)
+       for (int i = MAX_ENEMIES - 1; i >= 0; i--)
                if (strcmp(defEnemy[i].name, "") == 0)
                        enemy = i;
 
@@ -856,7 +856,7 @@ void loadDefEnemies()
 
        if (!engine.loadData("data/defEnemies"))
        {
-               graphics.showErrorAndExit("Couldn't load enemy definitions file (%s)", "data/defEnemies");
+               return graphics.showErrorAndExit("Couldn't load enemy definitions file (%s)", "data/defEnemies");
        }
 
        char *token = strtok((char*)engine.dataBuffer, "\n");