static void incrementid()
{
- while(idmap[++id]) {
- if(id==65535)
- syntaxerror("Out of character ids.");
+ while(id<65536 && idmap[id]) {
+ id++;
}
+ if(id>=65536)
+ syntaxerror("Out of character ids.");
idmap[id] = 1;
}
c->definingTag = ctag;
c->id = id;
c->size = r;
- dict_put2(&characters, name, c);
+ dict_put(&characters, name, c);
if(do_exports) {
tag = swf_InsertTag(tag, ST_NAMECHARACTER);
c->definingTag = ctag;
c->id = id;
c->size = r;
- dict_put2(&images, name, c);
+ dict_put(&images, name, c);
}
static instance_t* s_addinstance(const char*name, character_t*c, U16 depth)
{
i->character = c;
i->depth = depth;
//swf_GetMatrix(0, &i->matrix);
- dict_put2(&instances, name, i);
+ dict_put(&instances, name, i);
return i;
}
interpolation_t* new;
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_LINEAR;
- dict_put2(&interpolations, "linear", new);
+ dict_put(&interpolations, "linear", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUAD_IN;
new->slope = 0;
- dict_put2(&interpolations, "quadIn", new);
+ dict_put(&interpolations, "quadIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUAD_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quadOut", new);
+ dict_put(&interpolations, "quadOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUAD_IN_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quadInOut", new);
+ dict_put(&interpolations, "quadInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CUBIC_IN;
new->slope = 0;
- dict_put2(&interpolations, "cubicIn", new);
+ dict_put(&interpolations, "cubicIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CUBIC_OUT;
new->slope = 0;
- dict_put2(&interpolations, "cubicOut", new);
+ dict_put(&interpolations, "cubicOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CUBIC_IN_OUT;
new->slope = 0;
- dict_put2(&interpolations, "cubicInOut", new);
+ dict_put(&interpolations, "cubicInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUART_IN;
new->slope = 0;
- dict_put2(&interpolations, "quartIn", new);
+ dict_put(&interpolations, "quartIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUART_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quartOut", new);
+ dict_put(&interpolations, "quartOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUART_IN_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quartInOut", new);
+ dict_put(&interpolations, "quartInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUINT_IN;
new->slope = 0;
- dict_put2(&interpolations, "quintIn", new);
+ dict_put(&interpolations, "quintIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUINT_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quintOut", new);
+ dict_put(&interpolations, "quintOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_QUINT_IN_OUT;
new->slope = 0;
- dict_put2(&interpolations, "quintInOut", new);
+ dict_put(&interpolations, "quintInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CIRCLE_IN;
- dict_put2(&interpolations, "circleIn", new);
+ dict_put(&interpolations, "circleIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CIRCLE_OUT;
- dict_put2(&interpolations, "circleOut", new);
+ dict_put(&interpolations, "circleOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_CIRCLE_IN_OUT;
- dict_put2(&interpolations, "circleInOut", new);
+ dict_put(&interpolations, "circleInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_EXPONENTIAL_IN;
- dict_put2(&interpolations, "exponentialIn", new);
+ dict_put(&interpolations, "exponentialIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_EXPONENTIAL_OUT;
- dict_put2(&interpolations, "exponentialOut", new);
+ dict_put(&interpolations, "exponentialOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_EXPONENTIAL_IN_OUT;
- dict_put2(&interpolations, "exponentialInOut", new);
+ dict_put(&interpolations, "exponentialInOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_SINE_IN;
- dict_put2(&interpolations, "sineIn", new);
+ dict_put(&interpolations, "sineIn", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_SINE_OUT;
- dict_put2(&interpolations, "sineOut", new);
+ dict_put(&interpolations, "sineOut", new);
new = (interpolation_t*)malloc(sizeof(interpolation_t));
new->function = IF_SINE_IN_OUT;
- dict_put2(&interpolations, "sineInOut", new);
+ dict_put(&interpolations, "sineInOut", new);
RGBA c;
memset(&c, 0, sizeof(RGBA));
noGradient->gradient.ratios[1] = 255;
noGradient->radial = 0;
noGradient->rotate = 0;
- dict_put2(&gradients, "no_gradient", noGradient);
+ dict_put(&gradients, "no_gradient", noGradient);
noFilters = 0;
// put a no_filters entry in the filters dictionary to provoce a message when a user tries
// to define a no_filters filter. The real filter=no_filters case is handled in parseFilters.
FILTER* dummy = (FILTER*)malloc(sizeof(FILTER));
- dict_put2(&filters, "no_filters", dummy);
+ dict_put(&filters, "no_filters", dummy);
noBlur = (FILTER_BLUR*) swf_NewFilter(FILTERTYPE_BLUR);
noBlur->passes = 1;
- dict_put2(&filters, "no_blur", noBlur);
+ dict_put(&filters, "no_blur", noBlur);
noBevel = (FILTER_BEVEL*) swf_NewFilter(FILTERTYPE_BEVEL);
noBevel->passes = 1;
noBevel->composite = 1;
- dict_put2(&filters, "no_bevel", noBevel);
+ dict_put(&filters, "no_bevel", noBevel);
noDropshadow = (FILTER_DROPSHADOW*) swf_NewFilter(FILTERTYPE_DROPSHADOW);
noDropshadow->passes = 1;
noDropshadow->composite = 1;
- dict_put2(&filters, "no_dropshadow", noDropshadow);
+ dict_put(&filters, "no_dropshadow", noDropshadow);
noGradientGlow = (FILTER_GRADIENTGLOW*) swf_NewFilter(FILTERTYPE_GRADIENTGLOW);
noGradientGlow->passes = 1;
noGradientGlow->composite = 1;
noGradientGlow->gradient = &noGradient->gradient;
- dict_put2(&filters, "no_gradientglow", noGradientGlow);
+ dict_put(&filters, "no_gradientglow", noGradientGlow);
}
void s_swf(const char*name, SRECT r, int version, int fps, int compress, RGBA background)
swf->compressed = compress;
swf_SetRGB(tag,&background);
- dict_init(&characters);
- dict_init(&images);
- dict_init(&textures);
- dict_init(&outlines);
- dict_init(&gradients);
- dict_init(&filters);
- dict_init(&instances);
- dict_init(&sounds);
- dict_init(&interpolations);
+ dict_init(&characters, 16);
+ dict_init(&images, 16);
+ dict_init(&textures, 16);
+ dict_init(&outlines, 16);
+ dict_init(&gradients, 16);
+ dict_init(&filters, 16);
+ dict_init(&instances, 16);
+ dict_init(&sounds, 16);
+ dict_init(&interpolations, 16);
initBuiltIns();
cleanUp = &freeDictionaries;
currentdepth = 1;
memset(idmap, 0, sizeof(idmap));
+ idmap[0]=1; //main movie has ID 0
+
incrementid();
}
}
/* FIXME: those four fields should be bundled together */
- dict_init(&instances);
+ dict_init(&instances, 16);
currentframe = 0;
currentdepth = 1;
memset(¤trect, 0, sizeof(currentrect));
if(dict_lookup(&outlines, name))
syntaxerror("outline %s defined twice", name);
- dict_put2(&outlines, name, outline);
+ dict_put(&outlines, name, outline);
}
void s_text(const char*name, const char*fontname, const char*text, int size, RGBA color)
fs->m.sy *= 20;
}
- dict_put2(&textures, name, texture);
+ dict_put(&textures, name, texture);
}
void s_font(const char*name, const char*filename)
sound->tag = tag;
sound->id = id;
- dict_put2(&sounds, name, sound);
+ dict_put(&sounds, name, sound);
incrementid();
gradient->radial = radial;
gradient->rotate = rotate;
- dict_put2(&gradients, name, gradient);
+ dict_put(&gradients, name, gradient);
}
void s_gradientglow(const char*name, const char*gradient, float blurx, float blury,
filter->ontop = ontop;
filter->passes = passes;
- dict_put2(&filters, name, filter);
+ dict_put(&filters, name, filter);
}
void s_dropshadow(const char*name, RGBA color, double blurx, double blury, double angle, double distance, double strength, char innershadow, char knockout, char composite, int passes)
filter->composite = composite;
filter->passes = passes;
- dict_put2(&filters, name, filter);
+ dict_put(&filters, name, filter);
}
void s_bevel(const char*name, RGBA shadow, RGBA highlight, double blurx, double blury, double angle, double distance, double strength, char innershadow, char knockout, char composite, char ontop, int passes)
filter->ontop = ontop;
filter->passes = passes;
- dict_put2(&filters, name, filter);
+ dict_put(&filters, name, filter);
}
void s_blur(const char*name, double blurx, double blury, int passes)
filter->blury = blury;
filter->passes = passes;
- dict_put2(&filters, name, filter);
+ dict_put(&filters, name, filter);
}
void s_action(const char*text)
outline->shape = shape;
outline->bbox = bounds;
- dict_put2(&outlines, name, outline);
+ dict_put(&outlines, name, outline);
}
int s_playsound(const char*name, int loops, int nomultiple, int stop)
inter->damping = parseFloat(lu(args, "damping"));
inter->slope = parseFloat(lu(args, "slope"));
- dict_put2(&interpolations, name, inter);
+ dict_put(&interpolations, name, inter);
return 0;
}
const char*value = lu(args, "value");
if(!defines_initialized) {
- dict_init(&defines);
+ dict_init(&defines, 16);
mem_init(&define_values);
defines_initialized = 1;
}
int val = parseTwip(value);
int pos = mem_put(&define_values, &val, sizeof(val));
- string_t s;
- string_set(&s, name);
- dict_put(&defines, s, (void*)(pos+1));
+ dict_put(&defines, name, (void*)(pos+1));
return 0;
}
static int c_point(map_t*args)
{
const char*name = lu(args, "name");
int pos;
- string_t s1;
SPOINT p;
if(!points_initialized) {
- dict_init(&points);
+ dict_init(&points, 16);
mem_init(&mpoints);
points_initialized = 1;
}
p.x = parseTwip(lu(args, "x"));
p.y = parseTwip(lu(args, "y"));
pos = mem_put(&mpoints, &p, sizeof(p));
- string_set(&s1, name);
- dict_put(&points, s1, (void*)(pos+1));
+ dict_put(&points, name, (void*)(pos+1));
return 0;
}
static int c_play(map_t*args)
if(nr<0)
syntaxerror("command %s not known", command);
+#ifndef EMPTY
// catch missing .flash directives at the beginning of a file
if(strcmp(command, "flash") && !stackpos)
{
- syntaxerror("No movie defined- use .flash first");
+ syntaxerror("No movie defined- use .flash first");
}
+#endif
#ifdef DEBUG
printf(".%s\n", command);fflush(stdout);
map_dump(&args, stdout, "\t");fflush(stdout);
#endif
+#ifndef EMPTY
(*arguments[nr].func)(&args);
-
- /*if(!strcmp(command, "button") ||
- !strcmp(command, "action")) {
- while(1) {
- readToken();
- if(type == COMMAND) {
- if(!strcmp(text, "end"))
- break;
- else {
- pushBack();
- break;
- }
- }
+#else
+ if(!strcmp(command, "action") || !strcmp(command, "initaction") ||
+ !strcmp(command, "outline") || !strcmp(command, "gradient")) {
+ readToken();
+ if(type != RAWDATA) {
+ syntaxerror("colon (:) expected");
}
- }*/
-
+ }
+#endif
map_clear(&args);
return;
}
swf_FontInitUsage(font);
}
}
- dict_put2(&fonts, name, font);
+ dict_put(&fonts, name, font);
}
else
{
SWFFONT* font = dict_lookup(&fonts, lu(&args, "font"));
- if (!font)
- syntaxerror("font %s is not known in line %d", lu(&args, "font"), line);
- else
+ if (!font) {
+ //that's ok... it might be an edittext with a system font
+ //syntaxerror("font %s is not known in line %d", lu(&args, "font"), line);
+ } else
if (font->use && !font->use->glyphs_specified)
{
if (!strcmp(command, "edittext"))
{
pos = 0;
id = 0;
- dict_init(&fonts);
+ dict_init(&fonts, 16);
cleanUp = &freeFontDictionary;
findFontUsage();
}