//
//
+#include <map>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
for(y = 0; y < plevel->width; ++y)
plevel->fg_tiles[i][y] = (unsigned int) '.';
plevel->fg_tiles[i][plevel->width] = (unsigned int) '\0';
-
- plevel->dn_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
- plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0';
- for(y = 0; y < plevel->width; ++y)
- plevel->dn_tiles[i][y] = (unsigned int) '.';
- plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0';
}
}
}
vector<int> ia_tm;
- vector<int> dn_tm;
vector<int> bg_tm;
vector<int> fg_tm;
if (!reader.read_int_vector("interactive-tm", &ia_tm))
reader.read_int_vector("tilemap", &ia_tm);
- reader.read_int_vector("dynamic-tm", &dn_tm);
reader.read_int_vector("foreground-tm", &fg_tm);
+ {
+ lisp_object_t* cur = 0;
+ if (reader.read_lisp("objects", &cur))
+ {
+ while (!lisp_nil_p(cur))
+ {
+ lisp_object_t* data = lisp_car(cur);
+
+ BadGuyData bg_data;
+ bg_data.kind = badguykind_from_string(lisp_symbol(lisp_car(data)));
+ LispReader reader(lisp_cdr(data));
+ reader.read_int("x", &bg_data.x);
+ reader.read_int("y", &bg_data.y);
+
+ plevel->badguy_data.push_back(bg_data);
+
+ cur = lisp_cdr(cur);
+ }
+ }
+ }
+
// Convert old levels to the new tile numbers
if (version == 0)
{
- int transtable[256];
- transtable[(int)'.'] = 0;
- transtable[(int)'0'] = 0;
- transtable[(int)'1'] = 1;
- transtable[(int)'2'] = 2;
- transtable[(int)'x'] = 77;
- transtable[(int)'X'] = 77;
- transtable[(int)'y'] = 78;
- transtable[(int)'Y'] = 78;
- transtable[(int)'A'] = 83;
- transtable[(int)'B'] = 102;
- transtable[(int)'!'] = 103;
- transtable[(int)'a'] = 84;
- transtable[(int)'C'] = 85;
- transtable[(int)'D'] = 86;
- transtable[(int)'E'] = 87;
- transtable[(int)'F'] = 88;
- transtable[(int)'c'] = 89;
- transtable[(int)'d'] = 90;
- transtable[(int)'e'] = 91;
- transtable[(int)'f'] = 92;
-
- transtable[(int)'G'] = 93;
- transtable[(int)'H'] = 94;
- transtable[(int)'I'] = 95;
- transtable[(int)'J'] = 96;
-
- transtable[(int)'g'] = 97;
- transtable[(int)'h'] = 98;
- transtable[(int)'i'] = 99;
- transtable[(int)'j'] = 100
-;
- transtable[(int)'#'] = 11;
- transtable[(int)'['] = 13;
- transtable[(int)'='] = 14;
- transtable[(int)']'] = 15;
- transtable[(int)'$'] = 82;
- transtable[(int)'^'] = 76;
- transtable[(int)'*'] = 80;
- transtable[(int)'|'] = 79;
- transtable[(int)'\\'] = 81;
- transtable[(int)'&'] = 75;
-
+ std::map<char, int> transtable;
+ transtable['.'] = 0;
+ transtable['x'] = 104;
+ transtable['X'] = 77;
+ transtable['y'] = 78;
+ transtable['Y'] = 105;
+ transtable['A'] = 83;
+ transtable['B'] = 102;
+ transtable['!'] = 103;
+ transtable['a'] = 84;
+ transtable['C'] = 85;
+ transtable['D'] = 86;
+ transtable['E'] = 87;
+ transtable['F'] = 88;
+ transtable['c'] = 89;
+ transtable['d'] = 90;
+ transtable['e'] = 91;
+ transtable['f'] = 92;
+
+ transtable['G'] = 93;
+ transtable['H'] = 94;
+ transtable['I'] = 95;
+ transtable['J'] = 96;
+
+ transtable['g'] = 97;
+ transtable['h'] = 98;
+ transtable['i'] = 99;
+ transtable['j'] = 100
+ ;
+ transtable['#'] = 11;
+ transtable['['] = 13;
+ transtable['='] = 14;
+ transtable[']'] = 15;
+ transtable['$'] = 82;
+ transtable['^'] = 76;
+ transtable['*'] = 80;
+ transtable['|'] = 79;
+ transtable['\\'] = 81;
+ transtable['&'] = 75;
+
+ int x = 0;
+ int y = 0;
for(std::vector<int>::iterator i = ia_tm.begin(); i != ia_tm.end(); ++i)
- if (*i < 256)
- *i = transtable[*i];
- else
- puts("Error: Value to high, conversion will fail");
+ {
+ if (*i == '0' || *i == '1' || *i == '2')
+ {
+ plevel->badguy_data.push_back(BadGuyData(static_cast<BadGuyKind>(*i-'0'),
+ x*32, y*32));
+ *i = 0;
+ }
+ else
+ {
+ std::map<char, int>::iterator j = transtable.find(*i);
+ if (j != transtable.end())
+ *i = j->second;
+ else
+ printf("Error: conversion will fail, unsupported char: '%c' (%d)\n", *i, *i);
+ }
+ ++x;
+ if (x >= plevel->width) {
+ x = 0;
+ ++y;
+ }
+ }
}
}
for(int i = 0; i < 15; ++i)
{
- plevel->dn_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
plevel->ia_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
plevel->bg_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
plevel->fg_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
}
i = j = 0;
- for(vector<int>::iterator it = dn_tm.begin(); it != dn_tm.end(); ++it, ++i)
- {
-
- plevel->dn_tiles[j][i] = (*it);
- if(i == plevel->width - 1)
- {
- i = -1;
- ++j;
- }
- }
-
- i = j = 0;
for(vector<int>::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i)
{
/* Set the global gravity to the latest loaded level's gravity */
gravity = plevel->gravity;
- /* Mark the end position of this level! - Is a bit wrong here thought * /
-
- for (y = 0; y < 15; ++y)
- {
- for (x = 0; x < plevel->width; ++x)
- {
- if(plevel->tiles[y][x] == '|')
- {
- if(x*32 > endpos)
- endpos = x*32;
- }
- }
- }*/
+ // Mark the end position of this level!
+ // FIXME: -10 is a rather random value, we still need some kind of
+ // real levelend gola
+ endpos = 32*(plevel->width-10);
fclose(fi);
return 0;
}
fprintf( fi,")\n");
- fprintf(fi," (dynamic-tm ");
-
- for(y = 0; y < 15; ++y)
- {
- for(i = 0; i < plevel->width; ++i)
- fprintf(fi," %d ", plevel->dn_tiles[y][i]);
- }
-
- fprintf( fi,")\n");
fprintf(fi," (foreground-tm ");
for(y = 0; y < 15; ++y)
for(i=0; i < 15; ++i)
free(plevel->ia_tiles[i]);
for(i=0; i < 15; ++i)
- free(plevel->dn_tiles[i]);
- for(i=0; i < 15; ++i)
free(plevel->fg_tiles[i]);
plevel->name.clear();
plevel->theme.clear();
plevel->song_title.clear();
plevel->bkgd_image.clear();
+
+ plevel->badguy_data.clear();
}
/* Load graphics: */
if(new_width < 21)
new_width = 21;
tilemap_change_size((unsigned int***)&plevel->ia_tiles,new_width,plevel->width);
- tilemap_change_size((unsigned int***)&plevel->dn_tiles,new_width,plevel->width);
tilemap_change_size((unsigned int***)&plevel->bg_tiles,new_width,plevel->width);
tilemap_change_size((unsigned int***)&plevel->fg_tiles,new_width,plevel->width);
plevel->width = new_width;
{
switch(tm)
{
- case 0:
+ case TM_BG:
plevel->bg_tiles[yy][xx] = c;
- case 1:
+ break;
+ case TM_IA:
plevel->ia_tiles[yy][xx] = c;
- case 2:
- plevel->dn_tiles[yy][xx] = c;
- case 4:
+ break;
+ case TM_FG:
plevel->fg_tiles[yy][xx] = c;
+ break;
}
}
}
projects / supertux.git / blobdiff