Updated PNG icon files.

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

diff --git a/src/mapEditor.cpp b/src/mapEditor.cpp
index 58104197977899c1a01e0d79c9a85e2f5cddaf84..bffe1c7554b9ce9622b567c0c068689ebcca0239 100644 (file)
--- a/src/mapEditor.cpp
+++ b/src/mapEditor.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "mapEditor.h"
 
+MedalServer medalServer;
+Config config;
+ReplayData replayData;
+
 void drawMap(int mapX, int mapY)
 {
        SDL_Rect r;
@@ -264,7 +268,7 @@ void collectMapData()
                if (!strstr(string, " ENEMY \""))
                {
                        str = new String;
-                       strcpy(str->string, string);
+                       strlcpy(str->string, string, sizeof str->string);
                        stringTail->next = str;
                        stringTail = str;
                }
@@ -316,7 +320,7 @@ void newMap(const char *name)
 
                fprintf(fp, "EMH TILESET gfx/grasslands\n");
                fprintf(fp, "EMH BACKGROUND gfx/grasslands/stone.jpg\n");
-               fprintf(fp, "EMH MUSIC music/viking.mod\n");
+               fprintf(fp, "EMH MUSIC music/tunnel\n");
 
                fprintf(fp, "EMH ALPHATILES 1 2 3 200 201 202 203 204 244 245 246 -1\n");
 
@@ -431,6 +435,10 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
+       config.engine = &engine;
+
+       replayData.reset();
+
        atexit(cleanup);
        
        engine.useAudio = 0;
@@ -469,7 +477,7 @@ int main(int argc, char *argv[])
        {
                engine.getInput();
                config.populate();
-               engine.doPause();
+               config.doPause();
                engine.doFrameLoop();
 
                graphics.updateScreen();
@@ -617,11 +625,11 @@ int main(int argc, char *argv[])
                if (mapY > MAPHEIGHT - 30) mapY = MAPHEIGHT - 30;
 
                if (editing == 0)
-                       sprintf(string, "Index : %d:%d ; Screen %d:%d ; Tile %d", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, currentBlock);
+                       snprintf(string, sizeof string, "Index : %d:%d ; Screen %d:%d ; Tile %d", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, currentBlock);
                else if (editing == 1)
-                       sprintf(string, "Index : %d:%d ; Screen %d:%d ; %s", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, defEnemy[currentMonster].name);
+                       snprintf(string, sizeof string, "Index : %d:%d ; Screen %d:%d ; %s", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, defEnemy[currentMonster].name);
                else if (editing == 2)
-                       sprintf(string, "Index : %d:%d ; Screen %d:%d ; %s", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, defItem[currentItem].name);
+                       snprintf(string, sizeof string, "Index : %d:%d ; Screen %d:%d ; %s", mapX + x, mapY + y, (mapX + x) * BRICKSIZE, (mapY + y) * BRICKSIZE, defItem[currentItem].name);
 
                r.x = 0;
                r.w = 640;